upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 02:31:33 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge pull request #16094 from nextcloud/backport/16027/check-if-uploading-is-enabled-before-verifying

Browse source 
[stable14] Check if uploading to lookup server is enabled before verifying
This commit is contained in:
Roeland Jago Douma 2019-06-28 09:45:09 +02:00 committed by GitHub
commit a728d4cc3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
settings/BackgroundJobs/VerifyUserData.php
View file

@ -60,6 +60,9 @@ class VerifyUserData extends Job {
/** @var ILogger */
private $logger;
/** @var IConfig */
private $config;
/** @var string */
private $lookupServerUrl;
@ -83,6 +86,7 @@ class VerifyUserData extends Job {
$this->httpClientService = $clientService;
$this->logger = $logger;
$this->config = $config;
$lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
$this->lookupServerUrl = rtrim($lookupServerUrl, '/');
}
@ -182,6 +186,11 @@ class VerifyUserData extends Job {
* @return bool true if we could check the verification code, otherwise false
*/
protected function verifyViaLookupServer(array $argument, $dataType) {
if(empty($this->lookupServerUrl) ||
$this->config->getAppValue('files_sharing', 'lookupServerUploadEnabled', 'yes') !== 'yes' ||
$this->config->getSystemValue('has_internet_connection', true) === false) {
return false;
}
$user = $this->userManager->get($argument['uid']);