fix(ocm): test

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

Author: ArtificialOwl

lib/private/Security/Signature/SignatureManager.php

@@ -112,9 +112,7 @@ public function getIncomingSignedRequest(
 			$this->prepIncomingSignatureHeader($signedRequest);
 			$this->verifyIncomingSignatureHeader($signedRequest);
 			$this->prepEstimatedSignature($signedRequest, $options['extraSignatureHeaders'] ?? []);
-			$this->verifyIncomingRequestSignature(
-				$signedRequest, $signatoryManager, $options['ttlSignatory'] ?? self::SIGNATORY_TTL
-			);
+			$this->verifyIncomingRequestSignature($signedRequest, $signatoryManager, $options['ttlSignatory'] ?? self::SIGNATORY_TTL);
 		} catch (SignatureException $e) {
 			$this->logger->warning(
 				'signature could not be verified', [
@@ -458,7 +456,8 @@ private function verifyIncomingRequestSignature(
 			$this->verifySignedRequest($signedRequest);
 		} catch (InvalidKeyOriginException $e) {
 			throw $e; // issue while requesting remote instance also means there is no 2nd try
-		} catch (SignatoryNotFoundException|SignatureException) {
+		} catch (SignatoryNotFoundException|SignatureException $e) {
+			$this->logger->warning('signatory not found', ['exception' => $e, 'signedRequest' => $signedRequest]);
 			try {
 				$signatory = $this->getSafeRemoteSignatory($signatoryManager, $signedRequest);
 			} catch (SignatoryNotFoundException $e) {
@@ -724,7 +723,6 @@ private function updateKnownSignatory(ISignatory $signatory): void {
 			case SignatoryType::FORGIVABLE:
 				$this->deleteSignatory($knownSignatory->getKeyId());
 				$this->insertSignatory($signatory);
-
 				return;
 
 			case SignatoryType::REFRESHABLE:
@@ -734,13 +732,11 @@ private function updateKnownSignatory(ISignatory $signatory): void {
 
 			case SignatoryType::TRUSTED:
 				// TODO: send notice to admin
-				throw new SignatoryConflictException();
-				break;
+				throw new SignatoryConflictException('conflict between ' . json_encode($signatory) . ' ' . json_encode($knownSignatory));
 
 			case SignatoryType::STATIC:
 				// TODO: send warning to admin
 				throw new SignatoryConflictException();
-				break;
 		}
 	}