Merge pull request #605 from cloudinary/fix-is-remote-url-test-regex-…

…on-substring fix: isRemoteUrl check improved to reduce false positives
cloudinary · May 2, 2023 · 5bc9323 · 5bc9323
2 parents f57b1ed + f839798
commit 5bc9323
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/lib-es5/utils/isRemoteUrl.js b/lib-es5/utils/isRemoteUrl.js
@@ -8,7 +8,9 @@ var isString = require('lodash/isString');
  * @returns {boolean} true if the given url is a remote location or data
  */
 function isRemoteUrl(url) {
-  return isString(url) && /^ftp:|^https?:|^gs:|^s3:|^data:/.test(url);
+  var SUBSTRING_LENGTH = 120;
+  var urlSubstring = isString(url) && url.substring(0, SUBSTRING_LENGTH);
+  return isString(url) && /^ftp:|^https?:|^gs:|^s3:|^data:([\w-.]+\/[\w-.]+(\+[\w-.]+)?)?(;[\w-.]+=[\w-.]+)*;base64,([a-zA-Z0-9\/+\n=]+)$/.test(urlSubstring);
 }
 
 module.exports = isRemoteUrl;
diff --git a/lib/utils/isRemoteUrl.js b/lib/utils/isRemoteUrl.js
@@ -6,7 +6,9 @@ const isString = require('lodash/isString');
  * @returns {boolean} true if the given url is a remote location or data
  */
 function isRemoteUrl(url) {
-  return isString(url) && /^ftp:|^https?:|^gs:|^s3:|^data:/.test(url);
+  const SUBSTRING_LENGTH = 120;
+  const urlSubstring = isString(url) && url.substring(0, SUBSTRING_LENGTH);
+  return isString(url) && /^ftp:|^https?:|^gs:|^s3:|^data:([\w-.]+\/[\w-.]+(\+[\w-.]+)?)?(;[\w-.]+=[\w-.]+)*;base64,([a-zA-Z0-9\/+\n=]+)$/.test(urlSubstring);
 }
 
 module.exports = isRemoteUrl;