Now detect invalid padding

Author: Nicholas C. Zakas

encodings/base64/base64.htm

@@ -74,7 +74,9 @@ <h1>Base64 Encoding/Decoding Tests</h1>
 
         _should: {
             error: {
-                testInvalidChar: new Error("Not a base64-encoded string.")
+                testInvalidChar: new Error("Not a base64-encoded string."),
+                testInvalidString: new Error("Not a base64-encoded string."),
+                testMissingPaddingIndicator: new Error("Not a base64-encoded string.")
             }
         },
 
@@ -117,9 +119,14 @@ <h1>Base64 Encoding/Decoding Tests</h1>
         },
 
         testInvalidChar: function(){
-            base64Decode("TWF,JFU");
+            base64Decode("aGF,0Y2g");
+        },
+        
+        testInvalidString: function(){
+            base64Decode("aGF0Y2g==");
         }
 
+        
     }));
 
 

encodings/base64/base64.js

@@ -79,8 +79,11 @@ function base64Encode(text){
  */
 function base64Decode(text){
 
+    //ignore white space
+    text = text.replace(/\s/g,"");
+        
     //first check for any unexpected input
-    if(!(/^[a-z0-9\+\/\s]+\={0,2}$/i.test(text))){
+    if(!(/^[a-z0-9\+\/\s]+\={0,2}$/i.test(text)) | text.length % 4 > 0){
         throw new Error("Not a base64-encoded string.");
     }    
 
@@ -91,7 +94,7 @@ function base64Decode(text){
         result = [];
 
     //remove any whitespace and equals signs
-    text = text.replace(/[\s=]/g, "");
+    text = text.replace(/=/g, "");
 
     //loop over each character
     while(i < text.length){