Skip to content

Commit 99f311c

Browse files
arnoudhgzarnoudhgz
committed
Merge remote-tracking branch 'upstream/2.3-develop' into 2.3-develop
2 parents f01227c + fd076ae commit 99f311c

File tree

353 files changed

+5360
-1960
lines changed

Some content is hidden

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

353 files changed

+5360
-1960
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1977,7 +1977,7 @@ Tests:
19771977
* [#686](https://github.com/magento/magento2/issues/686) -- Product save validation errors in the admin don't hide the overlay
19781978
* [#702](https://github.com/magento/magento2/issues/702) -- Base table or view not found
19791979
* [#652](https://github.com/magento/magento2/issues/652) -- Multishipping checkout not to change the Billing address js issue
1980-
* [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to to break the tabs functionality
1980+
* [#648](https://github.com/magento/magento2/issues/648) -- An equal (=) sign in the hash of the product page to break the tabs functionality
19811981
* Service Contracts:
19821982
* Refactored usage of new API of the Customer module
19831983
* Implemented Service Contracts for the Sales module

‎app/code/Magento/Backend/App/AbstractAction.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -205,10 +205,6 @@ private function _moveBlockToContainer(\Magento\Framework\View\Element\AbstractB
205205
*/
206206
public function dispatch(\Magento\Framework\App\RequestInterface $request)
207207
{
208-
if (!$this->_processUrlKeys()) {
209-
return parent::dispatch($request);
210-
}
211-
212208
if ($request->isDispatched() && $request->getActionName() !== 'denied' && !$this->_isAllowed()) {
213209
$this->_response->setStatusHeader(403, '1.1', 'Forbidden');
214210
if (!$this->_auth->isLoggedIn()) {
@@ -252,6 +248,9 @@ protected function _isUrlChecked()
252248
* Check url keys. If non valid - redirect
253249
*
254250
* @return bool
251+
*
252+
* @see \Magento\Backend\App\Request\BackendValidator for default
253+
* request validation.
255254
*/
256255
public function _processUrlKeys()
257256
{

‎app/code/Magento/Backend/App/Request/BackendValidator.php

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,180 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\Backend\App\Request;
10+
11+
use Magento\Backend\App\AbstractAction;
12+
use Magento\Framework\App\ActionInterface;
13+
use Magento\Framework\App\CsrfAwareActionInterface;
14+
use Magento\Framework\App\Request\InvalidRequestException;
15+
use Magento\Framework\App\Request\ValidatorInterface;
16+
use Magento\Framework\App\RequestInterface;
17+
use Magento\Backend\Model\Auth;
18+
use Magento\Framework\App\Request\Http as HttpRequest;
19+
use Magento\Framework\Controller\Result\RawFactory;
20+
use Magento\Framework\Controller\Result\Raw as RawResult;
21+
use Magento\Framework\Controller\Result\RedirectFactory;
22+
use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator;
23+
use Magento\Backend\Model\UrlInterface as BackendUrl;
24+
use Magento\Framework\Phrase;
25+
26+
/**
27+
* Do backend validations.
28+
*
29+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
30+
*/
31+
class BackendValidator implements ValidatorInterface
32+
{
33+
/**
34+
* @var Auth
35+
*/
36+
private $auth;
37+
38+
/**
39+
* @var FormKeyValidator
40+
*/
41+
private $formKeyValidator;
42+
43+
/**
44+
* @var BackendUrl
45+
*/
46+
private $backendUrl;
47+
48+
/**
49+
* @var RedirectFactory
50+
*/
51+
private $redirectFactory;
52+
53+
/**
54+
* @var RawFactory
55+
*/
56+
private $rawResultFactory;
57+
58+
/**
59+
* @param Auth $auth
60+
* @param FormKeyValidator $formKeyValidator
61+
* @param BackendUrl $backendUrl
62+
* @param RedirectFactory $redirectFactory
63+
* @param RawFactory $rawResultFactory
64+
*/
65+
public function __construct(
66+
Auth $auth,
67+
FormKeyValidator $formKeyValidator,
68+
BackendUrl $backendUrl,
69+
RedirectFactory $redirectFactory,
70+
RawFactory $rawResultFactory
71+
) {
72+
$this->auth = $auth;
73+
$this->formKeyValidator = $formKeyValidator;
74+
$this->backendUrl = $backendUrl;
75+
$this->redirectFactory = $redirectFactory;
76+
$this->rawResultFactory = $rawResultFactory;
77+
}
78+
79+
/**
80+
* @param RequestInterface $request
81+
* @param ActionInterface $action
82+
*
83+
* @return bool
84+
*/
85+
private function validateRequest(
86+
RequestInterface $request,
87+
ActionInterface $action
88+
): bool {
89+
/** @var bool|null $valid */
90+
$valid = null;
91+
92+
if ($action instanceof CsrfAwareActionInterface) {
93+
$valid = $action->validateForCsrf($request);
94+
}
95+
96+
if ($valid === null) {
97+
$validFormKey = true;
98+
$validSecretKey = true;
99+
if ($request instanceof HttpRequest && $request->isPost()) {
100+
$validFormKey = $this->formKeyValidator->validate($request);
101+
} elseif ($this->auth->isLoggedIn()
102+
&& $this->backendUrl->useSecretKey()
103+
) {
104+
$secretKeyValue = (string)$request->getParam(
105+
BackendUrl::SECRET_KEY_PARAM_NAME,
106+
null
107+
);
108+
$secretKey = $this->backendUrl->getSecretKey();
109+
$validSecretKey = ($secretKeyValue === $secretKey);
110+
}
111+
$valid = $validFormKey && $validSecretKey;
112+
}
113+
114+
return $valid;
115+
}
116+
117+
/**
118+
* @param RequestInterface $request
119+
* @param ActionInterface $action
120+
*
121+
* @return InvalidRequestException
122+
*/
123+
private function createException(
124+
RequestInterface $request,
125+
ActionInterface $action
126+
): InvalidRequestException {
127+
/** @var InvalidRequestException|null $exception */
128+
$exception = null;
129+
130+
if ($action instanceof CsrfAwareActionInterface) {
131+
$exception = $action->createCsrfValidationException($request);
132+
}
133+
134+
if ($exception === null) {
135+
if ($request instanceof HttpRequest && $request->isAjax()) {
136+
//Sending empty response for AJAX request since we don't know
137+
//the expected response format and it's pointless to redirect.
138+
/** @var RawResult $response */
139+
$response = $this->rawResultFactory->create();
140+
$response->setHttpResponseCode(401);
141+
$response->setContents('');
142+
$exception = new InvalidRequestException($response);
143+
} else {
144+
//For regular requests.
145+
$response = $this->redirectFactory->create()
146+
->setUrl($this->backendUrl->getStartupPageUrl());
147+
$exception = new InvalidRequestException(
148+
$response,
149+
[
150+
new Phrase(
151+
'Invalid security or form key. Please refresh the page.'
152+
)
153+
]
154+
);
155+
}
156+
}
157+
158+
return $exception;
159+
}
160+
161+
/**
162+
* @inheritDoc
163+
*/
164+
public function validate(
165+
RequestInterface $request,
166+
ActionInterface $action
167+
): void {
168+
if ($action instanceof AbstractAction) {
169+
//Abstract Action has build-in validation.
170+
if (!$action->_processUrlKeys()) {
171+
throw new InvalidRequestException($action->getResponse());
172+
}
173+
} else {
174+
//Fallback validation.
175+
if (!$this->validateRequest($request, $action)) {
176+
throw $this->createException($request, $action);
177+
}
178+
}
179+
}
180+
}

‎app/code/Magento/Backend/Block/Dashboard/Bar.php

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ public function getTotals()
3838
*/
3939
public function addTotal($label, $value, $isQuantity = false)
4040
{
41-
/*if (!$isQuantity) {
42-
$value = $this->format($value);
43-
$decimals = substr($value, -2);
44-
$value = substr($value, 0, -2);
45-
} else {
46-
$value = ($value != '')?$value:0;
47-
$decimals = '';
48-
}*/
4941
if (!$isQuantity) {
5042
$value = $this->format($value);
5143
}

‎app/code/Magento/Backend/etc/adminhtml/di.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
<preference for="Magento\Framework\App\DefaultPathInterface" type="Magento\Backend\App\DefaultPath" />
1515
<preference for="Magento\Backend\App\ConfigInterface" type="Magento\Backend\App\Config" />
1616
<preference for="Magento\Framework\App\Response\Http\FileFactory" type="Magento\Backend\App\Response\Http\FileFactory" />
17+
<preference for="Magento\Framework\App\Request\ValidatorInterface"
18+
type="Magento\Backend\App\Request\BackendValidator" />
1719
<type name="Magento\Framework\Stdlib\DateTime\Timezone">
1820
<arguments>
1921
<argument name="scopeType" xsi:type="const">Magento\Framework\App\Config\ScopeConfigInterface::SCOPE_TYPE_DEFAULT</argument>

‎app/code/Magento/Backend/view/adminhtml/templates/page/header.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?= /* @escapeNotVerified */ $edition ?>
1818
class="logo">
1919
<img class="logo-img" src="<?= /* @escapeNotVerified */ $block->getViewFileUrl($logoSrc) ?>"
20-
alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
20+
alt="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>" title="<?= $block->escapeHtml(__('Magento Admin Panel')) ?>"/>
2121
</a>
2222
<?php break; ?>
2323
<?php case 'user': ?>

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/element/gallery.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<?php foreach ($block->getValues()->getAttributeBackend()->getImageTypes() as $type): ?>
3535
<td class="gallery" align="center" style="vertical-align:bottom;">
3636
<a href="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>" target="_blank" onclick="imagePreview('<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>');return false;">
37-
<img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
37+
<img id="<?= $block->getElement()->getHtmlId() ?>_image_<?= /* @escapeNotVerified */ $type ?>_<?= /* @escapeNotVerified */ $image->getValueId() ?>" src="<?= /* @escapeNotVerified */ $image->setType($type)->getSourceUrl() ?>?<?= /* @escapeNotVerified */ time() ?>" alt="<?= /* @escapeNotVerified */ $image->getValue() ?>" title="<?= /* @escapeNotVerified */ $image->getValue() ?>" height="25" class="small-image-preview v-middle"/></a><br/>
3838
<input type="file" name="<?= /* @escapeNotVerified */ $block->getElement()->getName() ?>_<?= /* @escapeNotVerified */ $type ?>[<?= /* @escapeNotVerified */ $image->getValueId() ?>]" size="1"></td>
3939
<?php endforeach; ?>
4040
<td class="gallery" align="center" style="vertical-align:bottom;"><input type="input" name="<?= /* @escapeNotVerified */ $block->getElement()->getParentName() ?>[position][<?= /* @escapeNotVerified */ $image->getValueId() ?>]" value="<?= /* @escapeNotVerified */ $image->getPosition() ?>" id="<?= $block->getElement()->getHtmlId() ?>_position_<?= /* @escapeNotVerified */ $image->getValueId() ?>" size="3"/></td>

‎app/code/Magento/Braintree/view/frontend/web/js/view/payment/method-renderer/paypal.js

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
define([
88
'jquery',
99
'underscore',
10+
'mage/utils/wrapper',
1011
'Magento_Checkout/js/view/payment/default',
1112
'Magento_Braintree/js/view/payment/adapter',
1213
'Magento_Checkout/js/model/quote',
@@ -18,6 +19,7 @@ define([
1819
], function (
1920
$,
2021
_,
22+
wrapper,
2123
Component,
2224
Braintree,
2325
quote,
@@ -218,8 +220,9 @@ define([
218220

219221
/**
220222
* Re-init PayPal Auth Flow
223+
* @param {Function} callback - Optional callback
221224
*/
222-
reInitPayPal: function () {
225+
reInitPayPal: function (callback) {
223226
if (Braintree.checkout) {
224227
Braintree.checkout.teardown(function () {
225228
Braintree.checkout = null;
@@ -228,6 +231,18 @@ define([
228231

229232
this.disableButton();
230233
this.clientConfig.paypal.amount = this.grandTotalAmount;
234+
this.clientConfig.paypal.shippingAddressOverride = this.getShippingAddress();
235+
236+
if (callback) {
237+
this.clientConfig.onReady = wrapper.wrap(
238+
this.clientConfig.onReady,
239+
function (original, checkout) {
240+
this.clientConfig.onReady = original;
241+
original(checkout);
242+
callback();
243+
}.bind(this)
244+
);
245+
}
231246

232247
Braintree.setConfig(this.clientConfig);
233248
Braintree.setup();
@@ -403,15 +418,19 @@ define([
403418
* Triggers when customer click "Continue to PayPal" button
404419
*/
405420
payWithPayPal: function () {
406-
if (additionalValidators.validate()) {
421+
this.reInitPayPal(function () {
422+
if (!additionalValidators.validate()) {
423+
return;
424+
}
425+
407426
try {
408427
Braintree.checkout.paypal.initAuthFlow();
409428
} catch (e) {
410429
this.messageContainer.addErrorMessage({
411430
message: $t('Payment ' + this.getTitle() + ' can\'t be initialized.')
412431
});
413432
}
414-
}
433+
}.bind(this));
415434
},
416435

417436
/**

‎app/code/Magento/Braintree/view/frontend/web/template/payment/paypal.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
data-bind="attr: {'id': getCode()}, value: getCode(), checked: isChecked, click: selectPaymentMethod, visible: isRadioButtonVisible()" />
1313
<label class="label" data-bind="attr: {'for': getCode()}">
1414
<!-- PayPal Logo -->
15-
<img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark')}, title: $t('Acceptance Mark')}"
15+
<img data-bind="attr: {src: getPaymentAcceptanceMarkSrc(), alt: $t('Acceptance Mark'), title: $t('Acceptance Mark')}"
1616
class="payment-icon"/>
1717
<!-- PayPal Logo -->
1818
<span text="getTitle()"></span>

‎app/code/Magento/Bundle/Test/Mftf/Data/BundleLinkData.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/DataGenerator/etc/dataProfileSchema.xsd">
1111
<entity name="ApiBundleLink" type="bundle_link">
1212
<var key="sku" entityKey="sku" entityType="product2"/>
13-
<var key="option_id" entityKey="option_id" entityType="bundle_options"/>
13+
<var key="option_id" entityKey="return" entityType="bundle_option"/>
1414
<var key="sku" entityKey="sku" entityType="product"/>
1515
<data key="qty">1</data>
16-
<data key="is_default">1</data>
16+
<data key="is_default">0</data>
1717
<data key="price">1.11</data>
1818
<data key="price_type">1</data>
1919
<data key="can_change_quantity">1</data>

0 commit comments

Comments
 (0)