Skip to content

Commit 5b1c447

Browse files
glo71317glo71317
committed
Resolve the conflicts
2 parents 33f8325 + 6906f2e commit 5b1c447

File tree

6 files changed

+325
-311
lines changed

6 files changed

+325
-311
lines changed

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

Lines changed: 49 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,66 @@
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

29+
/**
30+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
31+
*/
1332
class JweAlgorithmManagerFactory
1433
{
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-
3434
/**
3535
* @var AlgorithmProviderFactory
3636
*/
37-
private $algorithmProviderFactory;
37+
private AlgorithmProviderFactory $algorithmProviderFactory;
3838

39-
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory) {
39+
/**
40+
* Default constructor.
41+
* @param AlgorithmProviderFactory $algorithmProviderFactory
42+
*/
43+
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory)
44+
{
4045
$this->algorithmProviderFactory = $algorithmProviderFactory;
4146
}
4247

48+
/**
49+
* Returns the list of names of supported algorithms.
50+
*
51+
* @return AlgorithmManager
52+
*/
4353
public function create(): AlgorithmManager
4454
{
45-
return new AlgorithmManager($this->algorithmProviderFactory->create(self::ALGOS)->getAvailableAlgorithms());
55+
return new AlgorithmManager([
56+
new RSAOAEP(),
57+
new RSAOAEP256(),
58+
new A128KW(),
59+
new A192KW(),
60+
new A256KW(),
61+
new Dir(),
62+
new ECDHES(),
63+
new ECDHESA128KW(),
64+
new ECDHESA192KW(),
65+
new ECDHESA256KW(),
66+
new A128GCMKW(),
67+
new A192GCMKW(),
68+
new A256GCMKW(),
69+
new PBES2HS256A128KW(),
70+
new PBES2HS384A192KW(),
71+
new PBES2HS512A256KW(),
72+
]);
4673
}
4774
}

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

Lines changed: 26 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,43 @@
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
*/
27-
private $algorithmProviderFactory;
24+
private AlgorithmProviderFactory $algorithmProviderFactory;
2825

29-
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory) {
26+
/**
27+
* Default constructor.
28+
* @param AlgorithmProviderFactory $algorithmProviderFactory
29+
*/
30+
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory)
31+
{
3032
$this->algorithmProviderFactory = $algorithmProviderFactory;
3133
}
3234

35+
/**
36+
* Returns the list of names of supported algorithms.
37+
*
38+
* @return AlgorithmManager
39+
*/
3340
public function create(): AlgorithmManager
3441
{
35-
return new AlgorithmManager($this->algorithmProviderFactory->create(self::ALGOS)->getAvailableAlgorithms());
42+
return new AlgorithmManager([
43+
new A128CBCHS256(),
44+
new A192CBCHS384(),
45+
new A256CBCHS512(),
46+
new A128GCM(),
47+
new A192GCM(),
48+
new A256GCM(),
49+
]);
3650
}
3751
}

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

Lines changed: 45 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,39 +9,62 @@
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

27+
/**
28+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
29+
*/
1430
class JwsAlgorithmManagerFactory
1531
{
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-
3432
/**
3533
* @var AlgorithmProviderFactory
3634
*/
37-
private $algorithmProviderFactory;
35+
private AlgorithmProviderFactory $algorithmProviderFactory;
3836

39-
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory) {
37+
/**
38+
* Default constructor.
39+
* @param AlgorithmProviderFactory $algorithmProviderFactory
40+
*/
41+
public function __construct(AlgorithmProviderFactory $algorithmProviderFactory)
42+
{
4043
$this->algorithmProviderFactory = $algorithmProviderFactory;
4144
}
4245

46+
/**
47+
* Returns the list of names of supported algorithms.
48+
*
49+
* @return AlgorithmManager
50+
*/
4351
public function create(): AlgorithmManager
4452
{
45-
return new AlgorithmManager($this->algorithmProviderFactory->create(self::ALGOS)->getAvailableAlgorithms());
53+
return new AlgorithmManager([
54+
new HS256(),
55+
new HS384(),
56+
new HS512(),
57+
new RS256(),
58+
new RS384(),
59+
new RS512(),
60+
new PS256(),
61+
new PS384(),
62+
new PS512(),
63+
new ES256(),
64+
new ES384(),
65+
new ES512(),
66+
new EdDSA(),
67+
new None(),
68+
]);
4669
}
4770
}

‎app/code/Magento/JwtFrameworkAdapter/composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"require": {
88
"php": "~8.1.0||~8.2.0",
99
"magento/framework": "*",
10-
"web-token/jwt-framework": "^v2.2.7"
10+
"web-token/jwt-framework": "^3.1.2"
1111
},
1212
"type": "magento2-module",
1313
"license": [

‎composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"symfony/process": "^5.4",
8383
"tedivm/jshrink": "^1.4",
8484
"tubalmartin/cssmin": "^4.1",
85-
"web-token/jwt-framework": "^v2.2.7",
85+
"web-token/jwt-framework": "^3.1",
8686
"webonyx/graphql-php": "^14.11",
8787
"wikimedia/less.php": "^3.0"
8888
},

0 commit comments

Comments
 (0)