Merge pull request #60585 from nextcloud/backport/60547/stable22

sorbaugh · web-flow · commit 535d85a44c4e · 2026-06-10T16:11:15.000+02:00
[stable22] 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
@@ -154,7 +154,7 @@ public function requestSharedSecret($url, $token) {
 				'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.',
 				['app' => 'federation']
 			);
-			throw new OCSForbiddenException();
+			return new Http\DataResponse();
 		}
 
 		$this->jobList->add(

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ public function requestSharedSecret($url, $token) {`
`154`	`154`	`'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.',`
`155`	`155`	`['app' => 'federation']`
`156`	`156`	`);`
`157`		`- throw new OCSForbiddenException();`
	`157`	`+ return new Http\DataResponse();`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`$this->jobList->add(`