Merge pull request #528 from FatchipRobert/MAG2-302-Masking-data

MAG2-302 - Fixed a data masking bug
PAYONE-GmbH · Feb 7, 2024 · c15511b · c15511b
2 parents 5d6b224 + 6e118e1
commit c15511b
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 1 deletion.
diff --git a/Model/Methods/AmazonPay.php b/Model/Methods/AmazonPay.php
@@ -143,6 +143,7 @@ public function getPaymentSpecificParameters(Order $oOrder)
      */
     protected function handleResponse($aResponse, Order $oOrder, $amount)
     {
+        $aResponse = parent::handleResponse($aResponse, $oOrder, $amount);
         if ($aResponse['status'] == 'ERROR') {
             if (!$this->blIsRetry && $this->checkoutSession->getAmazonRetryAsync() && $aResponse['errorcode'] == 980) {
                 $aResponse = $this->authorizationRequest->sendRequest($this, $oOrder, $amount);

diff --git a/Model/Methods/BNPL/BNPLBase.php b/Model/Methods/BNPL/BNPLBase.php
@@ -275,6 +275,7 @@ public function assignData(DataObject $data)
      */
     protected function handleResponse($aResponse, Order $oOrder, $amount)
     {
+        $aResponse = parent::handleResponse($aResponse, $oOrder, $amount);
         if (isset($aResponse['status']) && $aResponse['status'] == 'ERROR' && isset($aResponse['errorcode']) && $aResponse['errorcode'] == '307') {
             $aBans = $this->checkoutSession->getPayonePaymentBans();
             if (empty($aBans)) {

diff --git a/Model/Methods/Barzahlen.php b/Model/Methods/Barzahlen.php
@@ -69,6 +69,7 @@ public function getAuthorizationMode()
      */
     protected function handleResponse($aResponse, Order $oOrder, $amount)
     {
+        $aResponse = parent::handleResponse($aResponse, $oOrder, $amount);
         if (isset($aResponse['status']) && $aResponse['status'] == 'APPROVED' && isset($aResponse['add_paydata[instruction_notes]'])) {
             $sInstructionNotes = urldecode($aResponse['add_paydata[instruction_notes]']);
             $this->checkoutSession->setPayoneInstructionNotes($sInstructionNotes);

diff --git a/Model/Methods/Ratepay/RatepayBase.php b/Model/Methods/Ratepay/RatepayBase.php
@@ -274,6 +274,7 @@ public function isAvailable(\Magento\Quote\Api\Data\CartInterface $quote = null)
      */
     protected function handleResponse($aResponse, Order $oOrder, $amount)
     {
+        $aResponse = parent::handleResponse($aResponse, $oOrder, $amount);
         $this->checkoutSession->unsPayoneRatepayDeviceFingerprintToken();
         if (isset($aResponse['status']) && $aResponse['status'] == 'ERROR'
             && isset($aResponse['errorcode']) && $aResponse['errorcode'] == '307'

diff --git a/Model/Methods/SafeInvoice.php b/Model/Methods/SafeInvoice.php
@@ -195,6 +195,7 @@ public function assignData(DataObject $data)
      */
     protected function handleResponse($aResponse, Order $oOrder, $amount)
     {
+        $aResponse = parent::handleResponse($aResponse, $oOrder, $amount);
         if (isset($aResponse['status']) && $aResponse['status'] == 'ERROR'
             && isset($aResponse['errorcode']) && $aResponse['errorcode'] == '351'
         ) {

diff --git a/Model/ResourceModel/TransactionStatus.php b/Model/ResourceModel/TransactionStatus.php
@@ -139,7 +139,12 @@ public function addTransactionLogEntry($aRequest, Order $oOrder = null, $blHasBe
     {
         $this->setRequest($aRequest);
 
-        $sRawStatus = serialize($this->getRequest());
+        $aRequestForLog = $this->getRequest();
+        if (!empty($aRequestForLog['customer_iban'])) {
+            $aRequestForLog['customer_iban'] = $this->toolkitHelper->maskIban($aRequestForLog['customer_iban']);
+        }
+
+        $sRawStatus = serialize($aRequestForLog);
         if (!$this->toolkitHelper->isUTF8($sRawStatus)) {
             $sRawStatus = mb_convert_encoding($sRawStatus, 'UTF-8'); // needed for serializing the array
         }

diff --git a/Test/Unit/Model/Methods/AmazonPayTest.php b/Test/Unit/Model/Methods/AmazonPayTest.php
@@ -37,6 +37,7 @@
 use Magento\Payment\Model\Info;
 use Payone\Core\Model\Api\Request\Authorization;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Sales\Model\Order\Payment;
 
 class AmazonPayTest extends BaseTestCase
 {
@@ -156,8 +157,12 @@ public function testAuthorize()
         $store = $this->getMockBuilder(Store::class)->disableOriginalConstructor()->getMock();
         $store->method('getCode')->willReturn('test');
 
+        $payment = $this->getMockBuilder(Payment::class)->disableOriginalConstructor()->getMock();
+        $payment->method('getAdditionalInformation')->willReturn([]);
+
         $order = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
         $order->method('getStore')->willReturn($store);
+        $order->method('getPayment')->willReturn($payment);
 
         $paymentInfo = $this->getMockBuilder(Info::class)->disableOriginalConstructor()->setMethods(['getOrder'])->getMock();
         $paymentInfo->method('getOrder')->willReturn($order);

diff --git a/Test/Unit/Model/Methods/BarzahlenTest.php b/Test/Unit/Model/Methods/BarzahlenTest.php
@@ -35,6 +35,7 @@
 use Magento\Payment\Model\Info;
 use Payone\Core\Test\Unit\BaseTestCase;
 use Payone\Core\Test\Unit\PayoneObjectManager;
+use Magento\Sales\Model\Order\Payment;
 
 class BarzahlenTest extends BaseTestCase
 {
@@ -85,8 +86,12 @@ public function testAuthorize()
         $store = $this->getMockBuilder(Store::class)->disableOriginalConstructor()->getMock();
         $store->method('getCode')->willReturn('test');
 
+        $payment = $this->getMockBuilder(Payment::class)->disableOriginalConstructor()->getMock();
+        $payment->method('getAdditionalInformation')->willReturn([]);
+
         $order = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
         $order->method('getStore')->willReturn($store);
+        $order->method('getPayment')->willReturn($payment);
 
         $paymentInfo = $this->getMockBuilder(Info::class)->disableOriginalConstructor()->setMethods(['getOrder'])->getMock();
         $paymentInfo->method('getOrder')->willReturn($order);

diff --git a/Test/Unit/Model/Methods/SafeInvoiceTest.php b/Test/Unit/Model/Methods/SafeInvoiceTest.php
@@ -39,6 +39,7 @@
 use Magento\Quote\Model\Quote\Address;
 use Payone\Core\Model\Api\Request\Authorization;
 use Magento\Payment\Model\Info;
+use Magento\Sales\Model\Order\Payment;
 
 class SafeInvoiceTest extends BaseTestCase
 {
@@ -102,9 +103,13 @@ public function testAuthorizeRegistered()
         $store = $this->getMockBuilder(Store::class)->disableOriginalConstructor()->getMock();
         $store->method('getCode')->willReturn('test');
 
+        $payment = $this->getMockBuilder(Payment::class)->disableOriginalConstructor()->getMock();
+        $payment->method('getAdditionalInformation')->willReturn([]);
+
         $order = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
         $order->method('getCustomerId')->willReturn('5');
         $order->method('getStore')->willReturn($store);
+        $order->method('getPayment')->willReturn($payment);
 
         $paymentInfo = $this->getMockBuilder(Info::class)->disableOriginalConstructor()->setMethods(['getOrder'])->getMock();
         $paymentInfo->method('getOrder')->willReturn($order);
@@ -121,9 +126,13 @@ public function testAuthorizeGuest()
         $store = $this->getMockBuilder(Store::class)->disableOriginalConstructor()->getMock();
         $store->method('getCode')->willReturn('test');
 
+        $payment = $this->getMockBuilder(Payment::class)->disableOriginalConstructor()->getMock();
+        $payment->method('getAdditionalInformation')->willReturn([]);
+
         $order = $this->getMockBuilder(Order::class)->disableOriginalConstructor()->getMock();
         $order->method('getCustomerId')->willReturn(null);
         $order->method('getStore')->willReturn($store);
+        $order->method('getPayment')->willReturn($payment);
 
         $paymentInfo = $this->getMockBuilder(Info::class)->disableOriginalConstructor()->setMethods(['getOrder'])->getMock();
         $paymentInfo->method('getOrder')->willReturn($order);