Skip to content

Rework proxy selection #309

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

Merged
merged 4 commits into from
Apr 25, 2019
Merged

Rework proxy selection #309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd96979
split and extend proxy tests
crepererum Mar 27, 2019
a133017
fix HTTP fallback for proxy env vars
crepererum Mar 27, 2019
22c7d7a
Fine-grained control over proxy selection.
crepererum Apr 24, 2019
ca015ec
Merge remote-tracking branch 'origin/master' into feature/proxy_false
untitaker Apr 25, 2019
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
13 changes: 9 additions & 4 deletions sentry_sdk/transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,10 +156,15 @@ def _make_pool(
ca_certs, # type: Optional[Any]
):
# type: (...) -> Union[PoolManager, ProxyManager]
# Use http_proxy if scheme is https and https_proxy is not set
proxy = parsed_dsn.scheme == "https" and https_proxy or http_proxy
if not proxy:
proxy = getproxies().get(parsed_dsn.scheme)
proxy = None

# try HTTPS first
if parsed_dsn.scheme == "https" and (https_proxy != ""):
proxy = https_proxy or getproxies().get("https")

# maybe fallback to HTTP proxy
if not proxy and (http_proxy != ""):
proxy = http_proxy or getproxies().get("http")

opts = self._get_pool_options(ca_certs)

Expand Down
96 changes: 89 additions & 7 deletions tests/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
# coding: utf-8
import json
import logging
import os
import pytest
import subprocess
import sys
Expand Down Expand Up @@ -52,25 +53,106 @@ def test_transport_option(monkeypatch):
assert str(Client(transport=transport).dsn) == dsn


def test_http_proxy(monkeypatch):
client = Client("https://foo@sentry.io/123", http_proxy="http://localhost/123")
def test_proxy_http_use(monkeypatch):
client = Client("http://foo@sentry.io/123", http_proxy="http://localhost/123")
assert client.transport._pool.proxy.scheme == "http"


def test_proxy_https_use(monkeypatch):
client = Client("https://foo@sentry.io/123", http_proxy="https://localhost/123")
assert client.transport._pool.proxy.scheme == "https"


def test_proxy_both_select_http(monkeypatch):
client = Client(
"https://foo@sentry.io/123",
"http://foo@sentry.io/123",
https_proxy="https://localhost/123",
http_proxy="http://localhost/123",
)
assert client.transport._pool.proxy.scheme == "https"

client = Client("http://foo@sentry.io/123", http_proxy="http://localhost/123")
assert client.transport._pool.proxy.scheme == "http"


def test_proxy_both_select_https(monkeypatch):
client = Client(
"http://foo@sentry.io/123",
"https://foo@sentry.io/123",
https_proxy="https://localhost/123",
http_proxy="http://localhost/123",
)
assert client.transport._pool.proxy.scheme == "https"


def test_proxy_http_fallback_http(monkeypatch):
client = Client("https://foo@sentry.io/123", http_proxy="http://localhost/123")
assert client.transport._pool.proxy.scheme == "http"


def test_proxy_none_noenv(monkeypatch):
client = Client("http://foo@sentry.io/123")
assert client.transport._pool.proxy is None


def test_proxy_none_httpenv_select(monkeypatch):
os.environ["HTTP_PROXY"] = "http://localhost/123"
client = Client("http://foo@sentry.io/123")
assert client.transport._pool.proxy.scheme == "http"


def test_proxy_none_httpsenv_select(monkeypatch):
os.environ["HTTPS_PROXY"] = "https://localhost/123"
client = Client("https://foo@sentry.io/123")
assert client.transport._pool.proxy.scheme == "https"


def test_proxy_none_httpenv_fallback(monkeypatch):
os.environ["HTTP_PROXY"] = "http://localhost/123"
client = Client("https://foo@sentry.io/123")
assert client.transport._pool.proxy.scheme == "http"


def test_proxy_bothselect_bothen(monkeypatch):
os.environ["HTTP_PROXY"] = "http://localhost/123"
os.environ["HTTPS_PROXY"] = "https://localhost/123"
client = Client("https://foo@sentry.io/123", http_proxy="", https_proxy="")
assert client.transport._pool.proxy is None


def test_proxy_bothavoid_bothenv(monkeypatch):
os.environ["HTTP_PROXY"] = "http://localhost/123"
os.environ["HTTPS_PROXY"] = "https://localhost/123"
client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy=None)
assert client.transport._pool.proxy.scheme == "https"


def test_proxy_bothselect_httpenv(monkeypatch):
os.environ["HTTP_PROXY"] = "http://localhost/123"
client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy=None)
assert client.transport._pool.proxy.scheme == "http"


def test_proxy_httpselect_bothenv(monkeypatch):
os.environ["HTTP_PROXY"] = "http://localhost/123"
os.environ["HTTPS_PROXY"] = "https://localhost/123"
client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy="")
assert client.transport._pool.proxy.scheme == "http"


def test_proxy_httpsselect_bothenv(monkeypatch):
os.environ["HTTP_PROXY"] = "http://localhost/123"
os.environ["HTTPS_PROXY"] = "https://localhost/123"
client = Client("https://foo@sentry.io/123", http_proxy="", https_proxy=None)
assert client.transport._pool.proxy.scheme == "https"


def test_proxy_httpselect_httpsenv(monkeypatch):
os.environ["HTTPS_PROXY"] = "https://localhost/123"
client = Client("https://foo@sentry.io/123", http_proxy=None, https_proxy="")
assert client.transport._pool.proxy is None


def test_proxy_httpsselect_bothenv_http(monkeypatch):
os.environ["HTTP_PROXY"] = "http://localhost/123"
os.environ["HTTPS_PROXY"] = "https://localhost/123"
client = Client("http://foo@sentry.io/123", http_proxy=None, https_proxy=None)
assert client.transport._pool.proxy.scheme == "http"


Expand Down