Merge pull request #5414 from magento-tsg-csl3/2.3-develop-pr38

[TSG-CSL3] For 2.3 (pr38)

Author: zakdma

app/code/Magento/CatalogImportExport/Model/Import/Product/Validator.php

@@ -10,13 +10,15 @@
 use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
 
 /**
- * Class Validator
+ * Product import model validator
  *
  * @api
  * @since 100.0.2
  */
 class Validator extends AbstractValidator implements RowValidatorInterface
 {
+    private const ERROR_SKU_MARGINAL_WHITESPACES = "Sku contains marginal whitespaces";
+
     /**
      * @var RowValidatorInterface[]|AbstractValidator[]
      */
@@ -72,8 +74,12 @@ protected function textValidation($attrCode, $type)
         $val = $this->string->cleanString($this->_rowData[$attrCode]);
         if ($type == 'text') {
             $valid = $this->string->strlen($val) < Product::DB_MAX_TEXT_LENGTH;
-        } else if ($attrCode == Product::COL_SKU) {
+        } elseif ($attrCode == Product::COL_SKU) {
             $valid = $this->string->strlen($val) <= SKU::SKU_MAX_LENGTH;
+            if ($this->string->strlen($val) !== $this->string->strlen(trim($val))) {
+                $this->_addMessages([self::ERROR_SKU_MARGINAL_WHITESPACES]);
+                return false;
+            }
         } else {
             $valid = $this->string->strlen($val) < Product::DB_MAX_VARCHAR_LENGTH;
         }
@@ -359,5 +365,7 @@ public function init($context)
         foreach ($this->validators as $validator) {
             $validator->init($context);
         }
+
+        return $this;
     }
 }

app/code/Magento/Customer/Model/AccountManagement.php

@@ -1045,10 +1045,10 @@ private function changePasswordForCustomer($customer, $currentPassword, $newPass
         }
         $customerEmail = $customer->getEmail();
         $this->credentialsValidator->checkPasswordDifferentFromEmail($customerEmail, $newPassword);
+        $this->checkPasswordStrength($newPassword);
         $customerSecure = $this->customerRegistry->retrieveSecureData($customer->getId());
         $customerSecure->setRpToken(null);
         $customerSecure->setRpTokenCreatedAt(null);
-        $this->checkPasswordStrength($newPassword);
         $customerSecure->setPasswordHash($this->createPasswordHash($newPassword));
         $this->destroyCustomerSessions($customer->getId());
         $this->disableAddressValidation($customer);
@@ -1630,6 +1630,7 @@ private function getEmailNotification()
      */
     private function destroyCustomerSessions($customerId)
     {
+        $this->sessionManager->regenerateId();
         $sessionLifetime = $this->scopeConfig->getValue(
             \Magento\Framework\Session\Config::XML_PATH_COOKIE_LIFETIME,
             \Magento\Store\Model\ScopeInterface::SCOPE_STORE

app/code/Magento/Customer/Test/Unit/Model/AccountManagementTest.php

@@ -1551,6 +1551,7 @@ public function testChangePassword()
             ->with($customer);
 
         $this->sessionManager->expects($this->atLeastOnce())->method('getSessionId');
+        $this->sessionManager->expects($this->atLeastOnce())->method('regenerateId');
 
         $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
             ->disableOriginalConstructor()
@@ -1628,6 +1629,7 @@ function ($string) {
 
         $this->sessionManager->method('isSessionExists')->willReturn(false);
         $this->sessionManager->expects($this->atLeastOnce())->method('getSessionId');
+        $this->sessionManager->expects($this->atLeastOnce())->method('regenerateId');
         $visitor = $this->getMockBuilder(\Magento\Customer\Model\Visitor::class)
             ->disableOriginalConstructor()
             ->setMethods(['getSessionId'])

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Import/ProductTest.php

@@ -2416,6 +2416,16 @@ public function validateRowDataProvider()
                 'behavior' => Import::BEHAVIOR_REPLACE,
                 'expectedResult' => true,
             ],
+            [
+                'row' => ['sku' => 'sku with whitespace ',
+                    'name' => 'Test',
+                    'product_type' => 'simple',
+                    '_attribute_set' => 'Default',
+                    'price' => 10.20,
+                ],
+                'behavior' => Import::BEHAVIOR_ADD_UPDATE,
+                'expectedResult' => false,
+            ],
         ];
     }