Merge pull request #16452 from nextcloud/bug/noid/error-with-exceptio…

…n-on-ssl-error Error with exception on SSL error
nextcloud · Jul 18, 2019 · baff2cc · baff2cc
2 parents 3011449 + 4ae1742
commit baff2cc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 0 deletions.
diff --git a/lib/private/Authentication/Token/IProvider.php b/lib/private/Authentication/Token/IProvider.php
@@ -45,6 +45,7 @@ interface IProvider {
 	 * @param int $type token type
 	 * @param int $remember whether the session token should be used for remember-me
 	 * @return IToken
+	 * @throws \RuntimeException when OpenSSL reports a problem
 	 */
 	public function generateToken(string $token,
 								  string $uid,
@@ -82,6 +83,7 @@ public function getTokenById(int $tokenId): IToken;
 	 * @param string $oldSessionId
 	 * @param string $sessionId
 	 * @throws InvalidTokenException
+	 * @throws \RuntimeException when OpenSSL reports a problem
 	 */
 	public function renewSessionToken(string $oldSessionId, string $sessionId);
 
@@ -158,6 +160,7 @@ public function setPassword(IToken $token, string $tokenId, string $password);
 	 * @param string $oldTokenId
 	 * @param string $newTokenId
 	 * @return IToken
+	 * @throws \RuntimeException when OpenSSL reports a problem
 	 */
 	public function rotate(IToken $token, string $oldTokenId, string $newTokenId): IToken;
 

diff --git a/lib/private/Authentication/Token/Manager.php b/lib/private/Authentication/Token/Manager.php
@@ -109,6 +109,7 @@ public function getTokenByUser(string $uid): array {
 	 *
 	 * @param string $tokenId
 	 * @throws InvalidTokenException
+	 * @throws \RuntimeException when OpenSSL reports a problem
 	 * @return IToken
 	 */
 	public function getToken(string $tokenId): IToken {
@@ -206,6 +207,7 @@ public function invalidateOldTokens() {
 	 * @param string $newTokenId
 	 * @return IToken
 	 * @throws InvalidTokenException
+	 * @throws \RuntimeException when OpenSSL reports a problem
 	 */
 	public function rotate(IToken $token, string $oldTokenId, string $newTokenId): IToken {
 		if ($token instanceof DefaultToken) {

diff --git a/lib/private/Authentication/Token/PublicKeyTokenProvider.php b/lib/private/Authentication/Token/PublicKeyTokenProvider.php
@@ -61,6 +61,9 @@ public function __construct(PublicKeyTokenMapper $mapper,
 		$this->time = $time;
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	public function generateToken(string $token,
 								  string $uid,
 								  string $loginName,
@@ -268,6 +271,7 @@ private function hashToken(string $token): string {
 	/**
 	 * Convert a DefaultToken to a publicKeyToken
 	 * This will also be updated directly in the Database
+	 * @throws \RuntimeException when OpenSSL reports a problem
 	 */
 	public function convertToken(DefaultToken $defaultToken, string $token, $password): PublicKeyToken {
 		$pkToken = $this->newToken(
@@ -286,6 +290,9 @@ public function convertToken(DefaultToken $defaultToken, string $token, $passwor
 		return $this->mapper->update($pkToken);
 	}
 
+	/**
+	 * @throws \RuntimeException when OpenSSL reports a problem
+	 */
 	private function newToken(string $token,
 							  string $uid,
 							  string $loginName,
@@ -306,6 +313,7 @@ private function newToken(string $token,
 		$res = openssl_pkey_new($config);
 		if ($res === false) {
 			$this->logOpensslError();
+			throw new \RuntimeException('OpenSSL reported a problem');
 		}
 
 		openssl_pkey_export($res, $privateKey);