fix: Buggy proxy behavior

untitaker · untitaker · commit 58ec2e4d3f14 · 2018-11-22T12:17:59.000+01:00
diff --git a/sentry_sdk/transport.py b/sentry_sdk/transport.py
@@ -19,7 +19,8 @@
 
 
 def _make_pool(parsed_dsn, http_proxy, https_proxy, ca_certs):
-    proxy = https_proxy if parsed_dsn == "https" else http_proxy
+    # 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)
 
diff --git a/tests/test_client.py b/tests/test_client.py
@@ -34,6 +34,28 @@ 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")
+    assert client.transport._pool.proxy.scheme == "http"
+
+    client = Client(
+        "https://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"
+
+    client = Client(
+        "http://foo@sentry.io/123",
+        https_proxy="https://localhost/123",
+        http_proxy="http://localhost/123",
+    )
+    assert client.transport._pool.proxy.scheme == "http"
+
+
 def test_simple_transport():
     events = []
     with Hub(Client(transport=events.append)):
