From c55270b8c1c45b9a61ef431b66033437da2c9ea5 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Mar 06 2018 19:00:34 +0000 Subject: Allow for configurable tls verification. This is just for trying to put my demo together. --- diff --git a/greenwave/config.py b/greenwave/config.py index 6027e47..70863da 100644 --- a/greenwave/config.py +++ b/greenwave/config.py @@ -14,6 +14,7 @@ class Config(object): RESULTSDB_API_URL = 'https://taskotron.fedoraproject.org/resultsdb_api/api/v2.0' WAIVERDB_API_URL = 'https://waiverdb.fedoraproject.org/api/v1.0' REQUESTS_TIMEOUT = (6.1, 15) + REQUESTS_VERIFY = True POLICIES_DIR = '/etc/greenwave/policies' # By default, don't cache anything. CACHE = {'backend': 'dogpile.cache.null'} diff --git a/greenwave/resources.py b/greenwave/resources.py index 5ccab1d..4cd44db 100644 --- a/greenwave/resources.py +++ b/greenwave/resources.py @@ -22,9 +22,10 @@ def retrieve_results(item): params = item.copy() params.update({'limit': '1000'}) timeout = current_app.config['REQUESTS_TIMEOUT'] + verify = current_app.config['REQUESTS_VERIFY'] response = requests_session.get( current_app.config['RESULTSDB_API_URL'] + '/results', - params=params, timeout=timeout) + params=params, verify=verify, timeout=timeout) response.raise_for_status() return response.json()['data'] @@ -32,6 +33,7 @@ def retrieve_results(item): # NOTE - not cached, for now. def retrieve_waivers(product_version, item): timeout = current_app.config['REQUESTS_TIMEOUT'] + verify = current_app.config['REQUESTS_VERIFY'] data = { 'product_version': product_version, 'results': [{"subject": item}] @@ -40,6 +42,7 @@ def retrieve_waivers(product_version, item): current_app.config['WAIVERDB_API_URL'] + '/waivers/+by-subjects-and-testcases', headers={'Content-Type': 'application/json'}, data=json.dumps(data), + verify=verify, timeout=timeout) response.raise_for_status() return response.json()['data']