An update to the MDQ PR #2200 (#2203)

monkeyiq · monkeyiq · commit 5b83335660d3 · 2024-08-13T10:28:59.000+10:00
diff --git a/src/SimpleSAML/Metadata/Sources/MDQ.php b/src/SimpleSAML/Metadata/Sources/MDQ.php
@@ -184,7 +184,7 @@ private function getFromCache(string $set, string $entityId): ?array
         }
 
         // ensure json is decoded as an associative array not an object
-        $data = json_decode($rawData, true);
+        $data = json_decode($rawData, true, 512, JSON_THROW_ON_ERROR);
         if ($data === false) {
             throw new Exception(
                 sprintf('%s: error unserializing cached data from file "%s".', __CLASS__, strval($file)),
@@ -218,8 +218,7 @@ private function writeToCache(string $set, string $entityId, array $data): void
 
         Logger::debug(sprintf('%s: Writing cache [%s] => [%s]', __CLASS__, $entityId, $cacheFileName));
 
-        // using dumpFile instead of appendToFile here to replace any existing cache data
-        $this->fileSystem->dumpFile($cacheFileName, json_encode($data));
+        $this->fileSystem->dumpFile($cacheFileName, json_encode($data, JSON_THROW_ON_ERROR));
     }
 
 

Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ private function getFromCache(string $set, string $entityId): ?array`
`184`	`184`	`}`
`185`	`185`
`186`	`186`	`// ensure json is decoded as an associative array not an object`
`187`		`- $data = json_decode($rawData, true);`
	`187`	`+ $data = json_decode($rawData, true, 512, JSON_THROW_ON_ERROR);`
`188`	`188`	`if ($data === false) {`
`189`	`189`	`throw new Exception(`
`190`	`190`	`sprintf('%s: error unserializing cached data from file "%s".', __CLASS__, strval($file)),`
`@@ -218,8 +218,7 @@ private function writeToCache(string $set, string $entityId, array $data): void`
`218`	`218`
`219`	`219`	`Logger::debug(sprintf('%s: Writing cache [%s] => [%s]', __CLASS__, $entityId, $cacheFileName));`
`220`	`220`
`221`		`- // using dumpFile instead of appendToFile here to replace any existing cache data`
`222`		`- $this->fileSystem->dumpFile($cacheFileName, json_encode($data));`
	`221`	`+ $this->fileSystem->dumpFile($cacheFileName, json_encode($data, JSON_THROW_ON_ERROR));`
`223`	`222`	`}`
`224`	`223`
`225`	`224`