nextcloud / server

settings/Controller/AuthSettingsController.php

Indentation +160 added lines, -160 removed lines

@@ -38,165 +38,165 @@
 
 class AuthSettingsController extends Controller {
 
-	/** @var IProvider */
-	private $tokenProvider;
-
-	/** @var IUserManager */
-	private $userManager;
-
-	/** @var ISession */
-	private $session;
-
-	/** @var string */
-	private $uid;
-
-	/** @var ISecureRandom */
-	private $random;
-
-	/**
-	 * @param string $appName
-	 * @param IRequest $request
-	 * @param IProvider $tokenProvider
-	 * @param IUserManager $userManager
-	 * @param ISession $session
-	 * @param ISecureRandom $random
-	 * @param string $userId
-	 */
-	public function __construct($appName, IRequest $request, IProvider $tokenProvider, IUserManager $userManager,
-		ISession $session, ISecureRandom $random, $userId) {
-		parent::__construct($appName, $request);
-		$this->tokenProvider = $tokenProvider;
-		$this->userManager = $userManager;
-		$this->uid = $userId;
-		$this->session = $session;
-		$this->random = $random;
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function index() {
-		$user = $this->userManager->get($this->uid);
-		if (is_null($user)) {
-			return [];
-		}
-		$tokens = $this->tokenProvider->getTokenByUser($user);
+    /** @var IProvider */
+    private $tokenProvider;
+
+    /** @var IUserManager */
+    private $userManager;
+
+    /** @var ISession */
+    private $session;
+
+    /** @var string */
+    private $uid;
+
+    /** @var ISecureRandom */
+    private $random;
+
+    /**
+     * @param string $appName
+     * @param IRequest $request
+     * @param IProvider $tokenProvider
+     * @param IUserManager $userManager
+     * @param ISession $session
+     * @param ISecureRandom $random
+     * @param string $userId
+     */
+    public function __construct($appName, IRequest $request, IProvider $tokenProvider, IUserManager $userManager,
+        ISession $session, ISecureRandom $random, $userId) {
+        parent::__construct($appName, $request);
+        $this->tokenProvider = $tokenProvider;
+        $this->userManager = $userManager;
+        $this->uid = $userId;
+        $this->session = $session;
+        $this->random = $random;
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     *
+     * @return JSONResponse
+     */
+    public function index() {
+        $user = $this->userManager->get($this->uid);
+        if (is_null($user)) {
+            return [];
+        }
+        $tokens = $this->tokenProvider->getTokenByUser($user);
 		
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-		try {
-			$sessionToken = $this->tokenProvider->getToken($sessionId);
-		} catch (InvalidTokenException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-
-		return array_map(function(IToken $token) use ($sessionToken) {
-			$data = $token->jsonSerialize();
-			if ($sessionToken->getId() === $token->getId()) {
-				$data['canDelete'] = false;
-				$data['current'] = true;
-			} else {
-				$data['canDelete'] = true;
-			}
-			return $data;
-		}, $tokens);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 * @PasswordConfirmationRequired
-	 *
-	 * @param string $name
-	 * @return JSONResponse
-	 */
-	public function create($name) {
-		try {
-			$sessionId = $this->session->getId();
-		} catch (SessionNotAvailableException $ex) {
-			return $this->getServiceNotAvailableResponse();
-		}
-
-		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 $this->getServiceNotAvailableResponse();
-		}
-
-		$token = $this->generateRandomDeviceToken();
-		$deviceToken = $this->tokenProvider->generateToken($token, $this->uid, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
-		$tokenData = $deviceToken->jsonSerialize();
-		$tokenData['canDelete'] = true;
-
-		return new JSONResponse([
-			'token' => $token,
-			'loginName' => $loginName,
-			'deviceToken' => $tokenData,
-		]);
-	}
-
-	private function getServiceNotAvailableResponse() {
-		$resp = new JSONResponse();
-		$resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
-		return $resp;
-	}
-
-	/**
-	 * Return a 25 digit device password
-	 *
-	 * Example: AbCdE-fGhIj-KlMnO-pQrSt-12345
-	 *
-	 * @return string
-	 */
-	private function generateRandomDeviceToken() {
-		$groups = [];
-		for ($i = 0; $i < 5; $i++) {
-			$groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
-		}
-		return implode('-', $groups);
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 *
-	 * @return JSONResponse
-	 */
-	public function destroy($id) {
-		$user = $this->userManager->get($this->uid);
-		if (is_null($user)) {
-			return [];
-		}
-
-		$this->tokenProvider->invalidateTokenById($user, $id);
-		return [];
-	}
-
-	/**
-	 * @NoAdminRequired
-	 * @NoSubadminRequired
-	 *
-	 * @param int $id
-	 * @param array $scope
-	 */
-	public function update($id, array $scope) {
-		$token = $this->tokenProvider->getTokenById($id);
-		$token->setScope([
-			'filesystem' => $scope['filesystem']
-		]);
-		$this->tokenProvider->updateToken($token);
-		return [];
-	}
+        try {
+            $sessionId = $this->session->getId();
+        } catch (SessionNotAvailableException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
+        try {
+            $sessionToken = $this->tokenProvider->getToken($sessionId);
+        } catch (InvalidTokenException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
+
+        return array_map(function(IToken $token) use ($sessionToken) {
+            $data = $token->jsonSerialize();
+            if ($sessionToken->getId() === $token->getId()) {
+                $data['canDelete'] = false;
+                $data['current'] = true;
+            } else {
+                $data['canDelete'] = true;
+            }
+            return $data;
+        }, $tokens);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     * @PasswordConfirmationRequired
+     *
+     * @param string $name
+     * @return JSONResponse
+     */
+    public function create($name) {
+        try {
+            $sessionId = $this->session->getId();
+        } catch (SessionNotAvailableException $ex) {
+            return $this->getServiceNotAvailableResponse();
+        }
+
+        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 $this->getServiceNotAvailableResponse();
+        }
+
+        $token = $this->generateRandomDeviceToken();
+        $deviceToken = $this->tokenProvider->generateToken($token, $this->uid, $loginName, $password, $name, IToken::PERMANENT_TOKEN);
+        $tokenData = $deviceToken->jsonSerialize();
+        $tokenData['canDelete'] = true;
+
+        return new JSONResponse([
+            'token' => $token,
+            'loginName' => $loginName,
+            'deviceToken' => $tokenData,
+        ]);
+    }
+
+    private function getServiceNotAvailableResponse() {
+        $resp = new JSONResponse();
+        $resp->setStatus(Http::STATUS_SERVICE_UNAVAILABLE);
+        return $resp;
+    }
+
+    /**
+     * Return a 25 digit device password
+     *
+     * Example: AbCdE-fGhIj-KlMnO-pQrSt-12345
+     *
+     * @return string
+     */
+    private function generateRandomDeviceToken() {
+        $groups = [];
+        for ($i = 0; $i < 5; $i++) {
+            $groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
+        }
+        return implode('-', $groups);
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     *
+     * @return JSONResponse
+     */
+    public function destroy($id) {
+        $user = $this->userManager->get($this->uid);
+        if (is_null($user)) {
+            return [];
+        }
+
+        $this->tokenProvider->invalidateTokenById($user, $id);
+        return [];
+    }
+
+    /**
+     * @NoAdminRequired
+     * @NoSubadminRequired
+     *
+     * @param int $id
+     * @param array $scope
+     */
+    public function update($id, array $scope) {
+        $token = $this->tokenProvider->getTokenById($id);
+        $token->setScope([
+            'filesystem' => $scope['filesystem']
+        ]);
+        $this->tokenProvider->updateToken($token);
+        return [];
+    }
 }

lib/public/Security/ISecureRandom.php

Indentation +47 added lines, -47 removed lines

@@ -36,56 +36,56 @@
  */
 interface ISecureRandom {
 
-	/**
-	 * Flags for characters that can be used for <code>generate($length, $characters)</code>
-	 */
-	const CHAR_UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
-	const CHAR_LOWER = 'abcdefghijklmnopqrstuvwxyz';
-	const CHAR_DIGITS = '0123456789';
-	const CHAR_SYMBOLS = '!\"#$%&\\\'()* +,-./:;<=>?@[\]^_`{|}~';
+    /**
+     * Flags for characters that can be used for <code>generate($length, $characters)</code>
+     */
+    const CHAR_UPPER = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ';
+    const CHAR_LOWER = 'abcdefghijklmnopqrstuvwxyz';
+    const CHAR_DIGITS = '0123456789';
+    const CHAR_SYMBOLS = '!\"#$%&\\\'()* +,-./:;<=>?@[\]^_`{|}~';
 
-	/**
-	 * Characters that can be used for <code>generate($length, $characters)</code>, to
-	 * generate human readable random strings. Lower- and upper-case characters and digits 
-	 * are included. Characters which are ambiguous are excluded, such as I, l, and 1 and so on.
-	 */
-	const CHAR_HUMAN_READABLE = "abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789";
+    /**
+     * Characters that can be used for <code>generate($length, $characters)</code>, to
+     * generate human readable random strings. Lower- and upper-case characters and digits 
+     * are included. Characters which are ambiguous are excluded, such as I, l, and 1 and so on.
+     */
+    const CHAR_HUMAN_READABLE = "abcdefgijkmnopqrstwxyzABCDEFGHJKLMNPQRSTWXYZ23456789";
 
-	/**
-	 * Convenience method to get a low strength random number generator.
-	 *
-	 * Low Strength should be used anywhere that random strings are needed
-	 * in a non-cryptographical setting. They are not strong enough to be
-	 * used as keys or salts. They are however useful for one-time use tokens.
-	 *
-	 * @return $this
-	 * @since 8.0.0
-	 * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
-	 */
-	public function getLowStrengthGenerator();
+    /**
+     * Convenience method to get a low strength random number generator.
+     *
+     * Low Strength should be used anywhere that random strings are needed
+     * in a non-cryptographical setting. They are not strong enough to be
+     * used as keys or salts. They are however useful for one-time use tokens.
+     *
+     * @return $this
+     * @since 8.0.0
+     * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
+     */
+    public function getLowStrengthGenerator();
 
-	/**
-	 * Convenience method to get a medium strength random number generator.
-	 *
-	 * Medium Strength should be used for most needs of a cryptographic nature.
-	 * They are strong enough to be used as keys and salts. However, they do
-	 * take some time and resources to generate, so they should not be over-used
-	 *
-	 * @return $this
-	 * @since 8.0.0
-	 * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
-	 */
-	public function getMediumStrengthGenerator();
+    /**
+     * Convenience method to get a medium strength random number generator.
+     *
+     * Medium Strength should be used for most needs of a cryptographic nature.
+     * They are strong enough to be used as keys and salts. However, they do
+     * take some time and resources to generate, so they should not be over-used
+     *
+     * @return $this
+     * @since 8.0.0
+     * @deprecated 9.0.0 Use \OC\Security\SecureRandom::generate directly or random_bytes() / random_int()
+     */
+    public function getMediumStrengthGenerator();
 
-	/**
-	 * Generate a random string of specified length.
-	 * @param int $length The length of the generated string
-	 * @param string $characters An optional list of characters to use if no character list is
-	 * 							specified all valid base64 characters are used.
-	 * @return string
-	 * @since 8.0.0
-	 */
-	public function generate($length,
-							 $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/');
+    /**
+     * Generate a random string of specified length.
+     * @param int $length The length of the generated string
+     * @param string $characters An optional list of characters to use if no character list is
+     * 							specified all valid base64 characters are used.
+     * @return string
+     * @since 8.0.0
+     */
+    public function generate($length,
+                                $characters = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/');
 
 }