upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 25

Throw on missing type of rich subject parameter

Browse source 
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
This commit is contained in:
Côme Chilliet 2022-12-08 17:17:58 +01:00
parent 8a04bf5584
commit f676076482
No known key found for this signature in database
GPG key ID: A3E2F658B28C760A
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/private/Activity/Event.php
View file

@ -276,19 +276,21 @@ class Event implements IEvent {
}
/**
* @throws \InvalidArgumentException if a parameter has no name
* @throws \InvalidArgumentException if a parameter has no name or no type
*/
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');
foreach (['name','type'] as $requiredField) {
if (!isset($parameter[$requiredField]) || !is_string($parameter[$requiredField])) {
throw new \InvalidArgumentException("Invalid rich object, {$requiredField} field is missing");
}
}
if (($parameter['type'] ?? '') === 'user') {
if ($parameter['type'] === 'user') {
$replacements[] = '@' . $parameter['name'];
} elseif (($parameter['type'] ?? '') === 'file') {
} elseif ($parameter['type'] === 'file') {
$replacements[] = $parameter['path'] ?? $parameter['name'];
} else {
$replacements[] = $parameter['name'];

12
lib/private/Notification/Notification.php
View file

@ -303,19 +303,21 @@ class Notification implements INotification {
}
/**
* @throws \InvalidArgumentException if a parameter has no name
* @throws \InvalidArgumentException if a parameter has no name or no type
*/
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');
foreach (['name','type'] as $requiredField) {
if (!isset($parameter[$requiredField]) || !is_string($parameter[$requiredField])) {
throw new \InvalidArgumentException("Invalid rich object, {$requiredField} field is missing");
}
}
if (($parameter['type'] ?? '') === 'user') {
if ($parameter['type'] === 'user') {
$replacements[] = '@' . $parameter['name'];
} elseif (($parameter['type'] ?? '') === 'file') {
} elseif ($parameter['type'] === 'file') {
$replacements[] = $parameter['path'] ?? $parameter['name'];
} else {
$replacements[] = $parameter['name'];