nextcloud / server

settings/BackgroundJobs/VerifyUserData.php

Indentation +234 added lines, -234 removed lines

@@ -35,239 +35,239 @@
 
 class VerifyUserData extends Job {
 
-	/** @var  bool */
-	private $retainJob = true;
-
-	/** @var int max number of attempts to send the request */
-	private $maxTry = 24;
-
-	/** @var int how much time should be between two tries (1 hour) */
-	private $interval = 3600;
-
-	/** @var AccountManager */
-	private $accountManager;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var IClientService */
-	private $httpClientService;
-
-	/** @var ILogger */
-	private $logger;
-
-	/** @var string */
-	private $lookupServerUrl;
-
-	/**
-	 * VerifyUserData constructor.
-	 *
-	 * @param AccountManager $accountManager
-	 * @param IUserManager $userManager
-	 * @param IClientService $clientService
-	 * @param ILogger $logger
-	 * @param IConfig $config
-	 */
-	public function __construct(AccountManager $accountManager,
-								IUserManager $userManager,
-								IClientService $clientService,
-								ILogger $logger,
-								IConfig $config
-	) {
-		$this->accountManager = $accountManager;
-		$this->userManager = $userManager;
-		$this->httpClientService = $clientService;
-		$this->logger = $logger;
-
-		$lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
-		$this->lookupServerUrl = rtrim($lookupServerUrl, '/');
-	}
-
-	/**
-	 * run the job, then remove it from the jobList
-	 *
-	 * @param JobList $jobList
-	 * @param ILogger $logger
-	 */
-	public function execute($jobList, ILogger $logger = null) {
-
-		if ($this->shouldRun($this->argument)) {
-			parent::execute($jobList, $logger);
-			$jobList->remove($this, $this->argument);
-			if ($this->retainJob) {
-				$this->reAddJob($jobList, $this->argument);
-			}
-		}
-
-	}
-
-	protected function run($argument) {
-
-		$try = (int)$argument['try'] + 1;
-
-		switch($argument['type']) {
-			case AccountManager::PROPERTY_WEBSITE:
-				$result = $this->verifyWebsite($argument);
-				break;
-			case AccountManager::PROPERTY_TWITTER:
-			case AccountManager::PROPERTY_EMAIL:
-				$result = $this->verifyViaLookupServer($argument, $argument['type']);
-				break;
-			default:
-				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
-				$result = true;
-		}
-
-		if ($result === true || $try > $this->maxTry) {
-			$this->retainJob = false;
-		}
-	}
-
-	/**
-	 * verify web page
-	 *
-	 * @param array $argument
-	 * @return bool true if we could check the verification code, otherwise false
-	 */
-	protected function verifyWebsite(array $argument) {
-
-		$result = false;
-
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
-
-		$client = $this->httpClientService->newClient();
-		try {
-			$response = $client->get($url);
-		} catch (\Exception $e) {
-			return false;
-		}
-
-		if ($response->getStatusCode() === Http::STATUS_OK) {
-			$result = true;
-			$publishedCode = $response->getBody();
-			// remove new lines and spaces
-			$publishedCodeSanitized = trim(preg_replace('/\s\s+/', ' ', $publishedCode));
-			$user = $this->userManager->get($argument['uid']);
-			// we don't check a valid user -> give up
-			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-				return $result;
-			}
-			$userData = $this->accountManager->getUser($user);
-
-			if ($publishedCodeSanitized === $argument['verificationCode']) {
-				$userData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFIED;
-			} else {
-				$userData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::NOT_VERIFIED;
-			}
-
-			$this->accountManager->updateUser($user, $userData);
-		}
-
-		return $result;
-	}
-
-	/**
-	 * verify email address
-	 *
-	 * @param array $argument
-	 * @param string $dataType
-	 * @return bool true if we could check the verification code, otherwise false
-	 */
-	protected function verifyViaLookupServer(array $argument, $dataType) {
-
-		$user = $this->userManager->get($argument['uid']);
-
-		// we don't check a valid user -> give up
-		if ($user === null) {
-			$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
-			return true;
-		}
-
-		$localUserData = $this->accountManager->getUser($user);
-		$cloudId = $user->getCloudId();
-
-		// ask lookup-server for user data
-		$lookupServerData = $this->queryLookupServer($cloudId);
-
-		// for some reasons we couldn't read any data from the lookup server, try again later
-		if (empty($lookupServerData)) {
-			return false;
-		}
-
-		// lookup server has verification data for wrong user data (e.g. email address), try again later
-		if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
-			return false;
-		}
-
-		// lookup server hasn't verified the email address so far, try again later
-		if ($lookupServerData[$dataType]['verified'] === AccountManager::NOT_VERIFIED) {
-			return false;
-		}
-
-		$localUserData[$dataType]['verified'] = AccountManager::VERIFIED;
-		$this->accountManager->updateUser($user, $localUserData);
-
-		return true;
-	}
-
-	/**
-	 * @param string $cloudId
-	 * @return array
-	 */
-	protected function queryLookupServer($cloudId) {
-		try {
-			$client = $this->httpClientService->newClient();
-			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
-				[
-					'timeout' => 10,
-					'connect_timeout' => 3,
-				]
-			);
-
-			$body = json_decode($response->getBody(), true);
-
-			if ($body['federationId'] === $cloudId) {
-				return $body;
-			}
-
-		} catch (\Exception $e) {
-			// do nothing, we will just re-try later
-		}
-
-		return [];
-	}
-
-	/**
-	 * re-add background job with new arguments
-	 *
-	 * @param IJobList $jobList
-	 * @param array $argument
-	 */
-	protected function reAddJob(IJobList $jobList, array $argument) {
-		$jobList->add('OC\Settings\BackgroundJobs\VerifyUserData',
-			[
-				'verificationCode' => $argument['verificationCode'],
-				'data' => $argument['data'],
-				'type' => $argument['type'],
-				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
-				'lastRun' => time()
-			]
-		);
-	}
-
-	/**
-	 * test if it is time for the next run
-	 *
-	 * @param array $argument
-	 * @return bool
-	 */
-	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
-		return ((time() - $lastRun) > $this->interval);
-	}
+    /** @var  bool */
+    private $retainJob = true;
+
+    /** @var int max number of attempts to send the request */
+    private $maxTry = 24;
+
+    /** @var int how much time should be between two tries (1 hour) */
+    private $interval = 3600;
+
+    /** @var AccountManager */
+    private $accountManager;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var IClientService */
+    private $httpClientService;
+
+    /** @var ILogger */
+    private $logger;
+
+    /** @var string */
+    private $lookupServerUrl;
+
+    /**
+     * VerifyUserData constructor.
+     *
+     * @param AccountManager $accountManager
+     * @param IUserManager $userManager
+     * @param IClientService $clientService
+     * @param ILogger $logger
+     * @param IConfig $config
+     */
+    public function __construct(AccountManager $accountManager,
+                                IUserManager $userManager,
+                                IClientService $clientService,
+                                ILogger $logger,
+                                IConfig $config
+    ) {
+        $this->accountManager = $accountManager;
+        $this->userManager = $userManager;
+        $this->httpClientService = $clientService;
+        $this->logger = $logger;
+
+        $lookupServerUrl = $config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+        $this->lookupServerUrl = rtrim($lookupServerUrl, '/');
+    }
+
+    /**
+     * run the job, then remove it from the jobList
+     *
+     * @param JobList $jobList
+     * @param ILogger $logger
+     */
+    public function execute($jobList, ILogger $logger = null) {
+
+        if ($this->shouldRun($this->argument)) {
+            parent::execute($jobList, $logger);
+            $jobList->remove($this, $this->argument);
+            if ($this->retainJob) {
+                $this->reAddJob($jobList, $this->argument);
+            }
+        }
+
+    }
+
+    protected function run($argument) {
+
+        $try = (int)$argument['try'] + 1;
+
+        switch($argument['type']) {
+            case AccountManager::PROPERTY_WEBSITE:
+                $result = $this->verifyWebsite($argument);
+                break;
+            case AccountManager::PROPERTY_TWITTER:
+            case AccountManager::PROPERTY_EMAIL:
+                $result = $this->verifyViaLookupServer($argument, $argument['type']);
+                break;
+            default:
+                // no valid type given, no need to retry
+                $this->logger->error($argument['type'] . ' is no valid type for user account data.');
+                $result = true;
+        }
+
+        if ($result === true || $try > $this->maxTry) {
+            $this->retainJob = false;
+        }
+    }
+
+    /**
+     * verify web page
+     *
+     * @param array $argument
+     * @return bool true if we could check the verification code, otherwise false
+     */
+    protected function verifyWebsite(array $argument) {
+
+        $result = false;
+
+        $url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+
+        $client = $this->httpClientService->newClient();
+        try {
+            $response = $client->get($url);
+        } catch (\Exception $e) {
+            return false;
+        }
+
+        if ($response->getStatusCode() === Http::STATUS_OK) {
+            $result = true;
+            $publishedCode = $response->getBody();
+            // remove new lines and spaces
+            $publishedCodeSanitized = trim(preg_replace('/\s\s+/', ' ', $publishedCode));
+            $user = $this->userManager->get($argument['uid']);
+            // we don't check a valid user -> give up
+            if ($user === null) {
+                $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+                return $result;
+            }
+            $userData = $this->accountManager->getUser($user);
+
+            if ($publishedCodeSanitized === $argument['verificationCode']) {
+                $userData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::VERIFIED;
+            } else {
+                $userData[AccountManager::PROPERTY_WEBSITE]['verified'] = AccountManager::NOT_VERIFIED;
+            }
+
+            $this->accountManager->updateUser($user, $userData);
+        }
+
+        return $result;
+    }
+
+    /**
+     * verify email address
+     *
+     * @param array $argument
+     * @param string $dataType
+     * @return bool true if we could check the verification code, otherwise false
+     */
+    protected function verifyViaLookupServer(array $argument, $dataType) {
+
+        $user = $this->userManager->get($argument['uid']);
+
+        // we don't check a valid user -> give up
+        if ($user === null) {
+            $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+            return true;
+        }
+
+        $localUserData = $this->accountManager->getUser($user);
+        $cloudId = $user->getCloudId();
+
+        // ask lookup-server for user data
+        $lookupServerData = $this->queryLookupServer($cloudId);
+
+        // for some reasons we couldn't read any data from the lookup server, try again later
+        if (empty($lookupServerData)) {
+            return false;
+        }
+
+        // lookup server has verification data for wrong user data (e.g. email address), try again later
+        if ($lookupServerData[$dataType]['value'] !== $argument['data']) {
+            return false;
+        }
+
+        // lookup server hasn't verified the email address so far, try again later
+        if ($lookupServerData[$dataType]['verified'] === AccountManager::NOT_VERIFIED) {
+            return false;
+        }
+
+        $localUserData[$dataType]['verified'] = AccountManager::VERIFIED;
+        $this->accountManager->updateUser($user, $localUserData);
+
+        return true;
+    }
+
+    /**
+     * @param string $cloudId
+     * @return array
+     */
+    protected function queryLookupServer($cloudId) {
+        try {
+            $client = $this->httpClientService->newClient();
+            $response = $client->get(
+                $this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+                [
+                    'timeout' => 10,
+                    'connect_timeout' => 3,
+                ]
+            );
+
+            $body = json_decode($response->getBody(), true);
+
+            if ($body['federationId'] === $cloudId) {
+                return $body;
+            }
+
+        } catch (\Exception $e) {
+            // do nothing, we will just re-try later
+        }
+
+        return [];
+    }
+
+    /**
+     * re-add background job with new arguments
+     *
+     * @param IJobList $jobList
+     * @param array $argument
+     */
+    protected function reAddJob(IJobList $jobList, array $argument) {
+        $jobList->add('OC\Settings\BackgroundJobs\VerifyUserData',
+            [
+                'verificationCode' => $argument['verificationCode'],
+                'data' => $argument['data'],
+                'type' => $argument['type'],
+                'uid' => $argument['uid'],
+                'try' => (int)$argument['try'] + 1,
+                'lastRun' => time()
+            ]
+        );
+    }
+
+    /**
+     * test if it is time for the next run
+     *
+     * @param array $argument
+     * @return bool
+     */
+    protected function shouldRun(array $argument) {
+        $lastRun = (int)$argument['lastRun'];
+        return ((time() - $lastRun) > $this->interval);
+    }
 
 }

Spacing +9 added lines, -9 removed lines

@@ -103,9 +103,9 @@ 
 
 	protected function run($argument) {
 
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
-		switch($argument['type']) {
+		switch ($argument['type']) {
 			case AccountManager::PROPERTY_WEBSITE:
 				$result = $this->verifyWebsite($argument);
 				break;
@@ -115,7 +115,7 @@ 
 				break;
 			default:
 				// no valid type given, no need to retry
-				$this->logger->error($argument['type'] . ' is no valid type for user account data.');
+				$this->logger->error($argument['type'].' is no valid type for user account data.');
 				$result = true;
 		}
 
@@ -134,7 +134,7 @@ 
 
 		$result = false;
 
-		$url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt';
+		$url = rtrim($argument['data'], '/').'/.well-known/'.'CloudIdVerificationCode.txt';
 
 		$client = $this->httpClientService->newClient();
 		try {
@@ -151,7 +151,7 @@ 
 			$user = $this->userManager->get($argument['uid']);
 			// we don't check a valid user -> give up
 			if ($user === null) {
-				$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+				$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 				return $result;
 			}
 			$userData = $this->accountManager->getUser($user);
@@ -181,7 +181,7 @@ 
 
 		// we don't check a valid user -> give up
 		if ($user === null) {
-			$this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.');
+			$this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.');
 			return true;
 		}
 
@@ -220,7 +220,7 @@ 
 		try {
 			$client = $this->httpClientService->newClient();
 			$response = $client->get(
-				$this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1',
+				$this->lookupServerUrl.'/users?search='.urlencode($cloudId).'&exactCloudId=1',
 				[
 					'timeout' => 10,
 					'connect_timeout' => 3,
@@ -253,7 +253,7 @@ 
 				'data' => $argument['data'],
 				'type' => $argument['type'],
 				'uid' => $argument['uid'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => time()
 			]
 		);
@@ -266,7 +266,7 @@ 
 	 * @return bool
 	 */
 	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return ((time() - $lastRun) > $this->interval);
 	}