AC-8017 system settings improvement

Author: sreenia806

app/code/Magento/EncryptionKey/Model/ResourceModel/Key/Change.php

@@ -120,10 +120,8 @@ public function changeEncryptionKey($key = null)
         }
 
         if (null === $key) {
-            $key = $this->random->getRandomBytes(
-                ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE,
-                ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX
-            );
+            $key = ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX .
+                $this->random->getRandomBytes(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
         }
         $this->encryptor->setNewKey($key);
 

lib/internal/Magento/Framework/Encryption/Encryptor.php

@@ -611,7 +611,7 @@ private function getArgonHash(
      */
     private function decodeKey(string $key)
     {
-        return (strpos($key, ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX) === 0) ?
+        return (str_starts_with($key, ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX)) ?
             base64_decode(substr($key, strlen(ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX))) :
             $key;
     }

lib/internal/Magento/Framework/Encryption/KeyValidator.php

@@ -25,8 +25,9 @@ class KeyValidator
      */
     public function isValid($value) : bool
     {
-        if (strpos($value, ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX) === 0) {
-            return (bool)$value;
+        if (str_starts_with($value, ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX)) {
+            return (bool)$value
+                && preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $value);
         } else {
             return $value
                 && strlen($value) === ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE

lib/internal/Magento/Framework/Math/Random.php

@@ -89,12 +89,11 @@ public function getUniqueHash($prefix = '')
      * Generate a base64 encoded binary string.
      *
      * @param int $length
-     * @param string $prefix
      * @return string
      * @throws Exception
      */
-    public function getRandomBytes($length, $prefix = '')
+    public function getRandomBytes($length)
     {
-        return $prefix . base64_encode(random_bytes($length));
+        return base64_encode(random_bytes($length));
     }
 }

setup/src/Magento/Setup/Model/CryptKeyGenerator.php

@@ -48,6 +48,7 @@ public function generate()
      */
     private function getRandomString()
     {
-        return $this->random->getRandomString(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
+        return ConfigOptionsListConstants::STORE_KEY_ENCODED_RANDOM_STRING_PREFIX .
+            $this->random->getRandomBytes(ConfigOptionsListConstants::STORE_KEY_RANDOM_STRING_SIZE);
     }
 }

setup/src/Magento/Setup/Test/Unit/Model/CryptKeyGeneratorTest.php

@@ -40,7 +40,7 @@ public function testStringForHashingIsReadFromRandom()
     {
         $this->randomMock
             ->expects($this->once())
-            ->method('getRandomString')
+            ->method('getRandomBytes')
             ->willReturn('');
 
         $this->cryptKeyGenerator->generate();