sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36254 from nextcloud/chore/dav/throw-json-encode-decode 

chore(dav): Make json_encode and json_decode throw on error
pull/36313/head
Christoph Wurst 2023-01-23 12:52:22 +07:00 committed by GitHub
parent 03e3458a84 afd1ddb0ea
commit 83711e9267
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/lib/BackgroundJob/UpdateCalendarResourcesRoomsBackgroundJob.php
Unescape Escape View File

@ -339,7 +339,7 @@ class UpdateCalendarResourcesRoomsBackgroundJob extends TimedJob {
* @return string
*/
private function serializeGroupRestrictions(array $groups): string {
return \json_encode($groups);
return \json_encode($groups, JSON_THROW_ON_ERROR);
}
/**

4
apps/dav/lib/BulkUpload/BulkUploadPlugin.php
Unescape Escape View File

@ -75,7 +75,7 @@ class BulkUploadPlugin extends ServerPlugin {
// Return early if an error occurs during parsing.
$this->logger->error($e->getMessage());
$response->setStatus(Http::STATUS_BAD_REQUEST);
$response->setBody(json_encode($writtenFiles));
$response->setBody(json_encode($writtenFiles, JSON_THROW_ON_ERROR));
return false;
}
@ -109,7 +109,7 @@ class BulkUploadPlugin extends ServerPlugin {
}
$response->setStatus(Http::STATUS_OK);
$response->setBody(json_encode($writtenFiles));
$response->setBody(json_encode($writtenFiles, JSON_THROW_ON_ERROR));
return false;
}

2
apps/dav/lib/CalDAV/ResourceBooking/AbstractPrincipalBackend.php
Unescape Escape View File

@ -522,7 +522,7 @@ abstract class AbstractPrincipalBackend implements BackendInterface {
}
// group restrictions contains something, but not parsable, deny access and log warning
$json = json_decode($row['group_restrictions']);
$json = json_decode($row['group_restrictions'], null, 512, JSON_THROW_ON_ERROR);
if (!\is_array($json)) {
$this->logger->info('group_restrictions field could not be parsed for ' . $this->dbTableName . '::' . $row['id'] . ', denying access to resource');
return false;

2
apps/dav/lib/Comments/CommentsPlugin.php
Unescape Escape View File

@ -220,7 +220,7 @@ class CommentsPlugin extends ServerPlugin {
*/
private function createComment($objectType, $objectId, $data, $contentType = 'application/json') {
if (explode(';', $contentType)[0] === 'application/json') {
$data = json_decode($data, true);
$data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
} else {
throw new UnsupportedMediaType();
}

10
apps/dav/lib/Connector/Sabre/FilesPlugin.php
Unescape Escape View File

@ -321,11 +321,11 @@ class FilesPlugin extends ServerPlugin {
$user->getUID()
);
$ocmPermissions = $this->ncPermissions2ocmPermissions($ncPermissions);
return json_encode($ocmPermissions);
return json_encode($ocmPermissions, JSON_THROW_ON_ERROR);
});
$propFind->handle(self::SHARE_ATTRIBUTES_PROPERTYNAME, function () use ($node, $httpRequest) {
return json_encode($node->getShareAttributes());
return json_encode($node->getShareAttributes(), JSON_THROW_ON_ERROR);
});
$propFind->handle(self::GETETAG_PROPERTYNAME, function () use ($node): string {
@ -350,7 +350,7 @@ class FilesPlugin extends ServerPlugin {
});
$propFind->handle(self::HAS_PREVIEW_PROPERTYNAME, function () use ($node) {
return json_encode($this->previewManager->isAvailable($node->getFileInfo()));
return json_encode($this->previewManager->isAvailable($node->getFileInfo()), JSON_THROW_ON_ERROR);
});
$propFind->handle(self::SIZE_PROPERTYNAME, function () use ($node): ?int {
return $node->getSize();
@ -422,7 +422,7 @@ class FilesPlugin extends ServerPlugin {
if ($this->config->getSystemValueBool('enable_file_metadata', true)) {
$propFind->handle(self::FILE_METADATA_SIZE, function () use ($node) {
if (!str_starts_with($node->getFileInfo()->getMimetype(), 'image')) {
return json_encode((object)[]);
return json_encode((object)[], JSON_THROW_ON_ERROR);
}
if ($node->hasMetadata('size')) {
@ -438,7 +438,7 @@ class FilesPlugin extends ServerPlugin {
\OC::$server->get(LoggerInterface::class)->debug('Inefficient fetching of metadata');
}
return json_encode((object)$sizeMetadata->getMetadata());
return json_encode((object)$sizeMetadata->getMetadata(), JSON_THROW_ON_ERROR);
});
}
}

2
apps/dav/lib/SystemTag/SystemTagPlugin.php
Unescape Escape View File

@ -163,7 +163,7 @@ class SystemTagPlugin extends \Sabre\DAV\ServerPlugin {
*/
private function createTag($data, $contentType = 'application/json') {
if (explode(';', $contentType)[0] === 'application/json') {
$data = json_decode($data, true);
$data = json_decode($data, true, 512, JSON_THROW_ON_ERROR);
} else {
throw new UnsupportedMediaType();
}

2
apps/dav/lib/UserMigration/ContactsMigrator.php
Unescape Escape View File

@ -248,7 +248,7 @@ class ContactsMigrator implements IMigrator, ISizeEstimationMigrator {
$exportDestination->addFileContents($exportPath, $this->serializeCards($vCards));
$metadata = array_filter(['displayName' => $displayName, 'description' => $description]);
$exportDestination->addFileContents($metadataExportPath, json_encode($metadata));
$exportDestination->addFileContents($metadataExportPath, json_encode($metadata, JSON_THROW_ON_ERROR));
}
} catch (Throwable $e) {
throw new CalendarMigratorException('Could not export address book', 0, $e);