nextcloud / server

lib/private/Repair/NC16/AddClenupLoginFlowV2BackgroundJob.php

Indentation +11 added lines, -11 removed lines

@@ -31,19 +31,19 @@
 
 class AddClenupLoginFlowV2BackgroundJob implements IRepairStep {
 
-	/** @var IJobList */
-	private $jobList;
+    /** @var IJobList */
+    private $jobList;
 
-	public function __construct(IJobList $jobList) {
-		$this->jobList = $jobList;
-	}
+    public function __construct(IJobList $jobList) {
+        $this->jobList = $jobList;
+    }
 
-	public function getName(): string {
-		return 'Add background job to cleanup login flow v2 tokens';
-	}
+    public function getName(): string {
+        return 'Add background job to cleanup login flow v2 tokens';
+    }
 
-	public function run(IOutput $output) {
-		$this->jobList->add(CleanupLoginFlowV2::class);
-	}
+    public function run(IOutput $output) {
+        $this->jobList->add(CleanupLoginFlowV2::class);
+    }
 
 }

lib/private/Repair.php

Indentation +173 added lines, -173 removed lines

@@ -62,177 +62,177 @@
 
 class Repair implements IOutput {
 
-	/** @var IRepairStep[] */
-	private $repairSteps;
-
-	/** @var EventDispatcherInterface */
-	private $dispatcher;
-
-	/** @var string */
-	private $currentStep;
-
-	/**
-	 * Creates a new repair step runner
-	 *
-	 * @param IRepairStep[] $repairSteps array of RepairStep instances
-	 * @param EventDispatcherInterface $dispatcher
-	 */
-	public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
-		$this->repairSteps = $repairSteps;
-		$this->dispatcher  = $dispatcher;
-	}
-
-	/**
-	 * Run a series of repair steps for common problems
-	 */
-	public function run() {
-		if (count($this->repairSteps) === 0) {
-			$this->emit('\OC\Repair', 'info', array('No repair steps available'));
-
-			return;
-		}
-		// run each repair step
-		foreach ($this->repairSteps as $step) {
-			$this->currentStep = $step->getName();
-			$this->emit('\OC\Repair', 'step', [$this->currentStep]);
-			$step->run($this);
-		}
-	}
-
-	/**
-	 * Add repair step
-	 *
-	 * @param IRepairStep|string $repairStep repair step
-	 * @throws \Exception
-	 */
-	public function addStep($repairStep) {
-		if (is_string($repairStep)) {
-			try {
-				$s = \OC::$server->query($repairStep);
-			} catch (QueryException $e) {
-				if (class_exists($repairStep)) {
-					$s = new $repairStep();
-				} else {
-					throw new \Exception("Repair step '$repairStep' is unknown");
-				}
-			}
-
-			if ($s instanceof IRepairStep) {
-				$this->repairSteps[] = $s;
-			} else {
-				throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
-			}
-		} else {
-			$this->repairSteps[] = $repairStep;
-		}
-	}
-
-	/**
-	 * Returns the default repair steps to be run on the
-	 * command line or after an upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getRepairSteps() {
-		return [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
-			new RepairMimeTypes(\OC::$server->getConfig()),
-			new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
-			new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
-			new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
-			new MoveUpdaterStepFile(\OC::$server->getConfig()),
-			new FixMountStorages(\OC::$server->getDatabaseConnection()),
-			new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new AddLogRotateJob(\OC::$server->getJobList()),
-			new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
-			new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
-			new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
-			new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
-			new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
-			new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger()),
-			new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
-			new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
-		];
-	}
-
-	/**
-	 * Returns expensive repair steps to be run on the
-	 * command line with a special option.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getExpensiveRepairSteps() {
-		return [
-			new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
-		];
-	}
-
-	/**
-	 * Returns the repair steps to be run before an
-	 * upgrade.
-	 *
-	 * @return IRepairStep[]
-	 */
-	public static function getBeforeUpgradeRepairSteps() {
-		$connection = \OC::$server->getDatabaseConnection();
-		$config     = \OC::$server->getConfig();
-		$steps      = [
-			new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
-			new SqliteAutoincrement($connection),
-			new SaveAccountsTableData($connection, $config),
-			new DropAccountTermsTable($connection)
-		];
-
-		return $steps;
-	}
-
-	/**
-	 * @param string $scope
-	 * @param string $method
-	 * @param array $arguments
-	 */
-	public function emit($scope, $method, array $arguments = []) {
-		if (!is_null($this->dispatcher)) {
-			$this->dispatcher->dispatch("$scope::$method",
-				new GenericEvent("$scope::$method", $arguments));
-		}
-	}
-
-	public function info($string) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'info', array($string));
-	}
-
-	/**
-	 * @param string $message
-	 */
-	public function warning($message) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'warning', [$message]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function startProgress($max = 0) {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
-	}
-
-	/**
-	 * @param int $step
-	 * @param string $description
-	 */
-	public function advance($step = 1, $description = '') {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'advance', [$step, $description]);
-	}
-
-	/**
-	 * @param int $max
-	 */
-	public function finishProgress() {
-		// for now just emit as we did in the past
-		$this->emit('\OC\Repair', 'finishProgress', []);
-	}
+    /** @var IRepairStep[] */
+    private $repairSteps;
+
+    /** @var EventDispatcherInterface */
+    private $dispatcher;
+
+    /** @var string */
+    private $currentStep;
+
+    /**
+     * Creates a new repair step runner
+     *
+     * @param IRepairStep[] $repairSteps array of RepairStep instances
+     * @param EventDispatcherInterface $dispatcher
+     */
+    public function __construct(array $repairSteps, EventDispatcherInterface $dispatcher) {
+        $this->repairSteps = $repairSteps;
+        $this->dispatcher  = $dispatcher;
+    }
+
+    /**
+     * Run a series of repair steps for common problems
+     */
+    public function run() {
+        if (count($this->repairSteps) === 0) {
+            $this->emit('\OC\Repair', 'info', array('No repair steps available'));
+
+            return;
+        }
+        // run each repair step
+        foreach ($this->repairSteps as $step) {
+            $this->currentStep = $step->getName();
+            $this->emit('\OC\Repair', 'step', [$this->currentStep]);
+            $step->run($this);
+        }
+    }
+
+    /**
+     * Add repair step
+     *
+     * @param IRepairStep|string $repairStep repair step
+     * @throws \Exception
+     */
+    public function addStep($repairStep) {
+        if (is_string($repairStep)) {
+            try {
+                $s = \OC::$server->query($repairStep);
+            } catch (QueryException $e) {
+                if (class_exists($repairStep)) {
+                    $s = new $repairStep();
+                } else {
+                    throw new \Exception("Repair step '$repairStep' is unknown");
+                }
+            }
+
+            if ($s instanceof IRepairStep) {
+                $this->repairSteps[] = $s;
+            } else {
+                throw new \Exception("Repair step '$repairStep' is not of type \\OCP\\Migration\\IRepairStep");
+            }
+        } else {
+            $this->repairSteps[] = $repairStep;
+        }
+    }
+
+    /**
+     * Returns the default repair steps to be run on the
+     * command line or after an upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getRepairSteps() {
+        return [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), \OC::$server->getDatabaseConnection(), false),
+            new RepairMimeTypes(\OC::$server->getConfig()),
+            new CleanTags(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager()),
+            new RepairInvalidShares(\OC::$server->getConfig(), \OC::$server->getDatabaseConnection()),
+            new RemoveRootShares(\OC::$server->getDatabaseConnection(), \OC::$server->getUserManager(), \OC::$server->getLazyRootFolder()),
+            new MoveUpdaterStepFile(\OC::$server->getConfig()),
+            new FixMountStorages(\OC::$server->getDatabaseConnection()),
+            new RepairInvalidPaths(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new AddLogRotateJob(\OC::$server->getJobList()),
+            new ClearFrontendCaches(\OC::$server->getMemCacheFactory(), \OC::$server->query(SCSSCacher::class), \OC::$server->query(JSCombiner::class)),
+            new ClearGeneratedAvatarCache(\OC::$server->getConfig(), \OC::$server->query(AvatarManager::class)),
+            new AddPreviewBackgroundCleanupJob(\OC::$server->getJobList()),
+            new AddCleanupUpdaterBackupsJob(\OC::$server->getJobList()),
+            new RepairPendingCronJobs(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig()),
+            new SetVcardDatabaseUID(\OC::$server->getDatabaseConnection(), \OC::$server->getConfig(), \OC::$server->getLogger()),
+            new CleanupCardDAVPhotoCache(\OC::$server->getConfig(), \OC::$server->getAppDataDir('dav-photocache'), \OC::$server->getLogger()),
+            new AddClenupLoginFlowV2BackgroundJob(\OC::$server->getJobList()),
+        ];
+    }
+
+    /**
+     * Returns expensive repair steps to be run on the
+     * command line with a special option.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getExpensiveRepairSteps() {
+        return [
+            new OldGroupMembershipShares(\OC::$server->getDatabaseConnection(), \OC::$server->getGroupManager())
+        ];
+    }
+
+    /**
+     * Returns the repair steps to be run before an
+     * upgrade.
+     *
+     * @return IRepairStep[]
+     */
+    public static function getBeforeUpgradeRepairSteps() {
+        $connection = \OC::$server->getDatabaseConnection();
+        $config     = \OC::$server->getConfig();
+        $steps      = [
+            new Collation(\OC::$server->getConfig(), \OC::$server->getLogger(), $connection, true),
+            new SqliteAutoincrement($connection),
+            new SaveAccountsTableData($connection, $config),
+            new DropAccountTermsTable($connection)
+        ];
+
+        return $steps;
+    }
+
+    /**
+     * @param string $scope
+     * @param string $method
+     * @param array $arguments
+     */
+    public function emit($scope, $method, array $arguments = []) {
+        if (!is_null($this->dispatcher)) {
+            $this->dispatcher->dispatch("$scope::$method",
+                new GenericEvent("$scope::$method", $arguments));
+        }
+    }
+
+    public function info($string) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'info', array($string));
+    }
+
+    /**
+     * @param string $message
+     */
+    public function warning($message) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'warning', [$message]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function startProgress($max = 0) {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'startProgress', [$max, $this->currentStep]);
+    }
+
+    /**
+     * @param int $step
+     * @param string $description
+     */
+    public function advance($step = 1, $description = '') {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'advance', [$step, $description]);
+    }
+
+    /**
+     * @param int $max
+     */
+    public function finishProgress() {
+        // for now just emit as we did in the past
+        $this->emit('\OC\Repair', 'finishProgress', []);
+    }
 }

core/Data/LoginFlowV2Tokens.php

Indentation +14 added lines, -14 removed lines

@@ -26,22 +26,22 @@
 
 class LoginFlowV2Tokens {
 
-	/** @var string */
-	private $loginToken;
-	/** @var string */
-	private $pollToken;
+    /** @var string */
+    private $loginToken;
+    /** @var string */
+    private $pollToken;
 
-	public function __construct(string $loginToken, string $pollToken) {
-		$this->loginToken = $loginToken;
-		$this->pollToken = $pollToken;
-	}
+    public function __construct(string $loginToken, string $pollToken) {
+        $this->loginToken = $loginToken;
+        $this->pollToken = $pollToken;
+    }
 
-	public function getPollToken(): string {
-		return $this->pollToken;
+    public function getPollToken(): string {
+        return $this->pollToken;
 
-	}
+    }
 
-	public function getLoginToken(): string {
-		return $this->loginToken;
-	}
+    public function getLoginToken(): string {
+        return $this->loginToken;
+    }
 }

core/Data/LoginFlowV2Credentials.php

Indentation +36 added lines, -36 removed lines

@@ -25,47 +25,47 @@
 namespace OC\Core\Data;
 
 class LoginFlowV2Credentials implements \JsonSerializable {
-	/** @var string */
-	private $server;
-	/** @var string */
-	private $loginName;
-	/** @var string */
-	private $appPassword;
+    /** @var string */
+    private $server;
+    /** @var string */
+    private $loginName;
+    /** @var string */
+    private $appPassword;
 
-	public function __construct(string $server, string $loginName, string $appPassword) {
-		$this->server = $server;
-		$this->loginName = $loginName;
-		$this->appPassword = $appPassword;
-	}
+    public function __construct(string $server, string $loginName, string $appPassword) {
+        $this->server = $server;
+        $this->loginName = $loginName;
+        $this->appPassword = $appPassword;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getServer(): string {
-		return $this->server;
-	}
+    /**
+     * @return string
+     */
+    public function getServer(): string {
+        return $this->server;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getLoginName(): string {
-		return $this->loginName;
-	}
+    /**
+     * @return string
+     */
+    public function getLoginName(): string {
+        return $this->loginName;
+    }
 
-	/**
-	 * @return string
-	 */
-	public function getAppPassword(): string {
-		return $this->appPassword;
-	}
+    /**
+     * @return string
+     */
+    public function getAppPassword(): string {
+        return $this->appPassword;
+    }
 
-	public function jsonSerialize(): array {
-		return [
-			'server' => $this->server,
-			'loginName' => $this->loginName,
-			'appPassword' => $this->appPassword,
-		];
-	}
+    public function jsonSerialize(): array {
+        return [
+            'server' => $this->server,
+            'loginName' => $this->loginName,
+            'appPassword' => $this->appPassword,
+        ];
+    }
 
 
 }

core/templates/loginflowv2/grant.php

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-								\OCP\Util::sanitizeHTML($_['instanceName'])
-							])) ?>
+                                '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+                                \OCP\Util::sanitizeHTML($_['instanceName'])
+                            ])) ?>
 	</p>
 
 	<br/>

Spacing +1 added lines, -1 removed lines

@@ -31,7 +31,7 @@
 	<h2><?php p($l->t('Account access')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('You are about to grant %1$s access to your %2$s account.', [
-								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+								'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 								\OCP\Util::sanitizeHTML($_['instanceName'])
 							])) ?>
 	</p>

core/templates/loginflowv2/authpicker.php

Indentation +3 added lines, -3 removed lines

@@ -31,9 +31,9 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
-								\OCP\Util::sanitizeHTML($_['instanceName'])
-							])) ?>
+                                '<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+                                \OCP\Util::sanitizeHTML($_['instanceName'])
+                            ])) ?>
 	</p>
 
 	<br/>

Spacing +1 added lines, -1 removed lines

@@ -30,7 +30,7 @@
 	<h2><?php p($l->t('Connect to your account')) ?></h2>
 	<p class="info">
 		<?php print_unescaped($l->t('Please log in before granting %1$s access to your %2$s account.', [
-								'<strong>' . \OCP\Util::sanitizeHTML($_['client']) . '</strong>',
+								'<strong>'.\OCP\Util::sanitizeHTML($_['client']).'</strong>',
 								\OCP\Util::sanitizeHTML($_['instanceName'])
 							])) ?>
 	</p>

core/Service/LoginFlowV2Service.php

Indentation +215 added lines, -215 removed lines

@@ -42,219 +42,219 @@
 
 class LoginFlowV2Service {
 
-	/** @var LoginFlowV2Mapper */
-	private $mapper;
-	/** @var ISecureRandom */
-	private $random;
-	/** @var ITimeFactory */
-	private $time;
-	/** @var IConfig */
-	private $config;
-	/** @var ICrypto */
-	private $crypto;
-	/** @var ILogger */
-	private $logger;
-	/** @var IProvider */
-	private $tokenProvider;
-
-	public function __construct(LoginFlowV2Mapper $mapper,
-								ISecureRandom $random,
-								ITimeFactory $time,
-								IConfig $config,
-								ICrypto $crypto,
-								ILogger $logger,
-								IProvider $tokenProvider) {
-		$this->mapper = $mapper;
-		$this->random = $random;
-		$this->time = $time;
-		$this->config = $config;
-		$this->crypto = $crypto;
-		$this->logger = $logger;
-		$this->tokenProvider = $tokenProvider;
-	}
-
-	/**
-	 * @param string $pollToken
-	 * @return LoginFlowV2Credentials
-	 * @throws LoginFlowV2NotFoundException
-	 */
-	public function poll(string $pollToken): LoginFlowV2Credentials {
-		try {
-			$data = $this->mapper->getByPollToken($this->hashToken($pollToken));
-		} catch (DoesNotExistException $e) {
-			throw new LoginFlowV2NotFoundException('Invalid token');
-		}
-
-		$loginName = $data->getLoginName();
-		$server = $data->getServer();
-		$appPassword = $data->getAppPassword();
-
-		if ($loginName === null || $server === null || $appPassword === null) {
-			throw new LoginFlowV2NotFoundException('Token not yet ready');
-		}
-
-		// Remove the data from the DB
-		$this->mapper->delete($data);
-
-		try {
-			// Decrypt the apptoken
-			$privateKey = $this->crypto->decrypt($data->getPrivateKey(), $pollToken);
-			$appPassword = $this->decryptPassword($data->getAppPassword(), $privateKey);
-		} catch (\Exception $e) {
-			throw new LoginFlowV2NotFoundException('Apptoken could not be decrypted');
-		}
-
-		return new LoginFlowV2Credentials($server, $loginName, $appPassword);
-	}
-
-	/**
-	 * @param string $loginToken
-	 * @return LoginFlowV2
-	 * @throws LoginFlowV2NotFoundException
-	 */
-	public function getByLoginToken(string $loginToken): LoginFlowV2 {
-		try {
-			return $this->mapper->getByLoginToken($loginToken);
-		} catch (DoesNotExistException $e) {
-			throw new LoginFlowV2NotFoundException('Login token invalid');
-		}
-	}
-
-	/**
-	 * @param string $loginToken
-	 * @return bool returns true if the start was successfull. False if not.
-	 */
-	public function startLoginFlow(string $loginToken): bool {
-		try {
-			$data = $this->mapper->getByLoginToken($loginToken);
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-
-		if ($data->getStarted() !== 0) {
-			return false;
-		}
-
-		$data->setStarted(1);
-		$this->mapper->update($data);
-
-		return true;
-	}
-
-	/**
-	 * @param string $loginToken
-	 * @param string $sessionId
-	 * @param string $server
-	 * @param string $userId
-	 * @return bool true if the flow was successfully completed false otherwise
-	 */
-	public function flowDone(string $loginToken, string $sessionId, string $server, string $userId): bool {
-		try {
-			$data = $this->mapper->getByLoginToken($loginToken);
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-			$loginName = $sessionToken->getLoginName();
-			try {
-				$password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
-			} catch (PasswordlessTokenException $ex) {
-				$password = null;
-			}
-		} catch (InvalidTokenException $ex) {
-			return false;
-		}
-
-		$appPassword = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
-		$this->tokenProvider->generateToken(
-			$appPassword,
-			$userId,
-			$loginName,
-			$password,
-			$data->getClientName(),
-			IToken::PERMANENT_TOKEN,
-			IToken::DO_NOT_REMEMBER
-		);
-
-		$data->setLoginName($loginName);
-		$data->setServer($server);
-
-		// Properly encrypt
-		$data->setAppPassword($this->encryptPassword($appPassword, $data->getPublicKey()));
-
-		$this->mapper->update($data);
-		return true;
-	}
-
-	public function createTokens(string $userAgent): LoginFlowV2Tokens {
-		$flow = new LoginFlowV2();
-		$pollToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
-		$loginToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
-		$flow->setPollToken($this->hashToken($pollToken));
-		$flow->setLoginToken($loginToken);
-		$flow->setStarted(0);
-		$flow->setTimestamp($this->time->getTime());
-		$flow->setClientName($userAgent);
-
-		[$publicKey, $privateKey] = $this->getKeyPair();
-		$privateKey = $this->crypto->encrypt($privateKey, $pollToken);
-
-		$flow->setPublicKey($publicKey);
-		$flow->setPrivateKey($privateKey);
-
-		$this->mapper->insert($flow);
-
-		return new LoginFlowV2Tokens($loginToken, $pollToken);
-	}
-
-	private function hashToken(string $token): string {
-		$secret = $this->config->getSystemValue('secret');
-		return hash('sha512', $token . $secret);
-	}
-
-	private function getKeyPair(): array {
-		$config = array_merge([
-			'digest_alg' => 'sha512',
-			'private_key_bits' => 2048,
-		], $this->config->getSystemValue('openssl', []));
-
-		// Generate new key
-		$res = openssl_pkey_new($config);
-		if ($res === false) {
-			$this->logOpensslError();
-			throw new \RuntimeException('Could not initialize keys');
-		}
-
-		openssl_pkey_export($res, $privateKey);
-
-		// Extract the public key from $res to $pubKey
-		$publicKey = openssl_pkey_get_details($res);
-		$publicKey = $publicKey['key'];
-
-		return [$publicKey, $privateKey];
-	}
-
-	private function logOpensslError(): void {
-		$errors = [];
-		while ($error = openssl_error_string()) {
-			$errors[] = $error;
-		}
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
-	}
-
-	private function encryptPassword(string $password, string $publicKey): string {
-		openssl_public_encrypt($password, $encryptedPassword, $publicKey, OPENSSL_PKCS1_OAEP_PADDING);
-		$encryptedPassword = base64_encode($encryptedPassword);
-
-		return $encryptedPassword;
-	}
-
-	private function decryptPassword(string $encryptedPassword, string $privateKey): string {
-		$encryptedPassword = base64_decode($encryptedPassword);
-		openssl_private_decrypt($encryptedPassword, $password, $privateKey, OPENSSL_PKCS1_OAEP_PADDING);
-
-		return $password;
-	}
+    /** @var LoginFlowV2Mapper */
+    private $mapper;
+    /** @var ISecureRandom */
+    private $random;
+    /** @var ITimeFactory */
+    private $time;
+    /** @var IConfig */
+    private $config;
+    /** @var ICrypto */
+    private $crypto;
+    /** @var ILogger */
+    private $logger;
+    /** @var IProvider */
+    private $tokenProvider;
+
+    public function __construct(LoginFlowV2Mapper $mapper,
+                                ISecureRandom $random,
+                                ITimeFactory $time,
+                                IConfig $config,
+                                ICrypto $crypto,
+                                ILogger $logger,
+                                IProvider $tokenProvider) {
+        $this->mapper = $mapper;
+        $this->random = $random;
+        $this->time = $time;
+        $this->config = $config;
+        $this->crypto = $crypto;
+        $this->logger = $logger;
+        $this->tokenProvider = $tokenProvider;
+    }
+
+    /**
+     * @param string $pollToken
+     * @return LoginFlowV2Credentials
+     * @throws LoginFlowV2NotFoundException
+     */
+    public function poll(string $pollToken): LoginFlowV2Credentials {
+        try {
+            $data = $this->mapper->getByPollToken($this->hashToken($pollToken));
+        } catch (DoesNotExistException $e) {
+            throw new LoginFlowV2NotFoundException('Invalid token');
+        }
+
+        $loginName = $data->getLoginName();
+        $server = $data->getServer();
+        $appPassword = $data->getAppPassword();
+
+        if ($loginName === null || $server === null || $appPassword === null) {
+            throw new LoginFlowV2NotFoundException('Token not yet ready');
+        }
+
+        // Remove the data from the DB
+        $this->mapper->delete($data);
+
+        try {
+            // Decrypt the apptoken
+            $privateKey = $this->crypto->decrypt($data->getPrivateKey(), $pollToken);
+            $appPassword = $this->decryptPassword($data->getAppPassword(), $privateKey);
+        } catch (\Exception $e) {
+            throw new LoginFlowV2NotFoundException('Apptoken could not be decrypted');
+        }
+
+        return new LoginFlowV2Credentials($server, $loginName, $appPassword);
+    }
+
+    /**
+     * @param string $loginToken
+     * @return LoginFlowV2
+     * @throws LoginFlowV2NotFoundException
+     */
+    public function getByLoginToken(string $loginToken): LoginFlowV2 {
+        try {
+            return $this->mapper->getByLoginToken($loginToken);
+        } catch (DoesNotExistException $e) {
+            throw new LoginFlowV2NotFoundException('Login token invalid');
+        }
+    }
+
+    /**
+     * @param string $loginToken
+     * @return bool returns true if the start was successfull. False if not.
+     */
+    public function startLoginFlow(string $loginToken): bool {
+        try {
+            $data = $this->mapper->getByLoginToken($loginToken);
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+
+        if ($data->getStarted() !== 0) {
+            return false;
+        }
+
+        $data->setStarted(1);
+        $this->mapper->update($data);
+
+        return true;
+    }
+
+    /**
+     * @param string $loginToken
+     * @param string $sessionId
+     * @param string $server
+     * @param string $userId
+     * @return bool true if the flow was successfully completed false otherwise
+     */
+    public function flowDone(string $loginToken, string $sessionId, string $server, string $userId): bool {
+        try {
+            $data = $this->mapper->getByLoginToken($loginToken);
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+
+        try {
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
+            $loginName = $sessionToken->getLoginName();
+            try {
+                $password = $this->tokenProvider->getPassword($sessionToken, $sessionId);
+            } catch (PasswordlessTokenException $ex) {
+                $password = null;
+            }
+        } catch (InvalidTokenException $ex) {
+            return false;
+        }
+
+        $appPassword = $this->random->generate(72, ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_DIGITS);
+        $this->tokenProvider->generateToken(
+            $appPassword,
+            $userId,
+            $loginName,
+            $password,
+            $data->getClientName(),
+            IToken::PERMANENT_TOKEN,
+            IToken::DO_NOT_REMEMBER
+        );
+
+        $data->setLoginName($loginName);
+        $data->setServer($server);
+
+        // Properly encrypt
+        $data->setAppPassword($this->encryptPassword($appPassword, $data->getPublicKey()));
+
+        $this->mapper->update($data);
+        return true;
+    }
+
+    public function createTokens(string $userAgent): LoginFlowV2Tokens {
+        $flow = new LoginFlowV2();
+        $pollToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
+        $loginToken = $this->random->generate(128, ISecureRandom::CHAR_DIGITS.ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER);
+        $flow->setPollToken($this->hashToken($pollToken));
+        $flow->setLoginToken($loginToken);
+        $flow->setStarted(0);
+        $flow->setTimestamp($this->time->getTime());
+        $flow->setClientName($userAgent);
+
+        [$publicKey, $privateKey] = $this->getKeyPair();
+        $privateKey = $this->crypto->encrypt($privateKey, $pollToken);
+
+        $flow->setPublicKey($publicKey);
+        $flow->setPrivateKey($privateKey);
+
+        $this->mapper->insert($flow);
+
+        return new LoginFlowV2Tokens($loginToken, $pollToken);
+    }
+
+    private function hashToken(string $token): string {
+        $secret = $this->config->getSystemValue('secret');
+        return hash('sha512', $token . $secret);
+    }
+
+    private function getKeyPair(): array {
+        $config = array_merge([
+            'digest_alg' => 'sha512',
+            'private_key_bits' => 2048,
+        ], $this->config->getSystemValue('openssl', []));
+
+        // Generate new key
+        $res = openssl_pkey_new($config);
+        if ($res === false) {
+            $this->logOpensslError();
+            throw new \RuntimeException('Could not initialize keys');
+        }
+
+        openssl_pkey_export($res, $privateKey);
+
+        // Extract the public key from $res to $pubKey
+        $publicKey = openssl_pkey_get_details($res);
+        $publicKey = $publicKey['key'];
+
+        return [$publicKey, $privateKey];
+    }
+
+    private function logOpensslError(): void {
+        $errors = [];
+        while ($error = openssl_error_string()) {
+            $errors[] = $error;
+        }
+        $this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
+    }
+
+    private function encryptPassword(string $password, string $publicKey): string {
+        openssl_public_encrypt($password, $encryptedPassword, $publicKey, OPENSSL_PKCS1_OAEP_PADDING);
+        $encryptedPassword = base64_encode($encryptedPassword);
+
+        return $encryptedPassword;
+    }
+
+    private function decryptPassword(string $encryptedPassword, string $privateKey): string {
+        $encryptedPassword = base64_decode($encryptedPassword);
+        openssl_private_decrypt($encryptedPassword, $password, $privateKey, OPENSSL_PKCS1_OAEP_PADDING);
+
+        return $password;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -211,7 +211,7 @@ 
 
 	private function hashToken(string $token): string {
 		$secret = $this->config->getSystemValue('secret');
-		return hash('sha512', $token . $secret);
+		return hash('sha512', $token.$secret);
 	}
 
 	private function getKeyPair(): array {
@@ -241,7 +241,7 @@ 
 		while ($error = openssl_error_string()) {
 			$errors[] = $error;
 		}
-		$this->logger->critical('Something is wrong with your openssl setup: ' . implode(', ', $errors));
+		$this->logger->critical('Something is wrong with your openssl setup: '.implode(', ', $errors));
 	}
 
 	private function encryptPassword(string $password, string $publicKey): string {

core/BackgroundJobs/CleanupLoginFlowV2.php

Indentation +10 added lines, -10 removed lines

@@ -30,17 +30,17 @@
 
 class CleanupLoginFlowV2 extends TimedJob {
 
-	/** @var LoginFlowV2Mapper */
-	private $loginFlowV2Mapper;
+    /** @var LoginFlowV2Mapper */
+    private $loginFlowV2Mapper;
 
-	public function __construct(ITimeFactory $time, LoginFlowV2Mapper $loginFlowV2Mapper) {
-		parent::__construct($time);
-		$this->loginFlowV2Mapper = $loginFlowV2Mapper;
+    public function __construct(ITimeFactory $time, LoginFlowV2Mapper $loginFlowV2Mapper) {
+        parent::__construct($time);
+        $this->loginFlowV2Mapper = $loginFlowV2Mapper;
 
-		$this->setInterval(3600);
-	}
+        $this->setInterval(3600);
+    }
 
-	protected function run($argument) {
-		$this->loginFlowV2Mapper->cleanup();
-	}
+    protected function run($argument) {
+        $this->loginFlowV2Mapper->cleanup();
+    }
 }

core/Migrations/Version16000Date20190212081545.php

Indentation +65 added lines, -65 removed lines

@@ -31,71 +31,71 @@
 use OCP\Migration\IOutput;
 
 class Version16000Date20190212081545 extends SimpleMigrationStep {
-	/**
-	 * @param IOutput $output
-	 * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
-	 * @param array $options
-	 * @return null|ISchemaWrapper
-	 */
-	public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
-		/** @var ISchemaWrapper $schema */
-		$schema = $schemaClosure();
+    /**
+     * @param IOutput $output
+     * @param Closure $schemaClosure The `\Closure` returns a `ISchemaWrapper`
+     * @param array $options
+     * @return null|ISchemaWrapper
+     */
+    public function changeSchema(IOutput $output, Closure $schemaClosure, array $options): ISchemaWrapper {
+        /** @var ISchemaWrapper $schema */
+        $schema = $schemaClosure();
 
-		$table = $schema->createTable('login_flow_v2');
-		$table->addColumn('id', Type::BIGINT, [
-			'autoincrement' => true,
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$table->addColumn('timestamp', Type::BIGINT, [
-			'notnull' => true,
-			'length' => 20,
-			'unsigned' => true,
-		]);
-		$table->addColumn('started', Type::SMALLINT, [
-			'notnull' => true,
-			'length' => 1,
-			'unsigned' => true,
-			'default' => 0,
-		]);
-		$table->addColumn('poll_token', Type::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('login_token', Type::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('public_key', Type::TEXT, [
-			'notnull' => true,
-			'length' => 32768,
-		]);
-		$table->addColumn('private_key', Type::TEXT, [
-			'notnull' => true,
-			'length' => 32768,
-		]);
-		$table->addColumn('client_name', Type::STRING, [
-			'notnull' => true,
-			'length' => 255,
-		]);
-		$table->addColumn('login_name', Type::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('server', Type::STRING, [
-			'notnull' => false,
-			'length' => 255,
-		]);
-		$table->addColumn('app_password', Type::STRING, [
-			'notnull' => false,
-			'length' => 1024,
-		]);
-		$table->setPrimaryKey(['id']);
-		$table->addUniqueIndex(['poll_token']);
-		$table->addUniqueIndex(['login_token']);
-		$table->addIndex(['timestamp']);
+        $table = $schema->createTable('login_flow_v2');
+        $table->addColumn('id', Type::BIGINT, [
+            'autoincrement' => true,
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('timestamp', Type::BIGINT, [
+            'notnull' => true,
+            'length' => 20,
+            'unsigned' => true,
+        ]);
+        $table->addColumn('started', Type::SMALLINT, [
+            'notnull' => true,
+            'length' => 1,
+            'unsigned' => true,
+            'default' => 0,
+        ]);
+        $table->addColumn('poll_token', Type::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('login_token', Type::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('public_key', Type::TEXT, [
+            'notnull' => true,
+            'length' => 32768,
+        ]);
+        $table->addColumn('private_key', Type::TEXT, [
+            'notnull' => true,
+            'length' => 32768,
+        ]);
+        $table->addColumn('client_name', Type::STRING, [
+            'notnull' => true,
+            'length' => 255,
+        ]);
+        $table->addColumn('login_name', Type::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('server', Type::STRING, [
+            'notnull' => false,
+            'length' => 255,
+        ]);
+        $table->addColumn('app_password', Type::STRING, [
+            'notnull' => false,
+            'length' => 1024,
+        ]);
+        $table->setPrimaryKey(['id']);
+        $table->addUniqueIndex(['poll_token']);
+        $table->addUniqueIndex(['login_token']);
+        $table->addIndex(['timestamp']);
 
-		return $schema;
-	}
+        return $schema;
+    }
 }