Merge pull request #35 from smokeykappa/story250001

Setting verify equal to True on all rest calls

Author: mbengit

qpylib/qpylib.py

@@ -97,17 +97,15 @@ def get_console_fqdn():
 
 # pylint: disable=invalid-name, too-many-arguments
 def REST(rest_action, request_url, version=None, headers=None, data=None,
-         params=None, json_body=None, verify=None, timeout=60, **kwargs):
+         params=None, json_body=None, verify=True, timeout=60, **kwargs):
     ''' Invokes a rest_action request to request_url using the Python requests module.
         Returns a requests.Response object.
         Raises ValueError if rest_action is not one of GET, PUT, POST, DELETE.
     '''
-    if util_qpylib.is_sdk():
-        rest_func = rest_qpylib.sdk_rest
-    else:
-        rest_func = rest_qpylib.live_rest
-    return rest_func(rest_action, request_url, version, headers, data,
-                     params, json_body, verify, timeout, **kwargs)
+    # Default for the sdk is no verification for now
+    rest_verify = False if util_qpylib.is_sdk() else verify
+    return rest_qpylib.rest(rest_action, request_url, version, headers, data,
+                            params, json_body, rest_verify, timeout, **kwargs)
 
 # ==== JSON ====
 

qpylib/rest_qpylib.py

@@ -14,36 +14,15 @@
 SEC_HEADER = 'SEC'
 SEC_ADMIN_TOKEN = 'SEC_ADMIN_TOKEN'
 
-def live_rest(rest_action, request_url, version, headers, data,
-              params, json_body, verify, timeout, **kwargs):
-    if not isinstance(verify, str):
-        verify = _get_cert_filepath()
-    return _rest(rest_action, request_url, version, headers, data,
-                 params, json_body, verify, timeout, **kwargs)
-
-def sdk_rest(rest_action, request_url, version, headers, data,
-             params, json_body, verify, timeout, **kwargs):
-    if not isinstance(verify, str):
-        # To be completed. Default to no verification for now.
-        verify = False
-    return _rest(rest_action, request_url, version, headers, data,
-                 params, json_body, verify, timeout, **kwargs)
-
-def _rest(rest_action, request_url, version, headers, data,
-          params, json_body, verify, timeout, **kwargs):
+def rest(rest_action, request_url, version, headers, data,
+         params, json_body, verify, timeout, **kwargs):
     rest_func = _choose_rest_function(rest_action)
     full_url = _generate_full_url(request_url)
     rest_headers = _add_headers(headers, version)
     proxies = _add_proxies()
     return rest_func(full_url, headers=rest_headers, data=data, params=params,
                      json=json_body, verify=verify, timeout=timeout, proxies=proxies, **kwargs)
 
-def _get_cert_filepath():
-    with open('/proc/mounts') as mounts:
-        if '/etc/qradar_pki' in mounts.read():
-            return '/etc/pki/tls/certs/ca-bundle.crt'
-    return False
-
 def _add_headers(headers, version=None):
     if headers is None:
         headers = {}