feat(toBoolean): use regex for false string value (#1081)

Use regex matching so that it converts False or FALSE (strings) to false (boolean) and True or TRUE (strings) to true (boolean). Co-authored-by: Abhisek Pattnaik <[email protected]> closes #1021
validatorjs · Feb 17, 2020 · f92c08b · f92c08b
1 parent 8111e38
commit f92c08b
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/lib/toBoolean.js b/lib/toBoolean.js
@@ -13,10 +13,10 @@ function toBoolean(str, strict) {
   (0, _assertString.default)(str);
 
   if (strict) {
-    return str === '1' || str === 'true';
+    return str === '1' || /^true$/i.test(str);
   }
 
-  return str !== '0' && str !== 'false' && str !== '';
+  return str !== '0' && !/^false$/i.test(str) && str !== '';
 }
 
 module.exports = exports.default;

diff --git a/src/lib/toBoolean.js b/src/lib/toBoolean.js
@@ -3,7 +3,7 @@ import assertString from './util/assertString';
 export default function toBoolean(str, strict) {
   assertString(str);
   if (strict) {
-    return str === '1' || str === 'true';
+    return str === '1' || /^true$/i.test(str);
   }
-  return str !== '0' && str !== 'false' && str !== '';
+  return str !== '0' && !/^false$/i.test(str) && str !== '';
 }
diff --git a/test/sanitizers.js b/test/sanitizers.js
@@ -34,8 +34,13 @@ describe('Sanitizers', () => {
         '': false,
         1: true,
         true: true,
+        True: true,
+        TRUE: true,
         foobar: true,
         '   ': true,
+        false: false,
+        False: false,
+        FALSE: false,
       },
     });
     test({
@@ -46,8 +51,13 @@ describe('Sanitizers', () => {
         '': false,
         1: true,
         true: true,
+        True: true,
+        TRUE: true,
         foobar: false,
         '   ': false,
+        false: false,
+        False: false,
+        FALSE: false,
       },
     });
   });

diff --git a/validator.js b/validator.js
@@ -240,10 +240,10 @@ function toBoolean(str, strict) {
   assertString(str);
 
   if (strict) {
-    return str === '1' || str === 'true';
+    return str === '1' || /^true$/i.test(str);
   }
 
-  return str !== '0' && str !== 'false' && str !== '';
+  return str !== '0' && !/^false$/i.test(str) && str !== '';
 }
 
 function equals(str, comparison) {

diff --git a/validator.min.js b/validator.min.js