Skip to content
This repository was archived by the owner on Jul 19, 2025. It is now read-only.
Merged
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
5 changes: 4 additions & 1 deletion lib/cc/service/http.rb
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,10 @@ def http_method(method, url = nil, body = nil, headers = nil)
CC::Service::SafeWebhook.ensure_safe!(url)

http.send(method) do |req|
req.url(url) if url
if url
req.url(url)
req.options.proxy = http.proxy_from_env(url)
end
req.headers.update(headers) if headers
req.body = body if body
block.call req if block
Expand Down
49 changes: 49 additions & 0 deletions spec/cc/service_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,53 @@

expect(services.include?(CC::PullRequests)).not_to eq(true)
end

context "with proxy details" do
before do
@old_no_proxy = ENV["no_proxy"]
@old_http_proxy = ENV["http_proxy"]
ENV["no_proxy"] = "github.com"
ENV["http_proxy"] = "http://127.0.0.2:42"
end

after do
ENV["no_proxy"] = @old_no_proxy
ENV["http_proxy"] = @old_http_proxy
end

it "uses the proxy when it should" do
stub_http("http://proxied.test/my/test/url") do |env|
expect(env.request.proxy).to be_instance_of(Faraday::ProxyOptions)
expect(env.request.proxy.uri).to eq(URI.parse("http://127.0.0.2:42"))
[200, {}, '{"ok": true, "thing": "123"}']
end

response = service_post("http://proxied.test/my/test/url", { token: "1234" }.to_json, {}) do |inner_response|
body = JSON.parse(inner_response.body)
{ thing: body["thing"] }
end

expect(response[:ok]).to eq(true)
expect(response[:params]).to eq('{"token":"1234"}')
expect(response[:endpoint_url]).to eq("http://proxied.test/my/test/url")
expect(response[:status]).to eq(200)
end

it "respects proxy exclusions" do
stub_http("http://github.com/my/test/url") do |env|
expect(env.request.proxy).to be_nil
[200, {}, '{"ok": true, "thing": "123"}']
end

response = service_post("http://github.com/my/test/url", { token: "1234" }.to_json, {}) do |inner_response|
body = JSON.parse(inner_response.body)
{ thing: body["thing"] }
end

expect(response[:ok]).to eq(true)
expect(response[:params]).to eq('{"token":"1234"}')
expect(response[:endpoint_url]).to eq("http://github.com/my/test/url")
expect(response[:status]).to eq(200)
end
end
end