security feature ready

Author: m45adiwinata

src/Libraries/Security.php

@@ -38,15 +38,21 @@ class Security
      */
     public static function encrypt(string $plaintext): string
     {
-        $plaintext = hex2bin($plaintext);
-        if (!$plaintext) {
-            throw new \Exception("failed to convert plaintext into bin");
+        $charset = array_merge(
+            range('0', '9'),
+            range('a', 'z'),
+            range('A', 'Z'),
+        );
+        $ivArr = [];
+        for ($i = 0; $i < 16; $i++) {
+            $ivArr[] = $charset[random_int(0,61)];
         }
-        $ecrypted = openssl_encrypt($plaintext, "AES-128-CBC", env('SECURITY_KEY'), OPENSSL_ZERO_PADDING, env('SECURITY_IV_KEY'));
+        $iv = implode('', $ivArr);
+        $ecrypted = openssl_encrypt($plaintext, "AES-128-CBC", env('SECURITY_KEY'), OPENSSL_RAW_DATA, $iv);
         if (!$ecrypted) {
             throw new \Exception("failed to encrypt string");
         }
-        return bin2hex($ecrypted);
+        return bin2hex($iv . $ecrypted);
     }
 
     /**
@@ -59,8 +65,11 @@ public static function encrypt(string $plaintext): string
      */
     public static function decrypt(string $encrypted): string
     {
-        $binpin = hex2bin($encrypted);
-        $decrypted = openssl_decrypt($binpin, "AES-128-CBC", env('SECURITY_KEY'), OPENSSL_ZERO_PADDING, env('SECURITY_IV_KEY'));
+        
+        $ivHex = substr($encrypted,0,32);
+        $iv = hex2bin($ivHex);
+        $encrypted  = substr($encrypted,32);
+        $decrypted = openssl_decrypt(hex2bin($encrypted), "AES-128-CBC", env('SECURITY_KEY'), OPENSSL_RAW_DATA, $iv);
         if (!$decrypted) {
             throw new \Exception("failed to decrypt string");
         }

tests/Libraries/SecurityTest.php

@@ -16,9 +16,27 @@ public function createApplication()
 
     public function testEncrypt1(): void
     {
+        putenv('SECURITY_KEY=123456789ABCDefg');
         $plain = 'beautiful soup';
         $encrypted = Security::encrypt($plain);
         $decrypted = Security::decrypt($encrypted);
         $this->assertEquals($plain, $decrypted);
     }
+
+    public function testDecrypt1(): void
+    {
+        putenv('SECURITY_KEY=0123456789abcdef');
+        $encrypted = '69687168694E496177653970746B6834383021D52B533A55ECBA5BACC753055AD59F65DD091541A32FA262B3116CFDC3';
+        $decrypted = Security::decrypt($encrypted);
+        $this->assertEquals('AES CBC with secure random IV', $decrypted);
+    }
+
+    public function testEncryptError(): void
+    {
+        $this->expectException(\Exception::class);
+        putenv('SECURITY_KEY=0123456789abcd');
+        $x = Security::encrypt('beautiful soup');
+        putenv('SECURITY_KEY=0123456789abcd321');
+        Security::decrypt($x);
+    }
 }