feat(ocm): minor fixes

Signed-off-by: Maxence Lange <[email protected]>

Author: ArtificialOwl

apps/cloud_federation_api/lib/Controller/OCMRequestController.php

@@ -53,9 +53,7 @@ public function __construct(
 	#[PublicPage]
 	#[BruteForceProtection(action: 'receiveOcmRequest')]
 	public function manageOCMRequests(string $ocmPath): Response {
-		try {
-			json_encode($ocmPath, JSON_THROW_ON_ERROR | JSON_UNESCAPED_SLASHES);
-		} catch (JsonException) {
+		if (!mb_check_encoding($ocmPath, 'UTF-8')) {
 			throw new OCMArgumentException('path is not UTF-8');
 		}
 
@@ -71,15 +69,15 @@ public function manageOCMRequests(string $ocmPath): Response {
 		// assuming that ocm request contains a json array
 		$payload = $signedRequest?->getBody() ?? file_get_contents('php://input');
 		try {
-			$payload = (!$payload) ? null : json_decode($payload, true, 512, JSON_THROW_ON_ERROR);
+			$payload = ($payload) ? json_decode($payload, true, 512, JSON_THROW_ON_ERROR) : null;
 		} catch (JsonException $e) {
 			$this->logger->debug('json decode error', ['exception' => $e]);
 			$payload = null;
 		}
 
 		$event = new OCMEndpointRequestEvent(
 			$this->request->getMethod(),
-			str_replace('//', '/', $ocmPath),
+			preg_replace('@/+@', '/', $ocmPath),
 			$payload,
 			$signedRequest?->getOrigin()
 		);