Merge 07672dd into 011edfc

dbca-wa · May 21, 2019 · a12cf8a · a12cf8a
2 parents 011edfc + 07672dd
commit a12cf8a
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/ledger/accounts/utils.py b/ledger/accounts/utils.py
@@ -16,7 +16,7 @@ def in_dbca_domain(user):
 
 def get_department_user_minimal(email):
     try:
-        res = requests.get('{}/api/users/?minimal&email={}'.format(settings.CMS_URL,email), auth=(settings.LEDGER_USER,settings.LEDGER_PASS))
+        res = requests.get('{}/api/users/?minimal&email={}'.format(settings.CMS_URL,email), auth=(settings.LEDGER_USER,settings.LEDGER_PASS), verify=False)
         res.raise_for_status()
         data = json.loads(res.content).get('objects')
         if len(data) > 0:
@@ -29,7 +29,7 @@ def get_department_user_minimal(email):
 
 def get_department_user_compact(email):
     try:
-        res = requests.get('{}/api/users/fast/?compact&email={}'.format(settings.CMS_URL,email), auth=(settings.LEDGER_USER,settings.LEDGER_PASS))
+        res = requests.get('{}/api/users/fast/?compact&email={}'.format(settings.CMS_URL,email), auth=(settings.LEDGER_USER,settings.LEDGER_PASS), verify=False)
         res.raise_for_status()
         data = json.loads(res.content).get('objects')
         if len(data) > 0:

diff --git a/ledger/checkout/mixins.py b/ledger/checkout/mixins.py
@@ -74,7 +74,8 @@ def handle_successful_order(self, order):
         if return_preload_url:
             try:
                 requests.get('{}?invoice={}'.format(return_preload_url, invoice.reference),
-                                cookies=self.request.COOKIES)
+                                cookies=self.request.COOKIES,
+                                verify=False)
                 # bodge for race condition: if preload updates the session, we need to update it
                 self.request.session._session_cache = self.request.session.load()
             except requests.exceptions.ConnectionError:

diff --git a/ledger/checkout/views.py b/ledger/checkout/views.py
@@ -234,7 +234,7 @@ def doInvoice(self,order_number,total,**kwargs):
 
     def handle_last_check(self,url):
         try:
-            res = requests.get(url,cookies=self.request.COOKIES)
+            res = requests.get(url,cookies=self.request.COOKIES, verify=False)
             res.raise_for_status()
             response = json.loads(res.content.decode('utf-8')).get('status')
             if response != 'approved':

diff --git a/ledger/payments/utils.py b/ledger/payments/utils.py
@@ -36,7 +36,7 @@ def isLedgerURL(url):
 
 def checkURL(url):
     try:
-        resp = requests.get(url)
+        resp = requests.get(url, verify=False)
         resp.raise_for_status()
     except:
         raise

diff --git a/ledger/taxonomy/views.py b/ledger/taxonomy/views.py
@@ -38,7 +38,7 @@ def get(self, request, *args, **kwargs):
             add_filter('kingdom_id IN ({})'.format(fauna_kingdom), params)
         elif kingdom == 'flora':
             add_filter('kingdom_id NOT IN ({})'.format(fauna_kingdom), params)
-        r = requests.get(base_url, params=params)
+        r = requests.get(base_url, params=params, verify=False)
         names = []
         try:
             features = r.json()['features']

diff --git a/wildlifelicensing/apps/returns/api/views.py b/wildlifelicensing/apps/returns/api/views.py
@@ -55,7 +55,7 @@ def get(self, request, *args, **kwargs):
                 resource_obj = OrderedDict()
                 resource_obj['name'] = resource.get('name', '')
                 resource_obj['data'] = url
-                resource_obj['python'] = "requests.get('{0}', cookies={{'sessionid':'{1}'}}).content".format(
+                resource_obj['python'] = "requests.get('{0}', cookies={{'sessionid':'{1}'}}, verify=False).content".format(
                     url,
                     sessionid
                 )