Be really sure about proxy protocol

This commit is contained in:
Evan Cordell 2016-04-27 12:48:15 -05:00 committed by Jimmy Zelinskie
parent cf5f7aa476
commit f30a9e56f3
3 changed files with 4 additions and 4 deletions

Binary file not shown.

View file

@ -289,7 +289,7 @@ class DefaultConfig(object):
'API_TIMEOUT_SECONDS': 10,
'API_TIMEOUT_POST_SECONDS': 480,
}
JWTPROXY_SIGNER = 'https://localhost:8080'
JWTPROXY_SIGNER = 'localhost:8080'
# Torrent management flags
FEATURE_BITTORRENT = False

View file

@ -253,7 +253,7 @@ class SecurityScannerAPI(object):
api_url = urljoin(endpoint, '/' + security_config['API_VERSION']) + '/'
url = urljoin(api_url, relative_url)
signer_proxy_url = self.config.get('JWTPROXY_SIGNER', 'https://localhost:8080')
signer_proxy_url = self.config.get('JWTPROXY_SIGNER', 'localhost:8080')
with CloseForLongOperation(self.config):
@ -261,6 +261,6 @@ class SecurityScannerAPI(object):
return client.request(method, url, json=body, params=params, timeout=timeout,
cert=self._keys, verify='/conf/mitm.cert', headers=headers,
proxies={
'https': signer_proxy_url,
'http': signer_proxy_url
'https': 'https://' + signer_proxy_url,
'http': 'http://' + signer_proxy_url
})