Skip to content

Commit d36b7dc

Browse files
Fix detection of base64 encoded files with complex MIME type
1 parent 184580a commit d36b7dc

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

lib/cloudinary/utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ class Cloudinary::Utils
153153
zoom
154154
].map(&:to_sym)
155155

156-
REMOTE_URL_REGEX = %r(^ftp:|^https?:|^s3:|^gs:|^data:([\w-]+\/[\w-]+(\+[\w-]+)?)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$)
156+
REMOTE_URL_REGEX = %r(^ftp:|^https?:|^s3:|^gs:|^data:([\w-]+\/[\w-]+(\.[\w-]+)*(\+[\w-]+)?)?(;[\w-]+=[\w-]+)*;base64,([a-zA-Z0-9\/+\n=]+)$)
157157

158158
LONG_URL_SIGNATURE_LENGTH = 32
159159
SHORT_URL_SIGNATURE_LENGTH = 8

spec/utils_methods_spec.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"data:image/gif;charset=utf8;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
6262
"data:image/gif;param1=value1;param2=value2;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
6363
"data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPg",
64+
"data:application/vnd.openxmlformats-officedocument.wordprocessingml.document;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPg",
6465
].each do |url|
6566
expect(Cloudinary::Utils.is_remote?(url)).to eq(true), url
6667
end

0 commit comments

Comments
 (0)