Fix detection of base64 encoded files with complex MIME type

cloudinary · May 27, 2024 · d36b7dc · d36b7dc
1 parent 184580a
commit d36b7dc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/cloudinary/utils.rb b/lib/cloudinary/utils.rb
@@ -153,7 +153,7 @@ class Cloudinary::Utils
       zoom
   ].map(&:to_sym)
 
-  REMOTE_URL_REGEX = %r(^ftp:|^https?:|^s3:|^gs:|^data:([\w-]+\/[\w-]+(\+[\w-]+)?)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$)
+  REMOTE_URL_REGEX = %r(^ftp:|^https?:|^s3:|^gs:|^data:([\w-]+\/[\w-]+(\.[\w-]+)*(\+[\w-]+)?)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$)
 
   LONG_URL_SIGNATURE_LENGTH = 32
   SHORT_URL_SIGNATURE_LENGTH = 8

diff --git a/spec/utils_methods_spec.rb b/spec/utils_methods_spec.rb
@@ -61,6 +61,7 @@
         "data:image/gif;charset=utf8;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
         "data:image/gif;param1=value1;param2=value2;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
         "data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPg",
+        "data:application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPg",
       ].each do |url|
         expect(Cloudinary::Utils.is_remote?(url)).to eq(true), url
       end