forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #20 from magento/2.3-develop
Latest 2.3 develop
- Loading branch information
Showing
310 changed files
with
5,553 additions
and
2,281 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
180 changes: 180 additions & 0 deletions
180
app/code/Magento/Backend/App/Request/BackendValidator.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,180 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\Backend\App\Request; | ||
|
|
||
| use Magento\Backend\App\AbstractAction; | ||
| use Magento\Framework\App\ActionInterface; | ||
| use Magento\Framework\App\CsrfAwareActionInterface; | ||
| use Magento\Framework\App\Request\InvalidRequestException; | ||
| use Magento\Framework\App\Request\ValidatorInterface; | ||
| use Magento\Framework\App\RequestInterface; | ||
| use Magento\Backend\Model\Auth; | ||
| use Magento\Framework\App\Request\Http as HttpRequest; | ||
| use Magento\Framework\Controller\Result\RawFactory; | ||
| use Magento\Framework\Controller\Result\Raw as RawResult; | ||
| use Magento\Framework\Controller\Result\RedirectFactory; | ||
| use Magento\Framework\Data\Form\FormKey\Validator as FormKeyValidator; | ||
| use Magento\Backend\Model\UrlInterface as BackendUrl; | ||
| use Magento\Framework\Phrase; | ||
|
|
||
| /** | ||
| * Do backend validations. | ||
| * | ||
| * @SuppressWarnings(PHPMD.CouplingBetweenObjects) | ||
| */ | ||
| class BackendValidator implements ValidatorInterface | ||
| { | ||
| /** | ||
| * @var Auth | ||
| */ | ||
| private $auth; | ||
|
|
||
| /** | ||
| * @var FormKeyValidator | ||
| */ | ||
| private $formKeyValidator; | ||
|
|
||
| /** | ||
| * @var BackendUrl | ||
| */ | ||
| private $backendUrl; | ||
|
|
||
| /** | ||
| * @var RedirectFactory | ||
| */ | ||
| private $redirectFactory; | ||
|
|
||
| /** | ||
| * @var RawFactory | ||
| */ | ||
| private $rawResultFactory; | ||
|
|
||
| /** | ||
| * @param Auth $auth | ||
| * @param FormKeyValidator $formKeyValidator | ||
| * @param BackendUrl $backendUrl | ||
| * @param RedirectFactory $redirectFactory | ||
| * @param RawFactory $rawResultFactory | ||
| */ | ||
| public function __construct( | ||
| Auth $auth, | ||
| FormKeyValidator $formKeyValidator, | ||
| BackendUrl $backendUrl, | ||
| RedirectFactory $redirectFactory, | ||
| RawFactory $rawResultFactory | ||
| ) { | ||
| $this->auth = $auth; | ||
| $this->formKeyValidator = $formKeyValidator; | ||
| $this->backendUrl = $backendUrl; | ||
| $this->redirectFactory = $redirectFactory; | ||
| $this->rawResultFactory = $rawResultFactory; | ||
| } | ||
|
|
||
| /** | ||
| * @param RequestInterface $request | ||
| * @param ActionInterface $action | ||
| * | ||
| * @return bool | ||
| */ | ||
| private function validateRequest( | ||
| RequestInterface $request, | ||
| ActionInterface $action | ||
| ): bool { | ||
| /** @var bool|null $valid */ | ||
| $valid = null; | ||
|
|
||
| if ($action instanceof CsrfAwareActionInterface) { | ||
| $valid = $action->validateForCsrf($request); | ||
| } | ||
|
|
||
| if ($valid === null) { | ||
| $validFormKey = true; | ||
| $validSecretKey = true; | ||
| if ($request instanceof HttpRequest && $request->isPost()) { | ||
| $validFormKey = $this->formKeyValidator->validate($request); | ||
| } elseif ($this->auth->isLoggedIn() | ||
| && $this->backendUrl->useSecretKey() | ||
| ) { | ||
| $secretKeyValue = (string)$request->getParam( | ||
| BackendUrl::SECRET_KEY_PARAM_NAME, | ||
| null | ||
| ); | ||
| $secretKey = $this->backendUrl->getSecretKey(); | ||
| $validSecretKey = ($secretKeyValue === $secretKey); | ||
| } | ||
| $valid = $validFormKey && $validSecretKey; | ||
| } | ||
|
|
||
| return $valid; | ||
| } | ||
|
|
||
| /** | ||
| * @param RequestInterface $request | ||
| * @param ActionInterface $action | ||
| * | ||
| * @return InvalidRequestException | ||
| */ | ||
| private function createException( | ||
| RequestInterface $request, | ||
| ActionInterface $action | ||
| ): InvalidRequestException { | ||
| /** @var InvalidRequestException|null $exception */ | ||
| $exception = null; | ||
|
|
||
| if ($action instanceof CsrfAwareActionInterface) { | ||
| $exception = $action->createCsrfValidationException($request); | ||
| } | ||
|
|
||
| if ($exception === null) { | ||
| if ($request instanceof HttpRequest && $request->isAjax()) { | ||
| //Sending empty response for AJAX request since we don't know | ||
| //the expected response format and it's pointless to redirect. | ||
| /** @var RawResult $response */ | ||
| $response = $this->rawResultFactory->create(); | ||
| $response->setHttpResponseCode(401); | ||
| $response->setContents(''); | ||
| $exception = new InvalidRequestException($response); | ||
| } else { | ||
| //For regular requests. | ||
| $response = $this->redirectFactory->create() | ||
| ->setUrl($this->backendUrl->getStartupPageUrl()); | ||
| $exception = new InvalidRequestException( | ||
| $response, | ||
| [ | ||
| new Phrase( | ||
| 'Invalid security or form key. Please refresh the page.' | ||
| ) | ||
| ] | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| return $exception; | ||
| } | ||
|
|
||
| /** | ||
| * @inheritDoc | ||
| */ | ||
| public function validate( | ||
| RequestInterface $request, | ||
| ActionInterface $action | ||
| ): void { | ||
| if ($action instanceof AbstractAction) { | ||
| //Abstract Action has build-in validation. | ||
| if (!$action->_processUrlKeys()) { | ||
| throw new InvalidRequestException($action->getResponse()); | ||
| } | ||
| } else { | ||
| //Fallback validation. | ||
| if (!$this->validateRequest($request, $action)) { | ||
| throw $this->createException($request, $action); | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
app/code/Magento/Bundle/Test/Mftf/Section/StorefrontCategoryProductSection.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"> | ||
| <section name="StorefrontCategoryProductSection"> | ||
| <element name="priceToByProductId" type="text" selector="div[data-product-id='{{id}}'] .price-to" parameterized="true"/> | ||
| <element name="priceFromByProductId" type="text" selector="div[data-product-id='{{id}}'] .price-from" parameterized="true"/> | ||
| </section> | ||
| </sections> |
17 changes: 17 additions & 0 deletions
17
app/code/Magento/Bundle/Test/Mftf/Section/StorefrontProductInfoMainSection.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| --> | ||
|
|
||
| <sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" | ||
| xsi:noNamespaceSchemaLocation="../../../../../../../dev/tests/acceptance/vendor/magento/magento2-functional-testing-framework/src/Magento/FunctionalTestingFramework/Page/etc/SectionObject.xsd"> | ||
| <section name="StorefrontProductInfoMainSection"> | ||
| <element name="priceFrom" type="text" selector=".product-info-price .price-from"/> | ||
| <element name="priceTo" type="text" selector=".product-info-price .price-to"/> | ||
| <element name="minPrice" type="text" selector="span[data-price-type='minPrice']"/> | ||
| <element name="maxPrice" type="text" selector="span[data-price-type='minPrice']"/> | ||
| </section> | ||
| </sections> |
Oops, something went wrong.