Correct base64 validation. Fixes #1055.

hapijs · Dec 5, 2016 · a959139 · a959139
1 parent 99fd222
commit a959139
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/string.js b/lib/string.js
@@ -404,7 +404,7 @@ internals.String = class extends Any {
 
     base64() {
 
-        const regex = /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)?$/;
+        const regex = /^(?:[A-Za-z0-9+\/]{4})*(?:[A-Za-z0-9+\/]{2}==|[A-Za-z0-9+\/]{3}=)$/;
 
         return this._test('base64', regex, function (value, state, options) {
 

diff --git a/test/string.js b/test/string.js
@@ -3153,6 +3153,7 @@ describe('string', () => {
                 ['YW', false, null, '"value" must be a valid base64 string'],
                 ['YW==', true],
                 ['YW5', false, null, '"value" must be a valid base64 string'],
+                ['password', false, null, '"value" must be a valid base64 string'],
                 ['YW5=', true],
                 ['$#%#$^$^)(*&^%', false, null, '"value" must be a valid base64 string']
             ], done);