Merge pull request #12624 from nextcloud/bugfix/noid/validate-all-rich-objects

Validate all rich objects

apps/dav/lib/CalDAV/Activity/Provider/Base.php

@@ -160,7 +160,7 @@ abstract class Base implements IProvider {
 		}
 
 		return [
-			'type' => 'group',
+			'type' => 'user-group',
 			'id' => $gid,
 			'name' => $this->groupDisplayNames[$gid],
 		];

apps/dav/tests/unit/CalDAV/Activity/Provider/BaseTest.php

@@ -182,7 +182,7 @@ class BaseTest extends TestCase {
 	 */
 	public function testGenerateGroupParameter($gid) {
 		$this->assertEquals([
-			'type' => 'group',
+			'type' => 'user-group',
 			'id' => $gid,
 			'name' => $gid,
 		], $this->invokePrivate($this->provider, 'generateGroupParameter', [$gid]));

apps/files_sharing/lib/Activity/Providers/Groups.php

@@ -150,7 +150,7 @@ class Groups extends Base {
 		}
 
 		return [
-			'type' => 'group',
+			'type' => 'user-group',
 			'id' => $gid,
 			'name' => $this->groupDisplayNames[$gid],
 		];

lib/private/RichObjectStrings/Validator.php

@@ -71,11 +71,17 @@ class Validator implements IValidator {
 			foreach ($matches[1] as $parameter) {
 				if (!isset($parameters[$parameter])) {
 					throw new InvalidObjectExeption('Parameter is undefined');
-				} else {
-					$this->validateParameter($parameters[$parameter]);
 				}
 			}
 		}
+
+		foreach ($parameters as $parameter) {
+			if (!\is_array($parameter)) {
+				throw new InvalidObjectExeption('Parameter is malformed');
+			}
+
+			$this->validateParameter($parameter);
+		}
 	}
 
 	/**