ENGCOM-8229: Module catalog, Attribute Repository code validation regex #29015

Author: sidolov

app/code/Magento/Catalog/Model/Product/Attribute/Repository.php

@@ -7,6 +7,7 @@
 namespace Magento\Catalog\Model\Product\Attribute;
 
 use Magento\Eav\Api\Data\AttributeInterface;
+use Magento\Eav\Model\Entity\Attribute;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\NoSuchEntityException;
 
@@ -218,11 +219,16 @@ public function getCustomAttributesMetadata($dataObjectClassName = null)
      */
     protected function generateCode($label)
     {
-        $code = substr(preg_replace('/[^a-z_0-9]/', '_', $this->filterManager->translitUrl($label)), 0, 30);
+        $code = substr(
+            preg_replace('/[^a-z_0-9]/', '_', $this->filterManager->translitUrl($label)),
+            0,
+            Attribute::ATTRIBUTE_CODE_MAX_LENGTH
+        );
         $validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z][a-z_0-9]{0,29}[a-z0-9]$/']);
         if (!$validatorAttrCode->isValid($code)) {
-            $code = 'attr_' . ($code ?: substr(md5(time()), 0, 8));
+            $code = 'attr_' . ($code ?: substr(hash('sha256', time()), 0, 8));
         }
+
         return $code;
     }
 
@@ -235,7 +241,9 @@ protected function generateCode($label)
      */
     protected function validateCode($code)
     {
-        $validatorAttrCode = new \Zend_Validate_Regex(['pattern' => '/^[a-z][a-z_0-9]{0,30}$/']);
+        $validatorAttrCode = new \Zend_Validate_Regex(
+            ['pattern' => '/^[a-z][a-z_0-9]{0,' . Attribute::ATTRIBUTE_CODE_MAX_LENGTH . '}$/']
+        );
         if (!$validatorAttrCode->isValid($code)) {
             throw InputException::invalidFieldValue('attribute_code', $code);
         }

dev/tests/api-functional/testsuite/Magento/Catalog/Api/ProductAttributeRepositoryTest.php

@@ -87,12 +87,15 @@ public function testGetList()
     }
 
     /**
+     * Test create attribute
+     *
+     * @dataProvider attributeCodeDataProvider
      * @magentoApiDataFixture Magento/Catalog/Model/Product/Attribute/_files/create_attribute_service.php
+     * @param string $attributeCode
      * @return void
      */
-    public function testCreate()
+    public function testCreate(string $attributeCode): void
     {
-        $attributeCode = uniqid('label_attr_code');
         $attribute = $this->createAttribute($attributeCode);
 
         $expectedData = [
@@ -121,6 +124,17 @@ public function testCreate()
         $this->assertEquals('Default Red', $attribute['options'][2]['label']);
     }
 
+    /**
+     * @return array
+     */
+    public function attributeCodeDataProvider(): array
+    {
+        return [
+            [str_repeat('az_7', 15)],
+            [uniqid('label_attr_code')],
+        ];
+    }
+
     /**
      * @magentoApiDataFixture Magento/Catalog/_files/product_attribute.php
      * @return void