Merge pull request #60582 from nextcloud/backport/60547/stable25

sorbaugh · web-flow · commit 26e674d22b5b · 2026-06-10T16:10:32.000+02:00
[stable25] fix: don't tell the remote their token is lower
diff --git a/apps/federation/lib/Controller/OCSAuthAPIController.php b/apps/federation/lib/Controller/OCSAuthAPIController.php
@@ -118,7 +118,7 @@ public function requestSharedSecret(string $url, string $token): DataResponse {
 				'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.',
 				['app' => 'federation']
 			);
-			throw new OCSForbiddenException();
+			return new DataResponse();
 		}
 
 		$this->jobList->add(

Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ public function requestSharedSecret(string $url, string $token): DataResponse {`
`118`	`118`	`'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.',`
`119`	`119`	`['app' => 'federation']`
`120`	`120`	`);`
`121`		`- throw new OCSForbiddenException();`
	`121`	`+ return new DataResponse();`
`122`	`122`	`}`
`123`	`123`
`124`	`124`	`$this->jobList->add(`