Merge pull request #16643 from niden-code/T16642-crypt-padding

changing the mb_strlen to strlen
phalcon · Sep 4, 2024 · 0953f36 · 0953f36
2 parents 9f51d11 + 2a3054d
commit 0953f36
Show file tree

Hide file tree

Showing 9 changed files with 364 additions and 334 deletions.
diff --git a/CHANGELOG-5.0.md b/CHANGELOG-5.0.md
@@ -6,6 +6,16 @@
 
 - Changed `Phalcon\Filter\Validation\Validator\Email` to allow UTF8 in local part. [#16637](https://github.com/phalcon/cphalcon/issues/16637)
 
+### Added
+
+
+### Fixed
+
+- Fixed `Phalcon\Encryption\Crypt` to use `strlen` instead of `mb_strlen` for padding calculations [#16642](https://github.com/phalcon/cphalcon/issues/16642)
+
+### Removed
+
+
 ## [5.8.0](https://github.com/phalcon/cphalcon/releases/tag/v5.8.0) (2024-07-09)
 
 ### Changed

diff --git a/composer.lock b/composer.lock
diff --git a/phalcon/Encryption/Crypt.zep b/phalcon/Encryption/Crypt.zep
@@ -450,7 +450,7 @@ class Crypt implements CryptInterface
             return false;
         }
 
-        return length <= mb_strlen(input);
+        return length <= strlen(input);
     }
 
     /**
@@ -633,7 +633,7 @@ class Crypt implements CryptInterface
             paddingSize = 0;
 
         if true === this->checkIsMode(["cbc", "ecb"], mode) {
-            let paddingSize = blockSize - (mb_strlen(input) % blockSize);
+            let paddingSize = blockSize - (strlen(input) % blockSize);
 
             if paddingSize >= 256 || paddingSize < 0 {
                 throw new Exception(

diff --git a/phalcon/Filter/Validation/Validator/StringLength/Max.zep b/phalcon/Filter/Validation/Validator/StringLength/Max.zep
@@ -86,7 +86,7 @@ class Max extends AbstractValidator
      */
     public function validate(<Validation> validation, var field) -> bool
     {
-        var value, length, maximum, replacePairs, included, result;
+        var failed, included, length, maximum, replacePairs, value;
 
         let value = validation->getValue(field);
         if this->allowEmpty(field, value) {
@@ -115,12 +115,12 @@ class Max extends AbstractValidator
         }
 
         if included {
-            let result = length >= maximum;
+            let failed = length > maximum;
         } else {
-            let result = length > maximum;
+            let failed = length >= maximum;
         }
 
-        if result {
+        if failed {
             let replacePairs = [
                 ":max" : maximum
             ];

diff --git a/phalcon/Filter/Validation/Validator/StringLength/Min.zep b/phalcon/Filter/Validation/Validator/StringLength/Min.zep
@@ -86,7 +86,7 @@ class Min extends AbstractValidator
      */
     public function validate(<Validation> validation, var field) -> bool
     {
-        var value, length, minimum, replacePairs, included, result;
+        var failed, included, length, minimum, replacePairs, value;
 
         let value = validation->getValue(field);
         if this->allowEmpty(field, value) {
@@ -115,12 +115,12 @@ class Min extends AbstractValidator
         }
 
         if included {
-            let result = length <= minimum;
+            let failed = length < minimum;
         } else {
-            let result = length < minimum;
+            let failed = length <= minimum;
         }
 
-        if result {
+        if failed {
             let replacePairs = [
                 ":min"   : minimum
             ];

diff --git a/tests/integration/Filter/Validation/Validator/Callback/ValidateCest.php b/tests/integration/Filter/Validation/Validator/Callback/ValidateCest.php
@@ -146,7 +146,7 @@ public function filterValidationValidatorCallbackValidateSingleFieldValidator(In
 
         $messages = $validation->validate(
             [
-                'user'  => 'user',
+                'user'  => '12345',
                 'admin' => null,
             ]
         );

diff --git a/tests/integration/Filter/Validation/Validator/StringLength/Max/ValidateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Max/ValidateCest.php
@@ -72,26 +72,23 @@ public function filterValidationValidatorMaxStringLengthValidateSingleField(Inte
 
         $messages = $validation->validate(
             [
-                'name' => 'SomeValue',
+                'name' => '12345678',
             ]
         );
 
-        $I->assertSame(
-            0,
-            $messages->count()
-        );
-
+        $expected = 0;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
 
         $messages = $validation->validate(
             [
-                'name' => 'SomeValue123',
+                'name' => '123456789',
             ]
         );
 
-        $I->assertSame(
-            1,
-            $messages->count()
-        );
+        $expected = 1;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
     }
 
     /**
@@ -120,36 +117,32 @@ public function filterValidationValidatorMaxOrEqualStringLengthValidateSingleFie
 
         $messages = $validation->validate(
             [
-                'name' => 'short',
+                'name' => '12345',
             ]
         );
 
-        $I->assertSame(
-            0,
-            $messages->count()
-        );
+        $expected = 0;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
 
         $messages = $validation->validate(
             [
-                'name' => 'SomeValue',
+                'name' => '1234567890',
             ]
         );
 
-        $I->assertSame(
-            1,
-            $messages->count()
-        );
-
+        $expected = 1;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
 
         $messages = $validation->validate(
             [
                 'name' => 'SomeValue123',
             ]
         );
 
-        $I->assertSame(
-            1,
-            $messages->count()
-        );
+        $expected = 1;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
     }
 }
diff --git a/tests/integration/Filter/Validation/Validator/StringLength/Min/ValidateCest.php b/tests/integration/Filter/Validation/Validator/StringLength/Min/ValidateCest.php
@@ -43,8 +43,8 @@ public function filterValidationValidatorMinValidateEmpty(IntegrationTester $I)
         $entity->name = '';
 
         $validation->bind($entity, []);
-        $result = $validator->validate($validation, 'name');
-        $I->assertTrue($result);
+        $actual = $validator->validate($validation, 'name');
+        $I->assertTrue($actual);
     }
 
     /**
@@ -69,29 +69,26 @@ public function filterValidationValidatorMinStringLengthValidateSingleField(Inte
             )
         );
 
-
         $messages = $validation->validate(
             [
-                'name' => 'SomeValue',
+                'name' => '1234567890',
             ]
         );
 
-        $I->assertSame(
-            0,
-            $messages->count()
-        );
+        $expected = 0;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
 
 
         $messages = $validation->validate(
             [
-                'name' => 'SomeValue123',
+                'name' => '123456789',
             ]
         );
 
-        $I->assertSame(
-            0,
-            $messages->count()
-        );
+        $expected = 1;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
     }
 
     /**
@@ -120,25 +117,23 @@ public function filterValidationValidatorMinOrEqualStringLengthValidateSingleFie
 
         $messages = $validation->validate(
             [
-                'name' => 'SomeValue',
+                'name' => '12345678',
             ]
         );
 
-        $I->assertSame(
-            1,
-            $messages->count()
-        );
+        $expected = 1;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
 
 
         $messages = $validation->validate(
             [
-                'name' => 'SomeValue123',
+                'name' => '1234567890',
             ]
         );
 
-        $I->assertSame(
-            0,
-            $messages->count()
-        );
+        $expected = 0;
+        $actual   = $messages->count();
+        $I->assertSame($expected, $actual);
     }
 }