Skip to content

Handle cookies when handling HTTP redirects #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jeremyevans wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle cookies when handling HTTP redirects #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions lib/open-uri.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def OpenURI.open_loop(uri, options) # :nodoc:
uri_set = {}
buf = nil
while true
redirect = catch(:open_uri_redirect) {
redirect, cookie = catch(:open_uri_redirect) {
buf = Buffer.new
uri.buffer_open(buf, find_proxy.call(uri), options)
nil
Expand All @@ -229,9 +229,13 @@ def OpenURI.open_loop(uri, options) # :nodoc:
options = options.dup
options.delete :http_basic_authentication
end
if cookie
options = options.dup
options[:cookie] = cookie.split(';')[0]
end
uri = redirect
raise "HTTP redirection loop: #{uri}" if uri_set.include? uri.to_s
uri_set[uri.to_s] = true
raise "HTTP redirection loop: #{uri}" if uri_set.include?([uri.to_s, !!cookie])
uri_set[[uri.to_s, !!cookie]] = true
else
break
end
Expand Down Expand Up @@ -321,6 +325,9 @@ def OpenURI.open_http(buf, target, proxy, options) # :nodoc:

resp = nil
http.start {
if cookie = options[:cookie]
header['Cookie'] = cookie
end
req = Net::HTTP::Get.new(request_uri, header)
if options.include? :http_basic_authentication
user, pass = options[:http_basic_authentication]
Expand Down Expand Up @@ -359,7 +366,7 @@ def OpenURI.open_http(buf, target, proxy, options) # :nodoc:
rescue URI::InvalidURIError
raise OpenURI::HTTPError.new(io.status.join(' ') + ' (Invalid Location URI)', io)
end
throw :open_uri_redirect, loc_uri
throw :open_uri_redirect, [loc_uri, resp['Set-Cookie']]
else
raise OpenURI::HTTPError.new(io.status.join(' '), io)
end
Expand Down
11 changes: 11 additions & 0 deletions test/open-uri/test_open-uri.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -545,6 +545,17 @@ def test_redirect_auth_failure_r1
}
end

def test_redirect_cookie
with_http {|srv, dr, url|
srv.mount_proc("/r1/") {|req, res| res.status = 301; res['set-cookie'] = "cookie-name=cookie-value"; res["location"] = "#{url}/r2"; res.body = "r1" }
srv.mount_proc("/r2/") {|req, res| res.body = req['Cookie'] }
URI.open("#{url}/r1/") {|f|
assert_equal("#{url}/r2", f.base_uri.to_s)
assert_equal('cookie-name=cookie-value', f.read)
}
}
end

def test_userinfo
assert_raise(ArgumentError) { URI.open("http://user:pass@127.0.0.1/") {} }
end
Expand Down