Skip to content

Commit dbb760f

Browse files
glo71317glo71317
committed
AC-3772::Fixed the Automation test failures
1 parent b684be5 commit dbb760f

File tree

3 files changed

+84
-53
lines changed

3 files changed

+84
-53
lines changed

‎app/code/Magento/JwtFrameworkAdapter/Model/JweAlgorithmManagerFactory.php

Lines changed: 36 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,54 @@
99
namespace Magento\JwtFrameworkAdapter\Model;
1010

1111
use Jose\Component\Core\AlgorithmManager;
12+
use Jose\Component\Encryption\Algorithm\KeyEncryption\A128GCMKW;
13+
use Jose\Component\Encryption\Algorithm\KeyEncryption\A128KW;
14+
use Jose\Component\Encryption\Algorithm\KeyEncryption\A192GCMKW;
15+
use Jose\Component\Encryption\Algorithm\KeyEncryption\A192KW;
16+
use Jose\Component\Encryption\Algorithm\KeyEncryption\A256GCMKW;
17+
use Jose\Component\Encryption\Algorithm\KeyEncryption\A256KW;
18+
use Jose\Component\Encryption\Algorithm\KeyEncryption\Dir;
19+
use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHES;
20+
use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA128KW;
21+
use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA192KW;
22+
use Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA256KW;
23+
use Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS256A128KW;
24+
use Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS384A192KW;
25+
use Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS512A256KW;
26+
use Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP;
27+
use Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP256;
1228

1329
class JweAlgorithmManagerFactory
1430
{
15-
private const ALGOS = [
16-
\Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP::class,
17-
\Jose\Component\Encryption\Algorithm\KeyEncryption\RSAOAEP256::class,
18-
\Jose\Component\Encryption\Algorithm\KeyEncryption\A128KW::class,
19-
\Jose\Component\Encryption\Algorithm\KeyEncryption\A192KW::class,
20-
\Jose\Component\Encryption\Algorithm\KeyEncryption\A256KW::class,
21-
\Jose\Component\Encryption\Algorithm\KeyEncryption\Dir::class,
22-
\Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHES::class,
23-
\Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA128KW::class,
24-
\Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA192KW::class,
25-
\Jose\Component\Encryption\Algorithm\KeyEncryption\ECDHESA256KW::class,
26-
\Jose\Component\Encryption\Algorithm\KeyEncryption\A128GCMKW::class,
27-
\Jose\Component\Encryption\Algorithm\KeyEncryption\A192GCMKW::class,
28-
\Jose\Component\Encryption\Algorithm\KeyEncryption\A256GCMKW::class,
29-
\Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS256A128KW::class,
30-
\Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS384A192KW::class,
31-
\Jose\Component\Encryption\Algorithm\KeyEncryption\PBES2HS512A256KW::class
32-
];
33-
3431
/**
3532
* @var AlgorithmProviderFactory
3633
*/
3734
private $algorithmProviderFactory;
3835

39-
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory) {
36+
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory)
37+
{
4038
$this->algorithmProviderFactory = $algorithmProviderFactory;
4139
}
4240

4341
public function create(): AlgorithmManager
4442
{
45-
return new AlgorithmManager($this->algorithmProviderFactory->create(self::ALGOS)->getAvailableAlgorithms());
43+
return new AlgorithmManager([
44+
new RSAOAEP(),
45+
new RSAOAEP256(),
46+
new A128KW(),
47+
new A192KW(),
48+
new A256KW(),
49+
new Dir(),
50+
new ECDHES(),
51+
new ECDHESA128KW(),
52+
new ECDHESA192KW(),
53+
new ECDHESA256KW(),
54+
new A128GCMKW(),
55+
new A192GCMKW(),
56+
new A256GCMKW(),
57+
new PBES2HS256A128KW(),
58+
new PBES2HS384A192KW(),
59+
new PBES2HS512A256KW(),
60+
]);
4661
}
4762
}

‎app/code/Magento/JwtFrameworkAdapter/Model/JweContentAlgorithmManagerFactory.php

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,34 @@
99
namespace Magento\JwtFrameworkAdapter\Model;
1010

1111
use Jose\Component\Core\AlgorithmManager;
12+
use Jose\Component\Encryption\Algorithm\ContentEncryption\A128CBCHS256;
13+
use Jose\Component\Encryption\Algorithm\ContentEncryption\A128GCM;
14+
use Jose\Component\Encryption\Algorithm\ContentEncryption\A192CBCHS384;
15+
use Jose\Component\Encryption\Algorithm\ContentEncryption\A192GCM;
16+
use Jose\Component\Encryption\Algorithm\ContentEncryption\A256CBCHS512;
17+
use Jose\Component\Encryption\Algorithm\ContentEncryption\A256GCM;
1218

1319
class JweContentAlgorithmManagerFactory
1420
{
15-
private const ALGOS = [
16-
\Jose\Component\Encryption\Algorithm\ContentEncryption\A128CBCHS256::class,
17-
\Jose\Component\Encryption\Algorithm\ContentEncryption\A192CBCHS384::class,
18-
\Jose\Component\Encryption\Algorithm\ContentEncryption\A256CBCHS512::class,
19-
\Jose\Component\Encryption\Algorithm\ContentEncryption\A128GCM::class,
20-
\Jose\Component\Encryption\Algorithm\ContentEncryption\A192GCM::class,
21-
\Jose\Component\Encryption\Algorithm\ContentEncryption\A256GCM::class,
22-
];
23-
2421
/**
2522
* @var AlgorithmProviderFactory
2623
*/
2724
private $algorithmProviderFactory;
2825

29-
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory) {
26+
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory)
27+
{
3028
$this->algorithmProviderFactory = $algorithmProviderFactory;
3129
}
3230

3331
public function create(): AlgorithmManager
3432
{
35-
return new AlgorithmManager($this->algorithmProviderFactory->create(self::ALGOS)->getAvailableAlgorithms());
33+
return new AlgorithmManager([
34+
new A128CBCHS256(),
35+
new A192CBCHS384(),
36+
new A256CBCHS512(),
37+
new A128GCM(),
38+
new A192GCM(),
39+
new A256GCM(),
40+
]);
3641
}
3742
}

‎app/code/Magento/JwtFrameworkAdapter/Model/JwsAlgorithmManagerFactory.php

Lines changed: 32 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,50 @@
99
namespace Magento\JwtFrameworkAdapter\Model;
1010

1111
use Jose\Component\Core\AlgorithmManager;
12-
use Jose\Easy\AlgorithmProvider;
12+
use Jose\Component\Signature\Algorithm\EdDSA;
13+
use Jose\Component\Signature\Algorithm\ES256;
14+
use Jose\Component\Signature\Algorithm\ES384;
15+
use Jose\Component\Signature\Algorithm\ES512;
16+
use Jose\Component\Signature\Algorithm\HS256;
17+
use Jose\Component\Signature\Algorithm\HS384;
18+
use Jose\Component\Signature\Algorithm\HS512;
19+
use Jose\Component\Signature\Algorithm\None;
20+
use Jose\Component\Signature\Algorithm\PS256;
21+
use Jose\Component\Signature\Algorithm\PS384;
22+
use Jose\Component\Signature\Algorithm\PS512;
23+
use Jose\Component\Signature\Algorithm\RS256;
24+
use Jose\Component\Signature\Algorithm\RS384;
25+
use Jose\Component\Signature\Algorithm\RS512;
1326

1427
class JwsAlgorithmManagerFactory
1528
{
16-
private const ALGOS = [
17-
18-
\Jose\Component\Signature\Algorithm\HS256::class,
19-
\Jose\Component\Signature\Algorithm\HS384::class,
20-
\Jose\Component\Signature\Algorithm\HS512::class,
21-
\Jose\Component\Signature\Algorithm\RS256::class,
22-
\Jose\Component\Signature\Algorithm\RS384::class,
23-
\Jose\Component\Signature\Algorithm\RS512::class,
24-
\Jose\Component\Signature\Algorithm\PS256::class,
25-
\Jose\Component\Signature\Algorithm\PS384::class,
26-
\Jose\Component\Signature\Algorithm\PS512::class,
27-
\Jose\Component\Signature\Algorithm\ES256::class,
28-
\Jose\Component\Signature\Algorithm\ES384::class,
29-
\Jose\Component\Signature\Algorithm\ES512::class,
30-
\Jose\Component\Signature\Algorithm\EdDSA::class,
31-
\Jose\Component\Signature\Algorithm\None::class
32-
];
33-
3429
/**
3530
* @var AlgorithmProviderFactory
3631
*/
3732
private $algorithmProviderFactory;
3833

39-
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory) {
34+
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory)
35+
{
4036
$this->algorithmProviderFactory = $algorithmProviderFactory;
4137
}
4238

4339
public function create(): AlgorithmManager
4440
{
45-
return new AlgorithmManager($this->algorithmProviderFactory->create(self::ALGOS)->getAvailableAlgorithms());
41+
return new AlgorithmManager([
42+
new HS256(),
43+
new HS384(),
44+
new HS512(),
45+
new RS256(),
46+
new RS384(),
47+
new RS512(),
48+
new PS256(),
49+
new PS384(),
50+
new PS512(),
51+
new ES256(),
52+
new ES384(),
53+
new ES512(),
54+
new EdDSA(),
55+
new None(),
56+
]);
4657
}
4758
}

0 commit comments

Comments
 (0)