upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-26 11:22:28 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #59726 from nextcloud/backport/59722/stable33

Browse source 
[stable33] fix(federation): Also sign requests with NCU providers
This commit is contained in:
Joas Schilling 2026-04-20 15:04:19 +02:00 committed by GitHub
commit 4e60fb7348
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/cloud_federation_api/lib/Controller/RequestHandlerController.php
View file

@ -488,7 +488,7 @@ class RequestHandlerController extends Controller {
try {
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
if ($provider instanceof ISignedCloudFederationProvider) {
if ($provider instanceof ISignedCloudFederationProvider || $provider instanceof \NCU\Federation\ISignedCloudFederationProvider) {
$identity = $provider->getFederationIdFromSharedSecret($sharedSecret, $notification);
} else {
$this->logger->debug('cloud federation provider {provider} does not implements ISignedCloudFederationProvider', ['provider' => $provider::class]);

1
build/psalm-baseline.xml
View file

@ -37,6 +37,7 @@
'preLoginNameUsedAsUserName',
['uid' => &$uid]
)]]></code>
<code><![CDATA[getFederationIdFromSharedSecret]]></code>
</DeprecatedMethod>
</file>
<file src="apps/comments/lib/Activity/Listener.php">