In some cases (for example you never send data to the lookup server) there is no need for this job to even try. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>tags/v22.0.0beta1
@@ -152,7 +152,14 @@ class RetryJob extends Job { | |||
try { | |||
if (count($data) === 1) { | |||
// No public data, just the federation Id | |||
$dataOnLookupServer = $this->config->getUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '0') === '1'; | |||
if (!$dataOnLookupServer) { | |||
// We never send data to the lookupserver so no need to delete it | |||
return; | |||
} | |||
// There is data on the lookup server so we must delete it | |||
$client->delete($this->lookupServer, | |||
[ | |||
'body' => json_encode($signedData), | |||
@@ -160,6 +167,8 @@ class RetryJob extends Job { | |||
'connect_timeout' => 3, | |||
] | |||
); | |||
$this->config->setUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '0'); | |||
} else { | |||
$client->post($this->lookupServer, | |||
[ | |||
@@ -168,6 +177,7 @@ class RetryJob extends Job { | |||
'connect_timeout' => 3, | |||
] | |||
); | |||
$this->config->setUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '1'); | |||
} | |||
// Reset retry counter |
@@ -0,0 +1,51 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @copyright Copyright (c) 2021 Roeland Jago Douma <roeland@famdouma.nl> | |||
* | |||
* @author Roeland Jago Douma <roeland@famdouma.nl> | |||
* | |||
* @license GNU AGPL version 3 or any later version | |||
* | |||
* This program is free software: you can redistribute it and/or modify | |||
* it under the terms of the GNU Affero General Public License as | |||
* published by the Free Software Foundation, either version 3 of the | |||
* License, or (at your option) any later version. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU Affero General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Affero General Public License | |||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
* | |||
*/ | |||
namespace OC\Core\BackgroundJobs; | |||
use OC\BackgroundJob\QueuedJob; | |||
use OCP\IConfig; | |||
use OCP\IUser; | |||
use OCP\IUserManager; | |||
class LookupServerSendCheckBackgroundJob extends QueuedJob { | |||
/** @var IConfig */ | |||
protected $config; | |||
/** @var IUserManager */ | |||
private $userManager; | |||
public function __construct(IConfig $config, IUserManager $userManager) { | |||
$this->config = $config; | |||
$this->userManager = $userManager; | |||
} | |||
public function run($arguments) { | |||
$this->userManager->callForSeenUsers(function (IUser $user) { | |||
$this->config->setUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '1'); | |||
}); | |||
} | |||
} |
@@ -792,6 +792,7 @@ return array( | |||
'OC\\Core\\BackgroundJobs\\BackgroundCleanupUpdaterBackupsJob' => $baseDir . '/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php', | |||
'OC\\Core\\BackgroundJobs\\CheckForUserCertificates' => $baseDir . '/core/BackgroundJobs/CheckForUserCertificates.php', | |||
'OC\\Core\\BackgroundJobs\\CleanupLoginFlowV2' => $baseDir . '/core/BackgroundJobs/CleanupLoginFlowV2.php', | |||
'OC\\Core\\BackgroundJobs\\LookupServerSendCheckBackgroundJob' => $baseDir . '/core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php', | |||
'OC\\Core\\Command\\App\\CheckCode' => $baseDir . '/core/Command/App/CheckCode.php', | |||
'OC\\Core\\Command\\App\\Disable' => $baseDir . '/core/Command/App/Disable.php', | |||
'OC\\Core\\Command\\App\\Enable' => $baseDir . '/core/Command/App/Enable.php', | |||
@@ -1304,6 +1305,7 @@ return array( | |||
'OC\\Repair\\NC20\\ShippedDashboardEnable' => $baseDir . '/lib/private/Repair/NC20/ShippedDashboardEnable.php', | |||
'OC\\Repair\\NC21\\AddCheckForUserCertificatesJob' => $baseDir . '/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php', | |||
'OC\\Repair\\NC21\\ValidatePhoneNumber' => $baseDir . '/lib/private/Repair/NC21/ValidatePhoneNumber.php', | |||
'OC\\Repair\\NC22\\LookupServerSendCheck' => $baseDir . '/lib/private/Repair/NC22/LookupServerSendCheck.php', | |||
'OC\\Repair\\OldGroupMembershipShares' => $baseDir . '/lib/private/Repair/OldGroupMembershipShares.php', | |||
'OC\\Repair\\Owncloud\\CleanPreviews' => $baseDir . '/lib/private/Repair/Owncloud/CleanPreviews.php', | |||
'OC\\Repair\\Owncloud\\CleanPreviewsBackgroundJob' => $baseDir . '/lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php', |
@@ -821,6 +821,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c | |||
'OC\\Core\\BackgroundJobs\\BackgroundCleanupUpdaterBackupsJob' => __DIR__ . '/../../..' . '/core/BackgroundJobs/BackgroundCleanupUpdaterBackupsJob.php', | |||
'OC\\Core\\BackgroundJobs\\CheckForUserCertificates' => __DIR__ . '/../../..' . '/core/BackgroundJobs/CheckForUserCertificates.php', | |||
'OC\\Core\\BackgroundJobs\\CleanupLoginFlowV2' => __DIR__ . '/../../..' . '/core/BackgroundJobs/CleanupLoginFlowV2.php', | |||
'OC\\Core\\BackgroundJobs\\LookupServerSendCheckBackgroundJob' => __DIR__ . '/../../..' . '/core/BackgroundJobs/LookupServerSendCheckBackgroundJob.php', | |||
'OC\\Core\\Command\\App\\CheckCode' => __DIR__ . '/../../..' . '/core/Command/App/CheckCode.php', | |||
'OC\\Core\\Command\\App\\Disable' => __DIR__ . '/../../..' . '/core/Command/App/Disable.php', | |||
'OC\\Core\\Command\\App\\Enable' => __DIR__ . '/../../..' . '/core/Command/App/Enable.php', | |||
@@ -1333,6 +1334,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c | |||
'OC\\Repair\\NC20\\ShippedDashboardEnable' => __DIR__ . '/../../..' . '/lib/private/Repair/NC20/ShippedDashboardEnable.php', | |||
'OC\\Repair\\NC21\\AddCheckForUserCertificatesJob' => __DIR__ . '/../../..' . '/lib/private/Repair/NC21/AddCheckForUserCertificatesJob.php', | |||
'OC\\Repair\\NC21\\ValidatePhoneNumber' => __DIR__ . '/../../..' . '/lib/private/Repair/NC21/ValidatePhoneNumber.php', | |||
'OC\\Repair\\NC22\\LookupServerSendCheck' => __DIR__ . '/../../..' . '/lib/private/Repair/NC22/LookupServerSendCheck.php', | |||
'OC\\Repair\\OldGroupMembershipShares' => __DIR__ . '/../../..' . '/lib/private/Repair/OldGroupMembershipShares.php', | |||
'OC\\Repair\\Owncloud\\CleanPreviews' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/CleanPreviews.php', | |||
'OC\\Repair\\Owncloud\\CleanPreviewsBackgroundJob' => __DIR__ . '/../../..' . '/lib/private/Repair/Owncloud/CleanPreviewsBackgroundJob.php', |
@@ -45,6 +45,7 @@ use OC\Repair\ClearFrontendCaches; | |||
use OC\Repair\ClearGeneratedAvatarCache; | |||
use OC\Repair\Collation; | |||
use OC\Repair\MoveUpdaterStepFile; | |||
use OC\Repair\NC22\LookupServerSendCheck; | |||
use OC\Repair\Owncloud\CleanPreviews; | |||
use OC\Repair\NC11\FixMountStorages; | |||
use OC\Repair\Owncloud\MoveAvatars; | |||
@@ -199,7 +200,8 @@ class Repair implements IOutput { | |||
\OC::$server->get(ShippedDashboardEnable::class), | |||
\OC::$server->get(AddBruteForceCleanupJob::class), | |||
\OC::$server->get(AddCheckForUserCertificatesJob::class), | |||
\OC::$server->get(RepairDavShares::class) | |||
\OC::$server->get(RepairDavShares::class), | |||
\OC::$server->get(LookupServerSendCheck::class), | |||
]; | |||
} | |||
@@ -0,0 +1,62 @@ | |||
<?php | |||
declare(strict_types=1); | |||
/** | |||
* @copyright Copyright (c) 2021 Roeland Jago Douma <roeland@famdouma.nl> | |||
* | |||
* @author Roeland Jago Douma <roeland@famdouma.nl> | |||
* | |||
* @license GNU AGPL version 3 or any later version | |||
* | |||
* This program is free software: you can redistribute it and/or modify | |||
* it under the terms of the GNU Affero General Public License as | |||
* published by the Free Software Foundation, either version 3 of the | |||
* License, or (at your option) any later version. | |||
* | |||
* This program is distributed in the hope that it will be useful, | |||
* but WITHOUT ANY WARRANTY; without even the implied warranty of | |||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |||
* GNU Affero General Public License for more details. | |||
* | |||
* You should have received a copy of the GNU Affero General Public License | |||
* along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
* | |||
*/ | |||
namespace OC\Repair\NC22; | |||
use OC\Core\BackgroundJobs\LookupServerSendCheckBackgroundJob; | |||
use OCP\BackgroundJob\IJobList; | |||
use OCP\IConfig; | |||
use OCP\Migration\IOutput; | |||
use OCP\Migration\IRepairStep; | |||
class LookupServerSendCheck implements IRepairStep { | |||
/** @var IJobList */ | |||
private $jobList; | |||
/** @var IConfig */ | |||
private $config; | |||
public function __construct(IJobList $jobList, IConfig $config) { | |||
$this->jobList = $jobList; | |||
$this->config = $config; | |||
} | |||
public function getName(): string { | |||
return 'Add background job to set the lookup server share state for users'; | |||
} | |||
private function shouldRun(): bool { | |||
$versionFromBeforeUpdate = $this->config->getSystemValue('version', '0.0.0.0'); | |||
// was added to 22.0.0.3 | |||
return version_compare($versionFromBeforeUpdate, '22.0.0.3', '<'); | |||
} | |||
public function run(IOutput $output): void { | |||
$this->jobList->add(LookupServerSendCheckBackgroundJob::class); | |||
} | |||
} |
@@ -30,7 +30,7 @@ | |||
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel | |||
// when updating major/minor version number. | |||
$OC_Version = [22, 0, 0, 2]; | |||
$OC_Version = [22, 0, 0, 3]; | |||
// The human readable string | |||
$OC_VersionString = '22.0.0 alpha'; |