Skip to content

Commit c5c5388

Browse files
author
magento packaging service
committed
Magento Release 2.4.6-p6
1 parent fc35000 commit c5c5388

File tree

1,299 files changed

+45616
-38817
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,299 files changed

+45616
-38817
lines changed

‎app/code/Magento/AdminAnalytics/ViewModel/Metadata.php

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@
99
namespace Magento\AdminAnalytics\ViewModel;
1010

1111
use Magento\Config\Model\Config\Backend\Admin\Custom;
12+
use Magento\Csp\Helper\CspNonceProvider;
1213
use Magento\Framework\App\Config\ScopeConfigInterface;
14+
use Magento\Framework\App\ObjectManager;
1315
use Magento\Framework\App\ProductMetadataInterface;
1416
use Magento\Backend\Model\Auth\Session;
1517
use Magento\Framework\App\State;
@@ -21,6 +23,11 @@
2123
*/
2224
class Metadata implements ArgumentInterface
2325
{
26+
/**
27+
* @var string
28+
*/
29+
private $nonce;
30+
2431
/**
2532
* @var State
2633
*/
@@ -41,22 +48,33 @@ class Metadata implements ArgumentInterface
4148
*/
4249
private $config;
4350

51+
/**
52+
* @var CspNonceProvider
53+
*/
54+
private $nonceProvider;
55+
4456
/**
4557
* @param ProductMetadataInterface $productMetadata
4658
* @param Session $authSession
4759
* @param State $appState
4860
* @param ScopeConfigInterface $config
61+
* @param CspNonceProvider|null $nonceProvider
4962
*/
5063
public function __construct(
5164
ProductMetadataInterface $productMetadata,
5265
Session $authSession,
5366
State $appState,
54-
ScopeConfigInterface $config
67+
ScopeConfigInterface $config,
68+
CspNonceProvider $nonceProvider = null
5569
) {
5670
$this->productMetadata = $productMetadata;
5771
$this->authSession = $authSession;
5872
$this->appState = $appState;
5973
$this->config = $config;
74+
75+
$this->nonceProvider = $nonceProvider ?: ObjectManager::getInstance()->get(CspNonceProvider::class);
76+
77+
$this->nonce = $this->nonceProvider->generateNonce();
6078
}
6179

6280
/**
@@ -156,4 +174,14 @@ public function getCurrentUserRoleName(): string
156174
{
157175
return $this->authSession->getUser()->getRole()->getRoleName();
158176
}
177+
178+
/**
179+
* Get a random nonce for each request.
180+
*
181+
* @return string
182+
*/
183+
public function getNonce(): string
184+
{
185+
return $this->nonce;
186+
}
159187
}

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

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
{
22
"name": "magento/module-admin-analytics",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.5-p6",
713
"require": {
814
"php": "~8.1.0||~8.2.0",
9-
"magento/framework": "*",
10-
"magento/module-backend": "*",
11-
"magento/module-config": "*",
12-
"magento/module-store": "*",
13-
"magento/module-ui": "*",
14-
"magento/module-release-notification": "*"
15+
"magento/framework": "103.0.*",
16+
"magento/module-backend": "102.0.*",
17+
"magento/module-config": "101.2.*",
18+
"magento/module-store": "101.1.*",
19+
"magento/module-ui": "101.2.*",
20+
"magento/module-release-notification": "100.4.*",
21+
"magento/module-csp": "100.4.*"
1522
},
16-
"type": "magento2-module",
17-
"license": [
18-
"OSL-3.0",
19-
"AFL-3.0"
20-
],
2123
"autoload": {
2224
"files": [
2325
"registration.php"
@@ -27,3 +29,4 @@
2729
}
2830
}
2931
}
32+

‎app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
/**
88
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
9+
* @var \Magento\Framework\Escaper $escaper
910
*/
1011
?>
1112

@@ -22,18 +23,25 @@
2223
<?php
2324
/** @var \Magento\AdminAnalytics\ViewModel\Metadata $metadata */
2425
$metadata = $block->getMetadata();
26+
$nonce = $escaper->escapeJs($metadata->getNonce());
2527
$scriptString = '
2628
var adminAnalyticsMetadata = {
27-
"secure_base_url": "' . $block->escapeJs($metadata->getSecureBaseUrlForScope()) . '",
28-
"version": "' . $block->escapeJs($metadata->getMagentoVersion()) . '",
29-
"product_edition": "' . $block->escapeJs($metadata->getProductEdition()) . '",
30-
"user": "' . $block->escapeJs($metadata->getCurrentUser()) . '",
31-
"mode": "' . $block->escapeJs($metadata->getMode()) . '",
32-
"store_name_default": "' . $block->escapeJs($metadata->getStoreNameForScope()) . '",
33-
"admin_user_created": "' . $block->escapeJs($metadata->getCurrentUserCreatedDate()) . '",
34-
"admin_user_logdate": "' . $block->escapeJs($metadata->getCurrentUserLogDate()) . '",
35-
"admin_user_role_name": "' . $block->escapeJs($metadata->getCurrentUserRoleName()) . '"
29+
"secure_base_url": "' . $escaper->escapeJs($metadata->getSecureBaseUrlForScope()) . '",
30+
"version": "' . $escaper->escapeJs($metadata->getMagentoVersion()) . '",
31+
"product_edition": "' . $escaper->escapeJs($metadata->getProductEdition()) . '",
32+
"user": "' . $escaper->escapeJs($metadata->getCurrentUser()) . '",
33+
"mode": "' . $escaper->escapeJs($metadata->getMode()) . '",
34+
"store_name_default": "' . $escaper->escapeJs($metadata->getStoreNameForScope()) . '",
35+
"admin_user_created": "' . $escaper->escapeJs($metadata->getCurrentUserCreatedDate()) . '",
36+
"admin_user_logdate": "' . $escaper->escapeJs($metadata->getCurrentUserLogDate()) . '",
37+
"admin_user_role_name": "' . $escaper->escapeJs($metadata->getCurrentUserRoleName()) . '"
3638
};
39+
40+
var digitalData = {
41+
"nonce": "' . $nonce . '"
42+
};
43+
44+
var cspNonce = "' . $nonce . '";
3745
';
3846
?>
3947
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>

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

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{
22
"name": "magento/module-admin-notification",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.5",
713
"require": {
814
"php": "~8.1.0||~8.2.0",
915
"lib-libxml": "*",
10-
"magento/framework": "*",
11-
"magento/module-backend": "*",
12-
"magento/module-media-storage": "*",
13-
"magento/module-store": "*",
14-
"magento/module-ui": "*",
15-
"magento/module-config": "*"
16+
"magento/framework": "103.0.*",
17+
"magento/module-backend": "102.0.*",
18+
"magento/module-media-storage": "100.4.*",
19+
"magento/module-store": "101.1.*",
20+
"magento/module-ui": "101.2.*",
21+
"magento/module-config": "101.2.*"
1622
},
17-
"type": "magento2-module",
18-
"license": [
19-
"OSL-3.0",
20-
"AFL-3.0"
21-
],
2223
"autoload": {
2324
"files": [
2425
"registration.php"
@@ -28,3 +29,4 @@
2829
}
2930
}
3031
}
32+

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

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
{
22
"name": "magento/module-advanced-pricing-import-export",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.6",
713
"require": {
814
"php": "~8.1.0||~8.2.0",
9-
"magento/framework": "*",
10-
"magento/module-catalog": "*",
11-
"magento/module-catalog-import-export": "*",
12-
"magento/module-catalog-inventory": "*",
13-
"magento/module-customer": "*",
14-
"magento/module-eav": "*",
15-
"magento/module-import-export": "*",
16-
"magento/module-store": "*",
17-
"magento/module-directory": "*"
15+
"magento/framework": "103.0.*",
16+
"magento/module-catalog": "104.0.*",
17+
"magento/module-catalog-import-export": "101.1.*",
18+
"magento/module-catalog-inventory": "100.4.*",
19+
"magento/module-customer": "103.0.*",
20+
"magento/module-eav": "102.1.*",
21+
"magento/module-import-export": "101.0.*",
22+
"magento/module-store": "101.1.*",
23+
"magento/module-directory": "100.4.*"
1824
},
19-
"type": "magento2-module",
20-
"license": [
21-
"OSL-3.0",
22-
"AFL-3.0"
23-
],
2425
"autoload": {
2526
"files": [
2627
"registration.php"
@@ -30,3 +31,4 @@
3031
}
3132
}
3233
}
34+

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

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
{
22
"name": "magento/module-advanced-search",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.4",
713
"require": {
8-
"magento/framework": "*",
9-
"magento/module-backend": "*",
10-
"magento/module-catalog": "*",
11-
"magento/module-catalog-search": "*",
12-
"magento/module-config": "*",
13-
"magento/module-customer": "*",
14-
"magento/module-search": "*",
15-
"magento/module-store": "*",
14+
"magento/framework": "103.0.*",
15+
"magento/module-backend": "102.0.*",
16+
"magento/module-catalog": "104.0.*",
17+
"magento/module-catalog-search": "102.0.*",
18+
"magento/module-config": "101.2.*",
19+
"magento/module-customer": "103.0.*",
20+
"magento/module-search": "101.1.*",
21+
"magento/module-store": "101.1.*",
1622
"php": "~8.1.0||~8.2.0"
1723
},
18-
"type": "magento2-module",
19-
"license": [
20-
"OSL-3.0",
21-
"AFL-3.0"
22-
],
2324
"autoload": {
2425
"files": [
2526
"registration.php"
@@ -29,3 +30,4 @@
2930
}
3031
}
3132
}
33+

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
{
22
"name": "magento/module-amqp",
33
"description": "N/A",
4+
"type": "magento2-module",
5+
"license": [
6+
"OSL-3.0",
7+
"AFL-3.0"
8+
],
49
"config": {
510
"sort-packages": true
611
},
12+
"version": "100.4.3",
713
"require": {
8-
"magento/framework": "*",
9-
"magento/framework-amqp": "*",
10-
"magento/framework-message-queue": "*",
14+
"magento/framework": "103.0.*",
15+
"magento/framework-amqp": "100.4.*",
16+
"magento/framework-message-queue": "100.4.*",
1117
"php": "~8.1.0||~8.2.0"
1218
},
13-
"type": "magento2-module",
14-
"license": [
15-
"OSL-3.0",
16-
"AFL-3.0"
17-
],
1819
"autoload": {
1920
"files": [
2021
"registration.php"
@@ -24,3 +25,4 @@
2425
}
2526
}
2627
}
28+

‎app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="clickFoundUsername"/>
3636
<waitForPageLoad time="30" stepKey="wait2"/>
3737
<seeInField selector="{{AdminEditUserSection.usernameTextField}}" userInput="$$noReportUser.username$$" stepKey="seeUsernameInField"/>
38-
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
38+
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
3939
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>
4040

4141
<click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>

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

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,20 @@
11
{
22
"name": "magento/module-analytics",
33
"description": "N/A",
4-
"require": {
5-
"php": "~8.1.0||~8.2.0",
6-
"magento/module-backend": "*",
7-
"magento/module-config": "*",
8-
"magento/module-integration": "*",
9-
"magento/module-store": "*",
10-
"magento/framework": "*"
11-
},
124
"type": "magento2-module",
135
"license": [
146
"OSL-3.0",
157
"AFL-3.0"
168
],
9+
"version": "100.4.6-p4",
10+
"require": {
11+
"php": "~8.1.0||~8.2.0",
12+
"magento/module-backend": "102.0.*",
13+
"magento/module-config": "101.2.*",
14+
"magento/module-integration": "100.4.*",
15+
"magento/module-store": "101.1.*",
16+
"magento/framework": "103.0.*"
17+
},
1718
"autoload": {
1819
"files": [
1920
"registration.php"
@@ -23,3 +24,4 @@
2324
}
2425
}
2526
}
27+

0 commit comments

Comments
 (0)