Merge pull request #3869 from nextcloud/verify-personal-data

Verify personal data
nextcloud · Apr 29, 2017 · 1307800 · 1307800
2 parents 2a77331 + a0bf706
commit 1307800
Show file tree

Hide file tree

Showing 23 changed files with 957 additions and 56 deletions.
diff --git a/apps/federatedfilesharing/js/settings-personal.js b/apps/federatedfilesharing/js/settings-personal.js
@@ -20,6 +20,9 @@ $(document).ready(function() {
 		}
 	});
 
+	/* Verification icon tooltip */
+	$('#personal-settings-container .verify img').tooltip({placement: 'bottom', trigger: 'hover'});
+
 	$('#fileSharingSettings .clipboardButton').tooltip({placement: 'bottom', title: t('core', 'Copy'), trigger: 'hover'});
 
 	// Clipboard!

diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php
@@ -654,13 +654,15 @@ protected function getEmail($search) {
 
 	protected function getLookup($search) {
 		$isEnabled = $this->config->getAppValue('files_sharing', 'lookupServerEnabled', 'no');
+		$lookupServerUrl = $this->config->getSystemValue('lookup_server', 'https://lookup.nextcloud.com');
+		$lookupServerUrl = rtrim($lookupServerUrl, '/');
 		$result = [];
 
 		if($isEnabled === 'yes') {
 			try {
 				$client = $this->clientService->newClient();
 				$response = $client->get(
-					'https://lookup.nextcloud.com/users?search=' . urlencode($search),
+					$lookupServerUrl . '/users?search=' . urlencode($search),
 					[
 						'timeout' => 10,
 						'connect_timeout' => 3,

diff --git a/apps/lookup_server_connector/appinfo/app.php b/apps/lookup_server_connector/appinfo/app.php
@@ -28,18 +28,24 @@
 		\OC::$server->getAppDataDir('identityproof'),
 		\OC::$server->getCrypto()
 	);
+
+	$config = \OC::$server->getConfig();
+	$lookupServer = $config->getSystemValue('lookup_server', '');
+
 	$updateLookupServer = new \OCA\LookupServerConnector\UpdateLookupServer(
-		new \OC\Accounts\AccountManager(\OC::$server->getDatabaseConnection(), \OC::$server->getEventDispatcher()),
-		\OC::$server->getConfig(),
-		\OC::$server->getSecureRandom(),
+		new \OC\Accounts\AccountManager(
+			\OC::$server->getDatabaseConnection(),
+			\OC::$server->getEventDispatcher(),
+			\OC::$server->getJobList()
+		),
 		\OC::$server->getHTTPClientService(),
-		$keyManager,
 		new \OC\Security\IdentityProof\Signer(
 			$keyManager,
 			new \OC\AppFramework\Utility\TimeFactory(),
 			\OC::$server->getUserManager()
 		),
-		\OC::$server->getJobList()
+		\OC::$server->getJobList(),
+		$lookupServer
 	);
 	$updateLookupServer->userUpdated($user);
 });
diff --git a/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php b/apps/lookup_server_connector/lib/BackgroundJobs/RetryJob.php
@@ -26,6 +26,7 @@
 use OC\BackgroundJob\Job;
 use OCP\BackgroundJob\IJobList;
 use OCP\Http\Client\IClientService;
+use OCP\ILogger;
 
 class RetryJob extends Job {
 	/** @var IClientService */
@@ -36,21 +37,28 @@ class RetryJob extends Job {
 	private $lookupServer = 'https://lookup.nextcloud.com/users';
 
 	/**
-	 * @param IClientService|null $clientService
-	 * @param IJobList|null $jobList
+	 * @param IClientService $clientService
+	 * @param IJobList $jobList
 	 */
-	public function __construct(IClientService $clientService = null,
-								IJobList $jobList = null) {
-		if($clientService !== null) {
-			$this->clientService = $clientService;
-		} else {
-			$this->clientService = \OC::$server->getHTTPClientService();
-		}
-		if($jobList !== null) {
-			$this->jobList = $jobList;
-		} else {
-			$this->jobList = \OC::$server->getJobList();
+	public function __construct(IClientService $clientService,
+								IJobList $jobList) {
+		$this->clientService = $clientService;
+		$this->jobList = $jobList;
+	}
+
+	/**
+	 * 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);
 		}
+
 	}
 
 	protected function run($argument) {

diff --git a/apps/lookup_server_connector/lib/UpdateLookupServer.php b/apps/lookup_server_connector/lib/UpdateLookupServer.php
@@ -23,14 +23,11 @@
 namespace OCA\LookupServerConnector;
 
 use OC\Accounts\AccountManager;
-use OC\Security\IdentityProof\Manager;
 use OC\Security\IdentityProof\Signer;
 use OCA\LookupServerConnector\BackgroundJobs\RetryJob;
 use OCP\BackgroundJob\IJobList;
 use OCP\Http\Client\IClientService;
-use OCP\IConfig;
 use OCP\IUser;
-use OCP\Security\ISecureRandom;
 
 /**
  * Class UpdateLookupServer
@@ -40,44 +37,36 @@
 class UpdateLookupServer {
 	/** @var AccountManager */
 	private $accountManager;
-	/** @var IConfig */
-	private $config;
-	/** @var ISecureRandom */
-	private $secureRandom;
 	/** @var IClientService */
 	private $clientService;
-	/** @var Manager */
-	private $keyManager;
 	/** @var Signer */
 	private $signer;
 	/** @var IJobList */
 	private $jobList;
 	/** @var string URL point to lookup server */
-	private $lookupServer = 'https://lookup.nextcloud.com/users';
+	private $lookupServer = 'https://lookup.nextcloud.com';
 
 	/**
 	 * @param AccountManager $accountManager
-	 * @param IConfig $config
-	 * @param ISecureRandom $secureRandom
 	 * @param IClientService $clientService
-	 * @param Manager $manager
 	 * @param Signer $signer
 	 * @param IJobList $jobList
+	 * @param string $lookupServer if nothing is given we use the default lookup server
 	 */
 	public function __construct(AccountManager $accountManager,
-								IConfig $config,
-								ISecureRandom $secureRandom,
 								IClientService $clientService,
-								Manager $manager,
 								Signer $signer,
-								IJobList $jobList) {
+								IJobList $jobList,
+								$lookupServer = '') {
 		$this->accountManager = $accountManager;
-		$this->config = $config;
-		$this->secureRandom = $secureRandom;
 		$this->clientService = $clientService;
-		$this->keyManager = $manager;
 		$this->signer = $signer;
 		$this->jobList = $jobList;
+		if ($lookupServer !== '') {
+			$this->lookupServer = $lookupServer;
+		}
+		$this->lookupServer = rtrim($this->lookupServer, '/');
+		$this->lookupServer .= '/users';
 	}
 
 	/**
@@ -113,6 +102,13 @@ protected function sendToLookupServer(IUser $user, array $publicData) {
 			$dataArray['website'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['value'] : '';
 			$dataArray['twitter'] = isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['value'] : '';
 			$dataArray['phone'] = isset($publicData[AccountManager::PROPERTY_PHONE]) ? $publicData[AccountManager::PROPERTY_PHONE]['value'] : '';
+			$dataArray['twitter_signature'] = isset($publicData[AccountManager::PROPERTY_TWITTER]['signature']) ? $publicData[AccountManager::PROPERTY_TWITTER]['signature'] : '';
+			$dataArray['website_signature'] = isset($publicData[AccountManager::PROPERTY_WEBSITE]['signature']) ? $publicData[AccountManager::PROPERTY_WEBSITE]['signature'] : '';
+			$dataArray['verificationStatus'] =
+				[
+					AccountManager::PROPERTY_WEBSITE => isset($publicData[AccountManager::PROPERTY_WEBSITE]) ? $publicData[AccountManager::PROPERTY_WEBSITE]['verified'] : '',
+					AccountManager::PROPERTY_TWITTER => isset($publicData[AccountManager::PROPERTY_TWITTER]) ? $publicData[AccountManager::PROPERTY_TWITTER]['verified'] : '',
+				];
 		}
 
 		$dataArray = $this->signer->sign('lookupserver', $dataArray, $user);

diff --git a/config/config.sample.php b/config/config.sample.php
@@ -1515,4 +1515,9 @@
  */
 'copied_sample_config' => true,
 
+/**
+ * use a custom lookup server to publish user data
+ */
+'lookup_server' => 'https://lookup.nextcloud.com',
+
 );
diff --git a/core/img/actions/verified.svg b/core/img/actions/verified.svg
diff --git a/core/img/actions/verify.svg b/core/img/actions/verify.svg
diff --git a/core/img/actions/verifying.svg b/core/img/actions/verifying.svg
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
@@ -789,6 +789,7 @@
     'OC\\Settings\\Admin\\Sharing' => $baseDir . '/lib/private/Settings/Admin/Sharing.php',
     'OC\\Settings\\Admin\\TipsTricks' => $baseDir . '/lib/private/Settings/Admin/TipsTricks.php',
     'OC\\Settings\\Application' => $baseDir . '/settings/Application.php',
+    'OC\\Settings\\BackgroundJobs\\VerifyUserData' => $baseDir . '/settings/BackgroundJobs/VerifyUserData.php',
     'OC\\Settings\\Controller\\AdminSettingsController' => $baseDir . '/settings/Controller/AdminSettingsController.php',
     'OC\\Settings\\Controller\\AppSettingsController' => $baseDir . '/settings/Controller/AppSettingsController.php',
     'OC\\Settings\\Controller\\AuthSettingsController' => $baseDir . '/settings/Controller/AuthSettingsController.php',

diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
@@ -819,6 +819,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Settings\\Admin\\Sharing' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/Sharing.php',
         'OC\\Settings\\Admin\\TipsTricks' => __DIR__ . '/../../..' . '/lib/private/Settings/Admin/TipsTricks.php',
         'OC\\Settings\\Application' => __DIR__ . '/../../..' . '/settings/Application.php',
+        'OC\\Settings\\BackgroundJobs\\VerifyUserData' => __DIR__ . '/../../..' . '/settings/BackgroundJobs/VerifyUserData.php',
         'OC\\Settings\\Controller\\AdminSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/AdminSettingsController.php',
         'OC\\Settings\\Controller\\AppSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/AppSettingsController.php',
         'OC\\Settings\\Controller\\AuthSettingsController' => __DIR__ . '/../../..' . '/settings/Controller/AuthSettingsController.php',