Permalink
Browse files

Merge pull request #9794 from schneems/schneems/email-host

Fix improperly configured host in generated urls
  • Loading branch information...
2 parents bdf1a2e + 334549b commit 730f725509f7c504837510a466bd693551bacb82 @pixeltrix pixeltrix committed Mar 20, 2013
View
@@ -1,5 +1,11 @@
## Rails 4.0.0 (unreleased) ##
+* Allow default url options to accept host with protocol such as `http://`
+
+ config.action_mailer.default_url_options = { host: "http://mydomain.com" }
+
+ *Richard Schneeman*
+
* Ensure that digest authentication responds with a 401 status when a basic
header is received.
@@ -59,8 +59,9 @@ def build_host_url(options)
result = ""
unless options[:only_path]
+ protocol = extract_protocol(options)
unless options[:protocol] == false
- result << (options[:protocol] || "http")
+ result << protocol
result << ":" unless result.match(%r{:|//})
end
result << "//" unless result.match("//")
@@ -83,6 +84,16 @@ def rewrite_authentication(options)
end
end
+ # Extracts protocol http:// or https:// from options[:host]
+ # needs to be called whether the :protocol is being used or not
+ def extract_protocol(options)
+ if options[:host] && match = options[:host].match(/(^.*:\/\/)(.*)/)
+ options[:protocol] ||= match[1]
+ options[:host] = match[2]
+ end
+ options[:protocol] || "http"
+ end
+
def host_or_subdomain_and_domain(options)
return options[:host] if !named_host?(options[:host]) || (options[:subdomain].nil? && options[:domain].nil?)
@@ -48,6 +48,14 @@ def app
https!
assert_equal "http://www.example.com/foo", foo_url(:protocol => "http")
end
+
+ test "extracting protocol from host when protocol not present" do
+ assert_equal "httpz://www.example.com/foo", foo_url(host: "httpz://www.example.com", protocol: nil)
+ end
+
+ test "formatting host when protocol is present" do
+ assert_equal "http://www.example.com/foo", foo_url(host: "httpz://www.example.com", protocol: "http://")
+ end
end
end

0 comments on commit 730f725

Please sign in to comment.