updated safe base64 to all url generation (#477)

Author: strausr

lib-es5/utils/encoding/base64EncodeURL.js

@@ -10,7 +10,9 @@ function base64EncodeURL(sourceUrl) {
     // ignore errors
   }
   sourceUrl = encodeURI(sourceUrl);
-  return base64Encode(sourceUrl);
+  return base64Encode(sourceUrl).replace(/\+/g, '-') // Convert '+' to '-'
+  .replace(/\//g, '_') // Convert '/' to '_'
+  .replace(/=+$/, ''); // Remove ending '=';
 }
 
 module.exports.base64EncodeURL = base64EncodeURL;

lib-es5/utils/index.js

@@ -173,9 +173,8 @@ function process_custom_function(customFunction) {
     return customFunction;
   }
   if (customFunction.function_type === "remote") {
-    var encodedSource = base64EncodeURL(customFunction.source).replace(/\+/g, '-') // Convert '+' to '-'
-    .replace(/\//g, '_') // Convert '/' to '_'
-    .replace(/=+$/, ''); // Remove ending '='
+    var encodedSource = base64EncodeURL(customFunction.source);
+
     return [customFunction.function_type, encodedSource].join(":");
   }
   return [customFunction.function_type, customFunction.source].join(":");

lib/utils/encoding/base64EncodeURL.js

@@ -7,7 +7,10 @@ function base64EncodeURL(sourceUrl) {
     // ignore errors
   }
   sourceUrl = encodeURI(sourceUrl);
-  return base64Encode(sourceUrl);
+  return base64Encode(sourceUrl)
+    .replace(/\+/g, '-') // Convert '+' to '-'
+    .replace(/\//g, '_') // Convert '/' to '_'
+    .replace(/=+$/, ''); // Remove ending '=';
 }
 
 

lib/utils/index.js

@@ -156,10 +156,8 @@ function process_custom_function(customFunction) {
     return customFunction;
   }
   if (customFunction.function_type === "remote") {
-    const encodedSource = base64EncodeURL(customFunction.source)
-      .replace(/\+/g, '-') // Convert '+' to '-'
-      .replace(/\//g, '_') // Convert '/' to '_'
-      .replace(/=+$/, ''); // Remove ending '='
+    const encodedSource = base64EncodeURL(customFunction.source);
+
     return [customFunction.function_type, encodedSource].join(":");
   }
   return [customFunction.function_type, customFunction.source].join(":");

test/integration/api/uploader/uploader_spec.js

@@ -100,6 +100,8 @@ describe("uploader", function () {
     });
   });
 
+
+
   it("should successfully override original_filename", function () {
     return cloudinary.v2.uploader.upload("http://cloudinary.com/images/old_logo.png", {
       filename_override: 'overridden'
@@ -117,6 +119,17 @@ describe("uploader", function () {
     });
   });
 
+  it('should allow upload with url safe base64 in overlay', function () {
+    const overlayUrl = 'https://res.cloudinary.com/demo/image/upload/logos/cloudinary_full_logo_white_small.png';
+    const baseImageUrl ='http://cloudinary.com/images/old_logo.png';
+
+    const options = {transformation: {overlay: { url: overlayUrl }}};
+    return cloudinary.v2.uploader.upload(baseImageUrl, options)
+      .then((result) => {
+        expect(result).to.have.key("created_at");
+      });
+  });
+
   describe("remote urls ", function () {
     const mocked = helper.mockTest();
     it("should send s3:// URLs to server", function () {

test/utils/utils_spec.js

@@ -759,18 +759,18 @@ describe("utils", function () {
             resource_type: "fetch",
             url: "http://cloudinary.com/images/old_logo.png"
           },
-          "fetch:aHR0cDovL2Nsb3VkaW5hcnkuY29tL2ltYWdlcy9vbGRfbG9nby5wbmc="
+          "fetch:aHR0cDovL2Nsb3VkaW5hcnkuY29tL2ltYWdlcy9vbGRfbG9nby5wbmc"
         ],
         [
           "fetch remote UTF",
           {
             url: "https://upload.wikimedia.org/wikipedia/commons/2/2b/고창갯벌.jpg"
           },
-          "fetch:aHR0cHM6Ly91cGxvYWQud2lraW1lZGlhLm9yZy93aWtpcGVkaWEvY29tbW9ucy8yLzJiLyVFQSVCMyVBMCVFQyVCMCVCRCVFQSVCMCVBRiVFQiVCMiU4Qy5qcGc="
+          "fetch:aHR0cHM6Ly91cGxvYWQud2lraW1lZGlhLm9yZy93aWtpcGVkaWEvY29tbW9ucy8yLzJiLyVFQSVCMyVBMCVFQyVCMCVCRCVFQSVCMCVBRiVFQiVCMiU4Qy5qcGc"
         ],
         ["fetch explicit",
           "fetch:http://cloudinary.com/images/old_logo.png",
-          "fetch:aHR0cDovL2Nsb3VkaW5hcnkuY29tL2ltYWdlcy9vbGRfbG9nby5wbmc="]
+          "fetch:aHR0cDovL2Nsb3VkaW5hcnkuY29tL2ltYWdlcy9vbGRfbG9nby5wbmc"]
       ];
       [
         {