nextcloud / server

themes/example/defaults.php

Spacing +5 added lines, -5 removed lines

@@ -90,8 +90,8 @@ 
 	 * @return string short footer
 	 */
 	public function getShortFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
+		$footer = '© '.date('Y').' <a href="'.$this->getBaseUrl().'" target="_blank">'.$this->getEntity().'</a>'.
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -101,8 +101,8 @@ 
 	 * @return string long footer
 	 */
 	public function getLongFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
+		$footer = '© '.date('Y').' <a href="'.$this->getBaseUrl().'" target="_blank">'.$this->getEntity().'</a>'.
+			'<br/>'.$this->getSlogan();
 
 		return $footer;
 	}
@@ -112,7 +112,7 @@ 
 	 * @return string documentation link
 	 */
 	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
+		return $this->getDocBaseUrl().'/server/15/go.php?to='.$key;
 	}
 
 

Indentation +104 added lines, -104 removed lines

@@ -20,108 +20,108 @@
 
 class OC_Theme {
 
-	/**
-	 * Returns the base URL
-	 * @return string URL
-	 */
-	public function getBaseUrl() {
-		return 'https://nextcloud.com';
-	}
-
-	/**
-	 * Returns the documentation URL
-	 * @return string URL
-	 */
-	public function getDocBaseUrl() {
-		return 'https://docs.nextcloud.com';
-	}
-
-	/**
-	 * Returns the title
-	 * @return string title
-	 */
-	public function getTitle() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software
-	 * @return string title
-	 */
-	public function getName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns the short name of the software containing HTML strings
-	 * @return string title
-	 */
-	public function getHTMLName() {
-		return 'Custom Cloud';
-	}
-
-	/**
-	 * Returns entity (e.g. company name) - used for footer, copyright
-	 * @return string entity name
-	 */
-	public function getEntity() {
-		return 'Custom Cloud Co.';
-	}
-
-	/**
-	 * Returns slogan
-	 * @return string slogan
-	 */
-	public function getSlogan() {
-		return 'Your custom cloud, personalized for you!';
-	}
-
-	/**
-	 * Returns short version of the footer
-	 * @return string short footer
-	 */
-	public function getShortFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Returns long version of the footer
-	 * @return string long footer
-	 */
-	public function getLongFooter() {
-		$footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
-			'<br/>' . $this->getSlogan();
-
-		return $footer;
-	}
-
-	/**
-	 * Generate a documentation link for a given key
-	 * @return string documentation link
-	 */
-	public function buildDocLinkToKey($key) {
-		return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
-	}
-
-
-	/**
-	 * Returns mail header color
-	 * @return string
-	 */
-	public function getColorPrimary() {
-		return '#745bca';
-	}
-
-	/**
-	 * Returns variables to overload defaults from core/css/variables.scss
-	 * @return array
-	 */
-	public function getScssVariables() {
-		return [
-			'color-primary' => '#745bca'
-		];
-	}
+    /**
+     * Returns the base URL
+     * @return string URL
+     */
+    public function getBaseUrl() {
+        return 'https://nextcloud.com';
+    }
+
+    /**
+     * Returns the documentation URL
+     * @return string URL
+     */
+    public function getDocBaseUrl() {
+        return 'https://docs.nextcloud.com';
+    }
+
+    /**
+     * Returns the title
+     * @return string title
+     */
+    public function getTitle() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software
+     * @return string title
+     */
+    public function getName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns the short name of the software containing HTML strings
+     * @return string title
+     */
+    public function getHTMLName() {
+        return 'Custom Cloud';
+    }
+
+    /**
+     * Returns entity (e.g. company name) - used for footer, copyright
+     * @return string entity name
+     */
+    public function getEntity() {
+        return 'Custom Cloud Co.';
+    }
+
+    /**
+     * Returns slogan
+     * @return string slogan
+     */
+    public function getSlogan() {
+        return 'Your custom cloud, personalized for you!';
+    }
+
+    /**
+     * Returns short version of the footer
+     * @return string short footer
+     */
+    public function getShortFooter() {
+        $footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Returns long version of the footer
+     * @return string long footer
+     */
+    public function getLongFooter() {
+        $footer = '© ' . date('Y') . ' <a href="' . $this->getBaseUrl() . '" target="_blank">' . $this->getEntity() . '</a>' .
+            '<br/>' . $this->getSlogan();
+
+        return $footer;
+    }
+
+    /**
+     * Generate a documentation link for a given key
+     * @return string documentation link
+     */
+    public function buildDocLinkToKey($key) {
+        return $this->getDocBaseUrl() . '/server/15/go.php?to=' . $key;
+    }
+
+
+    /**
+     * Returns mail header color
+     * @return string
+     */
+    public function getColorPrimary() {
+        return '#745bca';
+    }
+
+    /**
+     * Returns variables to overload defaults from core/css/variables.scss
+     * @return array
+     */
+    public function getScssVariables() {
+        return [
+            'color-primary' => '#745bca'
+        ];
+    }
 }

lib/private/AppFramework/Middleware/Security/ReloadExecutionMiddleware.php

Indentation +23 added lines, -23 removed lines

@@ -35,34 +35,34 @@
  * a reload but if the session variable is set we properly redirect to the login page.
  */
 class ReloadExecutionMiddleware extends Middleware {
-	/** @var ISession */
-	private $session;
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var ISession */
+    private $session;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(ISession $session, IURLGenerator $urlGenerator) {
-		$this->session = $session;
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(ISession $session, IURLGenerator $urlGenerator) {
+        $this->session = $session;
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	public function beforeController($controller, $methodName) {
-		if ($this->session->exists('clearingExecutionContexts')) {
-			throw new ReloadExecutionException();
-		}
-	}
+    public function beforeController($controller, $methodName) {
+        if ($this->session->exists('clearingExecutionContexts')) {
+            throw new ReloadExecutionException();
+        }
+    }
 
-	public function afterException($controller, $methodName, \Exception $exception) {
-		if ($exception instanceof ReloadExecutionException) {
-			$this->session->remove('clearingExecutionContexts');
+    public function afterException($controller, $methodName, \Exception $exception) {
+        if ($exception instanceof ReloadExecutionException) {
+            $this->session->remove('clearingExecutionContexts');
 
-			return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
-				'core.login.showLoginForm',
-				['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
-			));
-		}
+            return new RedirectResponse($this->urlGenerator->linkToRouteAbsolute(
+                'core.login.showLoginForm',
+                ['clear' => true] // this param the the code in login.js may be removed when the "Clear-Site-Data" is working in the browsers
+            ));
+        }
 
-		return parent::afterException($controller, $methodName, $exception);
-	}
+        return parent::afterException($controller, $methodName, $exception);
+    }
 
 
 }

lib/public/IAvatarManager.php

Indentation +18 added lines, -18 removed lines

@@ -34,24 +34,24 @@
 
 interface IAvatarManager {
 
-	/**
-	 * return a user specific instance of \OCP\IAvatar
-	 * @see IAvatar
-	 * @param string $user the ownCloud user id
-	 * @return IAvatar
-	 * @throws \Exception In case the username is potentially dangerous
-	 * @throws \OCP\Files\NotFoundException In case there is no user folder yet
-	 * @since 6.0.0
-	 */
-	public function getAvatar(string $user) : IAvatar;
+    /**
+     * return a user specific instance of \OCP\IAvatar
+     * @see IAvatar
+     * @param string $user the ownCloud user id
+     * @return IAvatar
+     * @throws \Exception In case the username is potentially dangerous
+     * @throws \OCP\Files\NotFoundException In case there is no user folder yet
+     * @since 6.0.0
+     */
+    public function getAvatar(string $user) : IAvatar;
 
-	/**
-	 * Returns a guest user avatar instance.
-	 *
-	 * @param string $name The guest name, e.g. "Albert".
-	 * @return IAvatar
-	 * @since 16.0.0
-	 */
-	public function getGuestAvatar(string $name): IAvatar;
+    /**
+     * Returns a guest user avatar instance.
+     *
+     * @param string $name The guest name, e.g. "Albert".
+     * @return IAvatar
+     * @since 16.0.0
+     */
+    public function getGuestAvatar(string $name): IAvatar;
 
 }

apps/files_external/lib/Config/IConfigHandler.php

Indentation +6 added lines, -6 removed lines

@@ -30,10 +30,10 @@
  * @since 16.0.0
  */
 interface IConfigHandler {
-	/**
-	 * @param mixed $optionValue
-	 * @return mixed the same type as $optionValue
-	 * @since 16.0.0
-	 */
-	public function handle($optionValue);
+    /**
+     * @param mixed $optionValue
+     * @return mixed the same type as $optionValue
+     * @since 16.0.0
+     */
+    public function handle($optionValue);
 }

apps/cloud_federation_api/lib/Capabilities.php

Indentation +31 added lines, -31 removed lines

@@ -28,38 +28,38 @@
 
 class Capabilities implements ICapability {
 
-	/** @var IURLGenerator */
-	private $urlGenerator;
+    /** @var IURLGenerator */
+    private $urlGenerator;
 
-	public function __construct(IURLGenerator $urlGenerator) {
-		$this->urlGenerator = $urlGenerator;
-	}
+    public function __construct(IURLGenerator $urlGenerator) {
+        $this->urlGenerator = $urlGenerator;
+    }
 
-	/**
-	 * Function an app uses to return the capabilities
-	 *
-	 * @return array Array containing the apps capabilities
-	 * @since 8.2.0
-	 */
-	public function getCapabilities() {
-		$url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
-		$capabilities = ['ocm' =>
-			[
-				'enabled' => true,
-				'apiVersion' => '1.0-proposal1',
-				'endPoint' => substr($url, 0, strrpos($url, '/')),
-				'resourceTypes' => [
-					[
-						'name' => 'file',
-						'shareTypes' => ['user', 'group'],
-						'protocols' => [
-							'webdav' => '/public.php/webdav/',
-						]
-					],
-				]
-			]
-		];
+    /**
+     * Function an app uses to return the capabilities
+     *
+     * @return array Array containing the apps capabilities
+     * @since 8.2.0
+     */
+    public function getCapabilities() {
+        $url = $this->urlGenerator->linkToRouteAbsolute('cloud_federation_api.requesthandlercontroller.addShare');
+        $capabilities = ['ocm' =>
+            [
+                'enabled' => true,
+                'apiVersion' => '1.0-proposal1',
+                'endPoint' => substr($url, 0, strrpos($url, '/')),
+                'resourceTypes' => [
+                    [
+                        'name' => 'file',
+                        'shareTypes' => ['user', 'group'],
+                        'protocols' => [
+                            'webdav' => '/public.php/webdav/',
+                        ]
+                    ],
+                ]
+            ]
+        ];
 
-		return $capabilities;
-	}
+        return $capabilities;
+    }
 }

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);
+    }
 
 }

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/Service/LoginFlowV2Service.php

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 {

Indentation +231 added lines, -231 removed lines

@@ -44,235 +44,235 @@
 
 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;
-		}
-
-		$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 flowDoneWithAppPassword(string $loginToken, string $server, string $loginName, string $appPassword): bool {
-		try {
-			$data = $this->mapper->getByLoginToken($loginToken);
-		} catch (DoesNotExistException $e) {
-			return false;
-		}
-
-		$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');
-		}
-
-		if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
-			$this->logOpensslError();
-			throw new \RuntimeException('OpenSSL reported a problem');
-		}
-
-		// 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;
+        }
+
+        $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 flowDoneWithAppPassword(string $loginToken, string $server, string $loginName, string $appPassword): bool {
+        try {
+            $data = $this->mapper->getByLoginToken($loginToken);
+        } catch (DoesNotExistException $e) {
+            return false;
+        }
+
+        $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');
+        }
+
+        if (openssl_pkey_export($res, $privateKey, null, $config) === false) {
+            $this->logOpensslError();
+            throw new \RuntimeException('OpenSSL reported a problem');
+        }
+
+        // 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;
+    }
 }

core/Db/LoginFlowV2.php

Indentation +32 added lines, -32 removed lines

@@ -49,37 +49,37 @@
  * @method void setAppPassword(string $appPassword)
  */
 class LoginFlowV2 extends Entity {
-	/** @var int */
-	protected $timestamp;
-	/** @var int */
-	protected $started;
-	/** @var string */
-	protected $pollToken;
-	/** @var string */
-	protected $loginToken;
-	/** @var string */
-	protected $publicKey;
-	/** @var string */
-	protected $privateKey;
-	/** @var string */
-	protected $clientName;
-	/** @var string */
-	protected $loginName;
-	/** @var string */
-	protected $server;
-	/** @var string */
-	protected $appPassword;
+    /** @var int */
+    protected $timestamp;
+    /** @var int */
+    protected $started;
+    /** @var string */
+    protected $pollToken;
+    /** @var string */
+    protected $loginToken;
+    /** @var string */
+    protected $publicKey;
+    /** @var string */
+    protected $privateKey;
+    /** @var string */
+    protected $clientName;
+    /** @var string */
+    protected $loginName;
+    /** @var string */
+    protected $server;
+    /** @var string */
+    protected $appPassword;
 
-	public function __construct() {
-		$this->addType('timestamp', 'int');
-		$this->addType('started', 'int');
-		$this->addType('pollToken', 'string');
-		$this->addType('loginToken', 'string');
-		$this->addType('publicKey', 'string');
-		$this->addType('privateKey', 'string');
-		$this->addType('clientName', 'string');
-		$this->addType('loginName', 'string');
-		$this->addType('server', 'string');
-		$this->addType('appPassword', 'string');
-	}
+    public function __construct() {
+        $this->addType('timestamp', 'int');
+        $this->addType('started', 'int');
+        $this->addType('pollToken', 'string');
+        $this->addType('loginToken', 'string');
+        $this->addType('publicKey', 'string');
+        $this->addType('privateKey', 'string');
+        $this->addType('clientName', 'string');
+        $this->addType('loginName', 'string');
+        $this->addType('server', 'string');
+        $this->addType('appPassword', 'string');
+    }
 }