Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions lib/u3d/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,11 @@ def follow_redirects(url, redirect_limit: 10, http_method: :get, request_headers
when Net::HTTPSuccess
yield(request, response)
when Net::HTTPRedirection
UI.verbose "Redirected to #{response['location']}"
follow_redirects(response['location'], redirect_limit: redirect_limit - 1, http_method: http_method, request_headers: request_headers, &block)
location = response['location']
# Handle relative URLs in redirects
location = (uri + location).to_s if location && !location.start_with?('http://', 'https://')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

One alternative there would be to go less string-oriented and more URI-oriented by parsing the response['location'] as a URI and then call location.relative?.

I was also wondering about what was happening when adding onto a URI when a path is already present (http://foo.org/bat), and it would seem that URI#+ gets rid of the existing path when adding a relative path. Sort of weird, but TIL.

UI.verbose "Redirected to #{location}"
follow_redirects(location, redirect_limit: redirect_limit - 1, http_method: http_method, request_headers: request_headers, &block)
else raise "Request failed with status #{response.code}"
end
end
Expand Down
42 changes: 42 additions & 0 deletions spec/u3d/utils_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -105,5 +105,47 @@
end
end
end

describe '.follow_redirects' do
it 'handles relative URLs in redirects' do
http_mock = double('http')
redirect_response = double('redirect_response')
success_response = double('success_response')

# First request returns redirect with relative URL
allow(redirect_response).to receive(:kind_of?).with(Net::HTTPSuccess).and_return(false)
allow(redirect_response).to receive(:kind_of?).with(Net::HTTPRedirection).and_return(true)
allow(Net::HTTPSuccess).to receive(:===).with(redirect_response).and_return(false)
allow(Net::HTTPRedirection).to receive(:===).with(redirect_response).and_return(true)
allow(redirect_response).to receive(:[]).with('location').and_return('/new-path')
allow(redirect_response).to receive(:code).and_return('302')

# Second request succeeds
allow(success_response).to receive(:kind_of?).with(Net::HTTPSuccess).and_return(true)
allow(success_response).to receive(:kind_of?).with(Net::HTTPRedirection).and_return(false)
allow(Net::HTTPSuccess).to receive(:===).with(success_response).and_return(true)
allow(Net::HTTPRedirection).to receive(:===).with(success_response).and_return(false)
allow(success_response).to receive(:body).and_return('success')
allow(success_response).to receive(:code).and_return('200')

call_count = 0
allow(Net::HTTP).to receive(:start) do |host, port, _opts, &block|
call_count += 1
expect(host).to eq('example.com')
expect(port).to eq(443)
allow(http_mock).to receive(:request) do
call_count == 1 ? redirect_response : success_response
end
block.call(http_mock)
end

result = U3d::Utils.follow_redirects('https://example.com/original') do |_request, response|
response.body
end

expect(result).to eql('success')
expect(call_count).to eq(2)
end
end
end
end
Loading