Merge pull request #4 from OneIdentity/PAM-11154-http-proxy-traceback

Pam 11154 http proxy traceback

CHANGELOG

@@ -1,3 +1,7 @@
+2.0.3 2019-11-04
+
+Bugfix, check http proxy settings before getting them.
+
 2.0.2 2019-07-01
 
 Use common HTTPS proxy settings. Add proxy basic authentication capability.

MANIFEST

@@ -1,6 +1,6 @@
 api: 1.2
 type: aa
 name: SPS_Duo
-version: 2.0.2
+version: 2.0.3
 description: Duo Multi-Factor Authentication plugin
 entry_point: main.py

lib/client.py

@@ -44,7 +44,9 @@ def __init__(self, ikey, skey, host, timeout=30, ignore_connection_error=False,
         logger.info('Client initialized.')
 
     def _set_http_proxy_settings(self, http_proxy_settings):
-        if not http_proxy_settings:
+        if (not http_proxy_settings
+                or not http_proxy_settings.get('server')
+                or not http_proxy_settings.get('port')):
             return
         if http_proxy_settings.get('username') and http_proxy_settings.get('password'):
             # rfc7617 The 'Basic' HTTP Authentication Scheme

lib/tests/test_client.py

@@ -143,6 +143,18 @@ def test_duo_set_proxy():
     assert client._duo.proxy_port == 3128
 
 
+def test_duo_proxy_is_not_set_when_settings_omitted():
+    client = Client('ikey', 'skey', 'host', http_proxy_settings=None)
+    assert client._duo.proxy_host is None
+    assert client._duo.proxy_port is None
+
+
+def test_duo_proxy_is_not_set_when_proxy_settings_not_set():
+    client = Client('ikey', 'skey', 'host', http_proxy_settings=dict(username='u', password='p'))
+    assert client._duo.proxy_host is None
+    assert client._duo.proxy_port is None
+
+
 def test_duo_set_proxy_auth():
     client = Client(
         'ikey', 'skey', 'host', http_proxy_settings=dict(server='proxy', port='3128', username='u', password='p')