Skip to content

Commit 83eb1fb

Browse files
xmavxmav
authored
Merge branch '2.4-develop' into AC-252
2 parents 20a3221 + bf4cdad commit 83eb1fb

File tree

7 files changed

+181
-30
lines changed

7 files changed

+181
-30
lines changed

‎app/code/Magento/Paypal/Controller/Payflow/ReturnUrl.php

Lines changed: 38 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@
1818
*/
1919
class ReturnUrl extends Payflow implements CsrfAwareActionInterface, HttpGetActionInterface
2020
{
21+
private const ORDER_INCREMENT_ID = 'INVNUM';
22+
23+
private const SILENT_POST_HASH = 'secure_silent_post_hash';
24+
2125
/**
2226
* @var array of allowed order states on frontend
2327
*/
@@ -63,30 +67,48 @@ public function execute()
6367
$this->_view->loadLayout(false);
6468
/** @var \Magento\Checkout\Block\Onepage\Success $redirectBlock */
6569
$redirectBlock = $this->_view->getLayout()->getBlock($this->_redirectBlockName);
66-
67-
if ($this->_checkoutSession->getLastRealOrderId()) {
68-
/** @var \Magento\Sales\Model\Order $order */
69-
$order = $this->_orderFactory->create()->loadByIncrementId($this->_checkoutSession->getLastRealOrderId());
70-
71-
if ($order->getIncrementId()) {
72-
if ($this->checkOrderState($order)) {
73-
$redirectBlock->setData('goto_success_page', true);
70+
$order = $this->getOrderFromRequest();
71+
if ($order) {
72+
if ($this->checkOrderState($order)) {
73+
$redirectBlock->setData('goto_success_page', true);
74+
} else {
75+
if ($this->checkPaymentMethod($order)) {
76+
$gotoSection = $this->_cancelPayment((string)$this->getRequest()->getParam('RESPMSG'));
77+
$redirectBlock->setData('goto_section', $gotoSection);
78+
$redirectBlock->setData('error_msg', __('Your payment has been declined. Please try again.'));
7479
} else {
75-
if ($this->checkPaymentMethod($order)) {
76-
$gotoSection = $this->_cancelPayment((string)$this->getRequest()->getParam('RESPMSG'));
77-
$redirectBlock->setData('goto_section', $gotoSection);
78-
$redirectBlock->setData('error_msg', __('Your payment has been declined. Please try again.'));
79-
} else {
80-
$redirectBlock->setData('goto_section', false);
81-
$redirectBlock->setData('error_msg', __('Requested payment method does not match with order.'));
82-
}
80+
$redirectBlock->setData('goto_section', false);
81+
$redirectBlock->setData('error_msg', __('Requested payment method does not match with order.'));
8382
}
8483
}
8584
}
8685

8786
$this->_view->renderLayout();
8887
}
8988

89+
/**
90+
* Returns an order from request.
91+
*
92+
* @return Order|null
93+
*/
94+
private function getOrderFromRequest(): ?Order
95+
{
96+
$orderId = $this->getRequest()->getParam(self::ORDER_INCREMENT_ID);
97+
if (!$orderId) {
98+
return null;
99+
}
100+
101+
$order = $this->_orderFactory->create()->loadByIncrementId($orderId);
102+
$storedHash = (string)$order->getPayment()->getAdditionalInformation(self::SILENT_POST_HASH);
103+
$requestHash = (string)$this->getRequest()->getParam('USER2');
104+
if (empty($storedHash) || empty($requestHash) || !hash_equals($storedHash, $requestHash)) {
105+
return null;
106+
}
107+
$this->_checkoutSession->setLastRealOrderId($orderId);
108+
109+
return $order;
110+
}
111+
90112
/**
91113
* Check order state
92114
*

‎app/code/Magento/Paypal/Plugin/TransparentSessionChecker.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ class TransparentSessionChecker
2020
*/
2121
private $disableSessionUrls = [
2222
'paypal/transparent/redirect',
23+
'paypal/payflowadvanced/returnUrl',
24+
'paypal/payflow/returnUrl',
2325
'paypal/hostedpro/return',
2426
];
2527

‎app/code/Magento/Paypal/Test/Unit/Controller/Payflow/ReturnUrlTest.php

Lines changed: 80 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ class ReturnUrlTest extends TestCase
3232
{
3333
const LAST_REAL_ORDER_ID = '000000001';
3434

35+
const SILENT_POST_HASH = 'abcdfg';
36+
3537
/**
3638
* @var ReturnUrl
3739
*/
@@ -142,7 +144,7 @@ protected function setUp(): void
142144

143145
$this->checkoutSession = $this->getMockBuilder(Session::class)
144146
->disableOriginalConstructor()
145-
->setMethods(['getLastRealOrderId', 'getLastRealOrder', 'restoreQuote'])
147+
->setMethods(['setLastRealOrderId', 'getLastRealOrder', 'restoreQuote'])
146148
->getMock();
147149

148150
$this->paymentFailures = $this->getMockBuilder(PaymentFailuresInterface::class)
@@ -177,8 +179,15 @@ public function testExecuteAllowedOrderState($state)
177179
$this->withLayout();
178180
$this->withOrder(self::LAST_REAL_ORDER_ID, $state);
179181

180-
$this->checkoutSession->method('getLastRealOrderId')
181-
->willReturn(self::LAST_REAL_ORDER_ID);
182+
$this->request->method('getParam')
183+
->willReturnMap([
184+
['INVNUM', self::LAST_REAL_ORDER_ID],
185+
['USER2', self::SILENT_POST_HASH],
186+
]);
187+
188+
$this->checkoutSession->expects($this->once())
189+
->method('setLastRealOrderId')
190+
->with(self::LAST_REAL_ORDER_ID);
182191

183192
$this->block->method('setData')
184193
->with('goto_success_page', true)
@@ -202,6 +211,45 @@ public function allowedOrderStateDataProvider()
202211
];
203212
}
204213

214+
/**
215+
* Checks a test case when silent post hash validation fails.
216+
*
217+
* @param string $requestHash
218+
* @param string $orderHash
219+
* @dataProvider invalidHashVariations
220+
*/
221+
public function testFailedHashValidation(string $requestHash, string $orderHash)
222+
{
223+
$this->withLayout();
224+
$this->withOrder(self::LAST_REAL_ORDER_ID, Order::STATE_PROCESSING, $orderHash);
225+
226+
$this->request->method('getParam')
227+
->willReturnMap([
228+
['INVNUM', self::LAST_REAL_ORDER_ID],
229+
['USER2', $requestHash],
230+
]);
231+
232+
$this->checkoutSession->expects($this->never())
233+
->method('setLastRealOrderId')
234+
->with(self::LAST_REAL_ORDER_ID);
235+
236+
$this->returnUrl->execute();
237+
}
238+
239+
/**
240+
* Gets list of allowed order states.
241+
*
242+
* @return array
243+
*/
244+
public function invalidHashVariations()
245+
{
246+
return [
247+
['requestHash' => '', 'orderHash' => self::SILENT_POST_HASH],
248+
['requestHash' => self::SILENT_POST_HASH, 'orderHash' => ''],
249+
['requestHash' => 'abcd', 'orderHash' => 'dcba'],
250+
];
251+
}
252+
205253
/**
206254
* Checks a test case when action processes order with not allowed state.
207255
*
@@ -218,8 +266,11 @@ public function testExecuteNotAllowedOrderState($state, $restoreQuote, $expected
218266
$this->withCheckoutSession(self::LAST_REAL_ORDER_ID, $restoreQuote);
219267

220268
$this->request->method('getParam')
221-
->with('RESPMSG')
222-
->willReturn($errMessage);
269+
->willReturnMap([
270+
['RESPMSG', $errMessage],
271+
['INVNUM', self::LAST_REAL_ORDER_ID],
272+
['USER2', self::SILENT_POST_HASH],
273+
]);
223274

224275
$this->payment->method('getMethod')
225276
->willReturn(Config::METHOD_PAYFLOWLINK);
@@ -261,8 +312,14 @@ public function testCheckRejectByPaymentMethod()
261312
$this->withLayout();
262313
$this->withOrder(self::LAST_REAL_ORDER_ID, Order::STATE_NEW);
263314

264-
$this->checkoutSession->method('getLastRealOrderId')
265-
->willReturn(self::LAST_REAL_ORDER_ID);
315+
$this->checkoutSession->expects($this->once())
316+
->method('setLastRealOrderId')
317+
->with(self::LAST_REAL_ORDER_ID);
318+
$this->request->method('getParam')
319+
->willReturnMap([
320+
['INVNUM', self::LAST_REAL_ORDER_ID],
321+
['USER2', self::SILENT_POST_HASH],
322+
]);
266323

267324
$this->withBlockContent(false, 'Requested payment method does not match with order.');
268325

@@ -285,8 +342,11 @@ public function testCheckXSSEscaped($errorMsg, $errorMsgEscaped)
285342
$this->withCheckoutSession(self::LAST_REAL_ORDER_ID, true);
286343

287344
$this->request->method('getParam')
288-
->with('RESPMSG')
289-
->willReturn($errorMsg);
345+
->willReturnMap([
346+
['RESPMSG', $errorMsg],
347+
['INVNUM', self::LAST_REAL_ORDER_ID],
348+
['USER2', self::SILENT_POST_HASH],
349+
]);
290350

291351
$this->checkoutHelper->method('cancelCurrentOrder')
292352
->with(self::equalTo($errorMsgEscaped));
@@ -323,8 +383,11 @@ public function testCheckAdvancedAcceptingByPaymentMethod()
323383
$this->withCheckoutSession(self::LAST_REAL_ORDER_ID, true);
324384

325385
$this->request->method('getParam')
326-
->with('RESPMSG')
327-
->willReturn('message');
386+
->willReturnMap([
387+
['RESPMSG', 'message'],
388+
['INVNUM', self::LAST_REAL_ORDER_ID],
389+
['USER2', self::SILENT_POST_HASH],
390+
]);
328391

329392
$this->withBlockContent('paymentMethod', 'Your payment has been declined. Please try again.');
330393

@@ -347,9 +410,10 @@ public function testCheckAdvancedAcceptingByPaymentMethod()
347410
*
348411
* @param string $incrementId
349412
* @param string $state
413+
* @param string $hash
350414
* @return void
351415
*/
352-
private function withOrder($incrementId, $state)
416+
private function withOrder($incrementId, $state, $hash = self::SILENT_POST_HASH)
353417
{
354418
$this->orderFactory->method('create')
355419
->willReturn($this->order);
@@ -366,6 +430,8 @@ private function withOrder($incrementId, $state)
366430

367431
$this->order->method('getPayment')
368432
->willReturn($this->payment);
433+
$this->payment->method('getAdditionalInformation')
434+
->willReturn($hash);
369435
}
370436

371437
/**
@@ -390,8 +456,8 @@ private function withLayout()
390456
*/
391457
private function withCheckoutSession($orderId, $restoreQuote)
392458
{
393-
$this->checkoutSession->method('getLastRealOrderId')
394-
->willReturn($orderId);
459+
$this->checkoutSession->method('setLastRealOrderId')
460+
->with($orderId);
395461

396462
$this->checkoutSession->method('getLastRealOrder')
397463
->willReturn($this->order);

‎app/code/Magento/Paypal/etc/csp_whitelist.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,14 @@
3636
<values>
3737
<value id="www_paypal" type="host">www.paypal.com</value>
3838
<value id="www_sandbox_paypal" type="host">www.sandbox.paypal.com</value>
39+
<value id="pilot_payflowlink_paypal_com" type="host">pilot-payflowlink.paypal.com</value>
40+
</values>
41+
</policy>
42+
<policy id="form-action">
43+
<values>
44+
<value id="www_paypal" type="host">www.paypal.com</value>
45+
<value id="www_sandbox_paypal" type="host">www.sandbox.paypal.com</value>
46+
<value id="pilot_payflowlink_paypal_com" type="host">pilot-payflowlink.paypal.com</value>
3947
</values>
4048
</policy>
4149
</policies>

‎app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ define([
7474
if (this.iframeIsLoaded) {
7575
document.getElementById(this.getCode() + '-iframe')
7676
.contentWindow.location.reload();
77+
this.paymentReady(false);
7778
}
7879

7980
this.paymentReady(true);

‎dev/tests/integration/testsuite/Magento/Sales/_files/order_canceled.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
use Magento\Sales\Api\Data\OrderInterfaceFactory;
9+
use Magento\Sales\Model\Order;
10+
use Magento\TestFramework\Helper\Bootstrap;
11+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
12+
use Magento\Sales\Api\OrderManagementInterface;
13+
14+
Resolver::getInstance()->requireDataFixture('Magento/Sales/_files/order.php');
15+
16+
$objectManager = Bootstrap::getObjectManager();
17+
/** @var Order $order */
18+
$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
19+
/** @var OrderManagementInterface $orderManagement */
20+
$orderManagement = $objectManager->create(OrderManagementInterface::class);
21+
$orderManagement->place($order);
22+
$orderManagement->cancel($order->getEntityId());

‎dev/tests/integration/testsuite/Magento/Sales/_files/order_canceled_rollback.php

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
use Magento\Framework\Registry;
9+
use Magento\Sales\Api\Data\OrderInterface;
10+
use Magento\Sales\Api\Data\OrderInterfaceFactory;
11+
use Magento\Sales\Api\OrderRepositoryInterface;
12+
use Magento\TestFramework\Helper\Bootstrap;
13+
use Magento\TestFramework\Workaround\Override\Fixture\Resolver;
14+
15+
$objectManager = Bootstrap::getObjectManager();
16+
/** @var OrderRepositoryInterface $orderRepository */
17+
$orderRepository = $objectManager->get(OrderRepositoryInterface::class);
18+
/** @var OrderInterface $order */
19+
$order = $objectManager->get(OrderInterfaceFactory::class)->create()->loadByIncrementId('100000001');
20+
/** @var Registry $registry */
21+
$registry = $objectManager->get(Registry::class);
22+
$registry->unregister('isSecureArea');
23+
$registry->register('isSecureArea', true);
24+
25+
$orderRepository->delete($order);
26+
27+
$registry->unregister('isSecureArea');
28+
$registry->register('isSecureArea', false);
29+
30+
Resolver::getInstance()->requireDataFixture('Magento/Catalog/_files/product_simple_rollback.php');

0 commit comments

Comments
 (0)