Skip to content

Commit c99fd12

Browse files
authored
Merge pull request #59722 from nextcloud/bugfix/noid/still-sign-deprecated-ncu
fix(federation): Also sign requests with NCU providers
2 parents b23ab0c + a51e58e commit c99fd12

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ private function confirmNotificationIdentity(
488488

489489
try {
490490
$provider = $this->cloudFederationProviderManager->getCloudFederationProvider($resourceType);
491-
if ($provider instanceof ISignedCloudFederationProvider) {
491+
if ($provider instanceof ISignedCloudFederationProvider || $provider instanceof \NCU\Federation\ISignedCloudFederationProvider) {
492492
$identity = $provider->getFederationIdFromSharedSecret($sharedSecret, $notification);
493493
} else {
494494
$this->logger->debug('cloud federation provider {provider} does not implements ISignedCloudFederationProvider', ['provider' => $provider::class]);

build/psalm-baseline.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
'preLoginNameUsedAsUserName',
3838
['uid' => &$uid]
3939
)]]></code>
40+
<code><![CDATA[getFederationIdFromSharedSecret]]></code>
4041
</DeprecatedMethod>
4142
</file>
4243
<file src="apps/comments/lib/Activity/Listener.php">

0 commit comments

Comments
 (0)