Throw instead of using a bogus value if name field is missing

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>

1 files changed, 9 insertions, 3 deletions

diff --git a/lib/private/Activity/Event.php b/lib/private/Activity/Event.php
index b600a2c2249..806a7514590 100644
--- a/lib/private/Activity/Event.php
+++ b/lib/private/Activity/Event.php
@@ -275,17 +275,23 @@ class Event implements IEvent {
 		return $this;
 	}
 
+	/**
+	 * @throws \InvalidArgumentException if a parameter has no name
+	 */
 	private function richToParsed(string $message, array $parameters): string {
 		$placeholders = [];
 		$replacements = [];
 		foreach ($parameters as $placeholder => $parameter) {
 			$placeholders[] = '{' . $placeholder . '}';
+			if (!isset($parameter['name']) || !is_string($parameter['name'])) {
+				throw new \InvalidArgumentException('Invalid rich object, name field is missing');
+			}
 			if (($parameter['type'] ?? '') === 'user') {
-				$replacements[] = '@' . $parameter['name'] ?? 'invalid-user';
+				$replacements[] = '@' . $parameter['name'];
 			} elseif (($parameter['type'] ?? '') === 'file') {
-				$replacements[] = $parameter['path'] ?? $parameter['name'] ?? 'invalid-file';
+				$replacements[] = $parameter['path'] ?? $parameter['name'];
 			} else {
-				$replacements[] = $parameter['name'] ?? 'invalid-object';
+				$replacements[] = $parameter['name'];
 			}
 		}
 		return str_replace($placeholders, $replacements, $message);