upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-03 20:41:22 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

fix(federation): re-add RequestSharedSecret job if necessary

Browse source 
fighting another race condition with federated server setup

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
This commit is contained in:
Arthur Schiwon 2024-04-16 13:14:11 +02:00 committed by Andy Scherzinger
parent 6b85a3ae0e
commit 1ba58415e6
1 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/federation/lib/Controller/OCSAuthAPIController.php
View file

@ -7,6 +7,7 @@
*/
namespace OCA\Federation\Controller;
use OCA\Federation\BackgroundJob\RequestSharedSecret;
use OCA\Federation\DbHandler;
use OCA\Federation\TrustedServers;
use OCP\AppFramework\Http;
@ -126,6 +127,25 @@ class OCSAuthAPIController extends OCSController {
'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.',
['app' => 'federation']
);
$hasJob = false;
foreach ($this->jobList->getJobsIterator(RequestSharedSecret::class, null, 0) as $job) {
$arg = $job->getArgument();
if (is_array($arg) && isset($arg['url']) && $arg['url'] === $url) {
$hasJob = true;
break;
}
}
if (!$hasJob) {
$this->jobList->add(
RequestSharedSecret::class,
[
'url' => $url,
'token' => $this->dbHandler->getToken($url),
'created' => $this->timeFactory->getTime()
]
);
}
throw new OCSForbiddenException();
}