Skip to content

Commit 5bad2d1

Browse files
YomesIncconst-cloudinary
authored andcommitted
Detect data URLs with suffix in mime type
1 parent bafaf4a commit 5bad2d1

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/cloudinary/utils.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ class Cloudinary::Utils
139139
zoom
140140
].map(&:to_sym)
141141

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

144144
def self.extract_config_params(options)
145145
options.select{|k,v| URL_KEYS.include?(k)}

spec/utils_methods_spec.rb

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
"s3://s3-us-west-2.amazonaws.com/cloudinary/images/old_logo.png",
6060
"gs://cloudinary/images/old_logo.png",
6161
"data:image/gif;charset=utf8;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
62-
"data:image/gif;param1=value1;param2=value2;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7"
62+
"data:image/gif;param1=value1;param2=value2;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7",
63+
"data:image/svg+xml;charset=utf-8;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPg",
6364
].each do |url|
6465
expect(Cloudinary::Utils.is_remote?(url)).to eq(true), url
6566
end

0 commit comments

Comments
 (0)