More guardians and more unit tests

tsugiproject · Feb 4, 2024 · 7dd1a82 · 7dd1a82
1 parent e066074
commit 7dd1a82
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 0 deletions.
diff --git a/src/Core/LTIX.php b/src/Core/LTIX.php
@@ -153,6 +153,7 @@ public static function launchCheck($needed=self::ALL, $session_object=null,$requ
     public static function encrypt_secret($secret)
     {
         global $CFG;
+        if ( ! is_string($secret) ) return null;
         if ( startsWith($secret,'AES::') ) return $secret;
         $encr = AesOpenSSL::encrypt($secret, $CFG->cookiesecret) ;
         return 'AES::'.$encr;

diff --git a/src/Crypt/AesOpenSSL.php b/src/Crypt/AesOpenSSL.php
@@ -31,9 +31,12 @@ class AesOpenSSL {
    */
   public static function encrypt($plaintext, $password, $nBits=256) {
     $method = "AES-256-CBC";
+    if ( !is_string($plaintext) || ! is_string($password) ) return null;
     $key = hash('sha256', $password, true);
     $iv = openssl_random_pseudo_bytes(16);
 
+    if ( ! is_string($plaintext) || ! is_string($password) ) return null;
+
     $ciphertext = openssl_encrypt($plaintext, $method, $key, OPENSSL_RAW_DATA, $iv);
     $hash = hash_hmac('sha256', $ciphertext . $iv, $key, true);
 
@@ -50,6 +53,8 @@ public static function encrypt($plaintext, $password, $nBits=256) {
    * @return string    decrypted text
    */
   public static function decrypt($ciphertext, $password, $nBits=256) {
+    if ( ! is_string($ciphertext) || ! is_string($password) ) return null;
+
     $method = "AES-256-CBC";
     $ivHashCiphertext = base64_decode($ciphertext);
     $iv = substr($ivHashCiphertext, 0, 16);

diff --git a/tests/Crypt/AesTest.php b/tests/Crypt/AesTest.php
@@ -14,6 +14,26 @@
 
 class AesTest extends \PHPUnit\Framework\TestCase
 {
+    public function testOpenSSLNull() {
+        $pw = 'L0ck it up saf3';
+        $pt = 'pssst ... đon’t tell anyøne!';
+
+        $encr = AesOpenSSL::encrypt(null, $pw) ;
+        $this->assertNull($encr);
+        $encr = AesOpenSSL::encrypt($pt, null) ;
+        $this->assertNull($encr);
+        $encr = AesOpenSSL::encrypt(null, null) ;
+        $this->assertNull($encr);
+
+        $decr = AesOpenSSL::decrypt(null, $pw) ;
+        $this->assertNull($decr);
+        $decr = AesOpenSSL::decrypt($pt, null) ;
+        $this->assertNull($decr);
+        $decr = AesOpenSSL::decrypt(null, null) ;
+        $this->assertNull($decr);
+
+    }
+
     public function testOpenSSL() {
         $pw = 'L0ck it up saf3';
         $pt = 'pssst ... đon’t tell anyøne!';