summaryrefslogtreecommitdiff
path: root/service/pixelated/bitmask_libraries/provider.py
diff options
context:
space:
mode:
authorFolker Bernitt <fbernitt@thoughtworks.com>2015-03-27 11:14:14 +0100
committerFolker Bernitt <fbernitt@thoughtworks.com>2015-03-30 11:10:23 +0200
commit2ec7bcfd32c2151e2e42ae7b19631dcc4018f93e (patch)
treef0567d6381d18c24bc33ce8b3587c5c2db6017ef /service/pixelated/bitmask_libraries/provider.py
parent9404478d8e29be008e2e2c72e0a51dc7649f4d31 (diff)
Splitting certificate validation into provider and bootstrap certificate.
- Issue #333 - Now a different certificate is used to communicate with the provider's HTTPS website than for all other connections, e.g. to the api
Diffstat (limited to 'service/pixelated/bitmask_libraries/provider.py')
-rw-r--r--service/pixelated/bitmask_libraries/provider.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/service/pixelated/bitmask_libraries/provider.py b/service/pixelated/bitmask_libraries/provider.py
index 4fe5f17d..5304e662 100644
--- a/service/pixelated/bitmask_libraries/provider.py
+++ b/service/pixelated/bitmask_libraries/provider.py
@@ -17,7 +17,7 @@ import json
from leap.common.certs import get_digest
import requests
-from .certs import which_bundle
+from .certs import which_bootstrap_bundle, which_bundle
class LeapProvider(object):
@@ -78,7 +78,7 @@ class LeapProvider(object):
session = requests.session()
try:
cert_url = '%s/ca.crt' % self._provider_base_url()
- response = session.get(cert_url, verify=which_bundle(self), timeout=self.config.timeout_in_s)
+ response = session.get(cert_url, verify=which_bootstrap_bundle(self), timeout=self.config.timeout_in_s)
response.raise_for_status()
cert_data = response.content
@@ -101,7 +101,7 @@ class LeapProvider(object):
def fetch_provider_json(self):
url = '%s/provider.json' % self._provider_base_url()
- response = requests.get(url, verify=which_bundle(self), timeout=self.config.timeout_in_s)
+ response = requests.get(url, verify=which_bootstrap_bundle(self), timeout=self.config.timeout_in_s)
response.raise_for_status()
json_data = json.loads(response.content)