From f4d2fae5d8dd6b596117be71704b39dedfd1a672 Mon Sep 17 00:00:00 2001 From: Evan Cordell Date: Wed, 27 Apr 2016 08:30:05 -0500 Subject: [PATCH] Separate jwtproxy signer config from secscan config --- config.py | 2 +- util/secscan/api.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/config.py b/config.py index 667d85954..6d19d1541 100644 --- a/config.py +++ b/config.py @@ -288,8 +288,8 @@ class DefaultConfig(object): 'API_VERSION': 'v1', 'API_TIMEOUT_SECONDS': 10, 'API_TIMEOUT_POST_SECONDS': 480, - 'PROXY': 'http://localhost:8080', } + JWTPROXY_SIGNER = 'https://localhost:8080' # Torrent management flags FEATURE_BITTORRENT = False diff --git a/util/secscan/api.py b/util/secscan/api.py index 750a05932..e10981319 100644 --- a/util/secscan/api.py +++ b/util/secscan/api.py @@ -5,7 +5,7 @@ from data.database import CloseForLongOperation from data import model from data.model.storage import get_storage_locations -from urlparse import urljoin +from urlparse import urljoin, urlparse from util.secscan.validator import SecurityConfigValidator logger = logging.getLogger(__name__) @@ -253,11 +253,13 @@ 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') + with CloseForLongOperation(self.config): logger.debug('%sing security URL %s', method.upper(), url) return client.request(method, url, json=body, params=params, timeout=timeout, cert=self._keys, verify='/conf/mitm.cert', headers=headers, proxies={ - self.config.get('PREFERRED_URL_SCHEME', 'http'): security_config.get('PROXY') + urlparse(signer_proxy_url).scheme: signer_proxy_url })