Skip to content

Commit

Permalink
Magento Release 2.4.6-p6
Browse files Browse the repository at this point in the history
  • Loading branch information
magento packaging service committed Jun 6, 2024
1 parent fc35000 commit c5c5388
Show file tree
Hide file tree
Showing 1,299 changed files with 45,616 additions and 38,817 deletions.
30 changes: 29 additions & 1 deletion app/code/Magento/AdminAnalytics/ViewModel/Metadata.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
namespace Magento\AdminAnalytics\ViewModel;

use Magento\Config\Model\Config\Backend\Admin\Custom;
use Magento\Csp\Helper\CspNonceProvider;
use Magento\Framework\App\Config\ScopeConfigInterface;
use Magento\Framework\App\ObjectManager;
use Magento\Framework\App\ProductMetadataInterface;
use Magento\Backend\Model\Auth\Session;
use Magento\Framework\App\State;
Expand All @@ -21,6 +23,11 @@
*/
class Metadata implements ArgumentInterface
{
/**
* @var string
*/
private $nonce;

/**
* @var State
*/
Expand All @@ -41,22 +48,33 @@ class Metadata implements ArgumentInterface
*/
private $config;

/**
* @var CspNonceProvider
*/
private $nonceProvider;

/**
* @param ProductMetadataInterface $productMetadata
* @param Session $authSession
* @param State $appState
* @param ScopeConfigInterface $config
* @param CspNonceProvider|null $nonceProvider
*/
public function __construct(
ProductMetadataInterface $productMetadata,
Session $authSession,
State $appState,
ScopeConfigInterface $config
ScopeConfigInterface $config,
CspNonceProvider $nonceProvider = null
) {
$this->productMetadata = $productMetadata;
$this->authSession = $authSession;
$this->appState = $appState;
$this->config = $config;

$this->nonceProvider = $nonceProvider ?: ObjectManager::getInstance()->get(CspNonceProvider::class);

$this->nonce = $this->nonceProvider->generateNonce();
}

/**
Expand Down Expand Up @@ -156,4 +174,14 @@ public function getCurrentUserRoleName(): string
{
return $this->authSession->getUser()->getRole()->getRoleName();
}

/**
* Get a random nonce for each request.
*
* @return string
*/
public function getNonce(): string
{
return $this->nonce;
}
}
25 changes: 14 additions & 11 deletions app/code/Magento/AdminAnalytics/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,25 @@
{
"name": "magento/module-admin-analytics",
"description": "N/A",
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"config": {
"sort-packages": true
},
"version": "100.4.5-p6",
"require": {
"php": "~8.1.0||~8.2.0",
"magento/framework": "*",
"magento/module-backend": "*",
"magento/module-config": "*",
"magento/module-store": "*",
"magento/module-ui": "*",
"magento/module-release-notification": "*"
"magento/framework": "103.0.*",
"magento/module-backend": "102.0.*",
"magento/module-config": "101.2.*",
"magento/module-store": "101.1.*",
"magento/module-ui": "101.2.*",
"magento/module-release-notification": "100.4.*",
"magento/module-csp": "100.4.*"
},
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": {
"files": [
"registration.php"
Expand All @@ -27,3 +29,4 @@
}
}
}

26 changes: 17 additions & 9 deletions app/code/Magento/AdminAnalytics/view/adminhtml/templates/tracking.phtml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

/**
* @var \Magento\Framework\View\Helper\SecureHtmlRenderer $secureRenderer
* @var \Magento\Framework\Escaper $escaper
*/
?>

Expand All @@ -22,18 +23,25 @@
<?php
/** @var \Magento\AdminAnalytics\ViewModel\Metadata $metadata */
$metadata = $block->getMetadata();
$nonce = $escaper->escapeJs($metadata->getNonce());
$scriptString = '
var adminAnalyticsMetadata = {
"secure_base_url": "' . $block->escapeJs($metadata->getSecureBaseUrlForScope()) . '",
"version": "' . $block->escapeJs($metadata->getMagentoVersion()) . '",
"product_edition": "' . $block->escapeJs($metadata->getProductEdition()) . '",
"user": "' . $block->escapeJs($metadata->getCurrentUser()) . '",
"mode": "' . $block->escapeJs($metadata->getMode()) . '",
"store_name_default": "' . $block->escapeJs($metadata->getStoreNameForScope()) . '",
"admin_user_created": "' . $block->escapeJs($metadata->getCurrentUserCreatedDate()) . '",
"admin_user_logdate": "' . $block->escapeJs($metadata->getCurrentUserLogDate()) . '",
"admin_user_role_name": "' . $block->escapeJs($metadata->getCurrentUserRoleName()) . '"
"secure_base_url": "' . $escaper->escapeJs($metadata->getSecureBaseUrlForScope()) . '",
"version": "' . $escaper->escapeJs($metadata->getMagentoVersion()) . '",
"product_edition": "' . $escaper->escapeJs($metadata->getProductEdition()) . '",
"user": "' . $escaper->escapeJs($metadata->getCurrentUser()) . '",
"mode": "' . $escaper->escapeJs($metadata->getMode()) . '",
"store_name_default": "' . $escaper->escapeJs($metadata->getStoreNameForScope()) . '",
"admin_user_created": "' . $escaper->escapeJs($metadata->getCurrentUserCreatedDate()) . '",
"admin_user_logdate": "' . $escaper->escapeJs($metadata->getCurrentUserLogDate()) . '",
"admin_user_role_name": "' . $escaper->escapeJs($metadata->getCurrentUserRoleName()) . '"
};
var digitalData = {
"nonce": "' . $nonce . '"
};
var cspNonce = "' . $nonce . '";
';
?>
<?= /* @noEscape */ $secureRenderer->renderTag('script', [], $scriptString, false); ?>
24 changes: 13 additions & 11 deletions app/code/Magento/AdminNotification/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
{
"name": "magento/module-admin-notification",
"description": "N/A",
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"config": {
"sort-packages": true
},
"version": "100.4.5",
"require": {
"php": "~8.1.0||~8.2.0",
"lib-libxml": "*",
"magento/framework": "*",
"magento/module-backend": "*",
"magento/module-media-storage": "*",
"magento/module-store": "*",
"magento/module-ui": "*",
"magento/module-config": "*"
"magento/framework": "103.0.*",
"magento/module-backend": "102.0.*",
"magento/module-media-storage": "100.4.*",
"magento/module-store": "101.1.*",
"magento/module-ui": "101.2.*",
"magento/module-config": "101.2.*"
},
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": {
"files": [
"registration.php"
Expand All @@ -28,3 +29,4 @@
}
}
}

30 changes: 16 additions & 14 deletions app/code/Magento/AdvancedPricingImportExport/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,26 +1,27 @@
{
"name": "magento/module-advanced-pricing-import-export",
"description": "N/A",
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"config": {
"sort-packages": true
},
"version": "100.4.6",
"require": {
"php": "~8.1.0||~8.2.0",
"magento/framework": "*",
"magento/module-catalog": "*",
"magento/module-catalog-import-export": "*",
"magento/module-catalog-inventory": "*",
"magento/module-customer": "*",
"magento/module-eav": "*",
"magento/module-import-export": "*",
"magento/module-store": "*",
"magento/module-directory": "*"
"magento/framework": "103.0.*",
"magento/module-catalog": "104.0.*",
"magento/module-catalog-import-export": "101.1.*",
"magento/module-catalog-inventory": "100.4.*",
"magento/module-customer": "103.0.*",
"magento/module-eav": "102.1.*",
"magento/module-import-export": "101.0.*",
"magento/module-store": "101.1.*",
"magento/module-directory": "100.4.*"
},
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": {
"files": [
"registration.php"
Expand All @@ -30,3 +31,4 @@
}
}
}

28 changes: 15 additions & 13 deletions app/code/Magento/AdvancedSearch/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
{
"name": "magento/module-advanced-search",
"description": "N/A",
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"config": {
"sort-packages": true
},
"version": "100.4.4",
"require": {
"magento/framework": "*",
"magento/module-backend": "*",
"magento/module-catalog": "*",
"magento/module-catalog-search": "*",
"magento/module-config": "*",
"magento/module-customer": "*",
"magento/module-search": "*",
"magento/module-store": "*",
"magento/framework": "103.0.*",
"magento/module-backend": "102.0.*",
"magento/module-catalog": "104.0.*",
"magento/module-catalog-search": "102.0.*",
"magento/module-config": "101.2.*",
"magento/module-customer": "103.0.*",
"magento/module-search": "101.1.*",
"magento/module-store": "101.1.*",
"php": "~8.1.0||~8.2.0"
},
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": {
"files": [
"registration.php"
Expand All @@ -29,3 +30,4 @@
}
}
}

18 changes: 10 additions & 8 deletions app/code/Magento/Amqp/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
{
"name": "magento/module-amqp",
"description": "N/A",
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"config": {
"sort-packages": true
},
"version": "100.4.3",
"require": {
"magento/framework": "*",
"magento/framework-amqp": "*",
"magento/framework-message-queue": "*",
"magento/framework": "103.0.*",
"magento/framework-amqp": "100.4.*",
"magento/framework-message-queue": "100.4.*",
"php": "~8.1.0||~8.2.0"
},
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"autoload": {
"files": [
"registration.php"
Expand All @@ -24,3 +25,4 @@
}
}
}

2 changes: 1 addition & 1 deletion app/code/Magento/Analytics/Test/Mftf/Test/AdminConfigurationPermissionTest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<click selector="{{AdminUserGridSection.searchResultFirstRow}}" stepKey="clickFoundUsername"/>
<waitForPageLoad time="30" stepKey="wait2"/>
<seeInField selector="{{AdminEditUserSection.usernameTextField}}" userInput="$$noReportUser.username$$" stepKey="seeUsernameInField"/>
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_ENV.MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
<fillField selector="{{AdminEditUserSection.currentPasswordField}}" userInput="{{_CREDS.magento/MAGENTO_ADMIN_PASSWORD}}" stepKey="fillCurrentPassword"/>
<scrollToTopOfPage stepKey="scrollToTopOfPage"/>

<click selector="{{AdminEditUserSection.userRoleTab}}" stepKey="clickUserRoleTab"/>
Expand Down
18 changes: 10 additions & 8 deletions app/code/Magento/Analytics/composer.json
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
{
"name": "magento/module-analytics",
"description": "N/A",
"require": {
"php": "~8.1.0||~8.2.0",
"magento/module-backend": "*",
"magento/module-config": "*",
"magento/module-integration": "*",
"magento/module-store": "*",
"magento/framework": "*"
},
"type": "magento2-module",
"license": [
"OSL-3.0",
"AFL-3.0"
],
"version": "100.4.6-p4",
"require": {
"php": "~8.1.0||~8.2.0",
"magento/module-backend": "102.0.*",
"magento/module-config": "101.2.*",
"magento/module-integration": "100.4.*",
"magento/module-store": "101.1.*",
"magento/framework": "103.0.*"
},
"autoload": {
"files": [
"registration.php"
Expand All @@ -23,3 +24,4 @@
}
}
}

Loading

0 comments on commit c5c5388

Please sign in to comment.