ElyBy-Mirror/accounts
1
0
Fork 0
mirror of https://github.com/elyby/accounts.git synced 2025-03-11 18:59:10 +05:30
Code Issues Packages Projects Releases Wiki Activity

Fixes ACCOUNTS-2. Catch decryption exception for OAuth2 flow

Browse Source
This commit is contained in:
ErickSkrauch 2020-08-23 00:23:36 +03:00
parent 503880615a
commit 2a4f29801d
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/components/OAuth2/CryptTrait.php
View File

@ -3,6 +3,9 @@ declare(strict_types=1);
namespace api\components\OAuth2; namespace api\components\OAuth2;
use LogicException;
use RangeException;
use SodiumException;
use Yii; use Yii;
/** /**
@ -20,7 +23,11 @@ trait CryptTrait {
} }
protected function decrypt($encryptedData): string { protected function decrypt($encryptedData): string {
return Yii::$app->tokens->decryptValue($encryptedData); try {
return Yii::$app->tokens->decryptValue($encryptedData);
} catch (SodiumException | RangeException $e) {
throw new LogicException($e->getMessage(), 0, $e);
}
} }
} }

7
api/components/Tokens/Component.php
View File

@ -107,6 +107,13 @@ class Component extends BaseComponent {
return $cipher; return $cipher;
} }
/**
* @param string $encryptedValue
*
* @return string
* @throws \SodiumException
* @throws \RangeException
*/
public function decryptValue(string $encryptedValue): string { public function decryptValue(string $encryptedValue): string {
$decoded = Base64UrlSafe::decode($encryptedValue); $decoded = Base64UrlSafe::decode($encryptedValue);
Assert::true(mb_strlen($decoded, '8bit') >= (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES)); Assert::true(mb_strlen($decoded, '8bit') >= (SODIUM_CRYPTO_SECRETBOX_NONCEBYTES + SODIUM_CRYPTO_SECRETBOX_MACBYTES));

11
api/components/Tokens/TokenReader.php
View File

@ -6,12 +6,9 @@ namespace api\components\Tokens;
use Lcobucci\JWT\Token; use Lcobucci\JWT\Token;
use Yii; use Yii;
class TokenReader { final class TokenReader {
/** private Token $token;
* @var Token
*/
private $token;
public function __construct(Token $token) { public function __construct(Token $token) {
$this->token = $token; $this->token = $token;
@ -55,6 +52,10 @@ class TokenReader {
return null; return null;
} }
/**
* It really might throw an exception but we have not seen any case of such exception yet
* @noinspection PhpUnhandledExceptionInspection
*/
return Yii::$app->tokens->decryptValue($encodedClientToken); return Yii::$app->tokens->decryptValue($encodedClientToken);
} }