pyxetabase 3.1.0.dev6__tar.gz → 3.1.0.dev8__tar.gz

{pyxetabase-3.1.0.dev6 → pyxetabase-3.1.0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyxetabase
-Version: 3.1.0.dev6
+Version: 3.1.0.dev8
 Summary: A REST client for OpenCGA enterprise REST web services
 Author: Daniel Perez-Gil
 Author-email: daniel.perez@zettagenomics.com

{pyxetabase-3.1.0.dev6 → pyxetabase-3.1.0.dev8}/pyxetabase/commons.py

@@ -145,22 +145,22 @@ def _fetch(config, sid, category, resource, method, subcategory=None, query_id=N
         # Getting REST response
         if method == 'get':
             try:
-                r = requests.get(url, headers=header, cookies=config.cookies)
+                r = requests.get(url, headers=header, cookies=config.cookies, verify=not config.tlsAllowInvalidCertificates)
             except requests.exceptions.ConnectionError:
                 sleep(1)
-                r = requests.get(url, headers=header, cookies=config.cookies)
+                r = requests.get(url, headers=header, cookies=config.cookies, verify=not config.tlsAllowInvalidCertificates)
         elif method == 'post':
             try:
-                r = requests.post(url, json=data, headers=header, cookies=config.cookies)
+                r = requests.post(url, json=data, headers=header, cookies=config.cookies, verify=not config.tlsAllowInvalidCertificates)
             except requests.exceptions.ConnectionError:
                 sleep(1)
-                r = requests.post(url, json=data, headers=header, cookies=config.cookies)
+                r = requests.post(url, json=data, headers=header, cookies=config.cookies, verify=not config.tlsAllowInvalidCertificates)
         elif method == 'delete':
             try:
-                r = requests.delete(url, headers=header, cookies=config.cookies)
+                r = requests.delete(url, headers=header, cookies=config.cookies, verify=not config.tlsAllowInvalidCertificates)
             except requests.exceptions.ConnectionError:
                 sleep(1)
-                r = requests.delete(url, headers=header, cookies=config.cookies)
+                r = requests.delete(url, headers=header, cookies=config.cookies, verify=not config.tlsAllowInvalidCertificates)
         else:
             raise NotImplementedError('method: ' + method + ' not implemented.')
 

{pyxetabase-3.1.0.dev6 → pyxetabase-3.1.0.dev8}/pyxetabase/opencga_config.py

@@ -37,12 +37,21 @@ class ClientConfiguration(object):
         return config_dict
 
     def get_sso_login_info(self):
+        # Checking if SSO login is specified
         if (('sso_login' in self._config and self._config['sso_login']) or
                 ('cookies' in self._config and self._config['cookies'])):
-            python_session_fhand = open(os.path.expanduser("~/.opencga/session.json"), 'r')
+
+            # Getting session file name
+            if 'name' in self._config['rest'] and self._config['rest']['name']:
+                host_name = self._config['rest']['name']
+            else:
+                host_name = 'opencga'
+            python_session_fhand = open(os.path.expanduser("~/.opencga/{}_session.json".format(host_name)), 'r')
+
+            # Loading info from session file
             session_info = json.loads(python_session_fhand.read())
             self._config['sso_login'] = True
-            self._config['cookies'] = session_info['cookies']
+            self._config['cookies'] = session_info['attributes']['cookies']
             self._config['token'] = session_info['token']
 
     def _validate_configuration(self):
@@ -55,16 +64,17 @@ class ClientConfiguration(object):
         if 'host' not in self._config['rest'] or not self._config['rest']['host']:
             raise ValueError('Missing configuration field "host".')
 
-        self._validate_host(self._config['rest']['host'])
+        self._validate_host()
 
-    @staticmethod
-    def _validate_host(host):
+    def _validate_host(self):
         try:
-            r = requests.head(host, timeout=2)
+            r = requests.head(self.host, timeout=2, verify=not self.tlsAllowInvalidCertificates)
             if r.status_code == 302:
                 return
+        except requests.exceptions.SSLError:
+            raise Exception('Invalid SSL certificate from "{}"'.format(self.host))
         except requests.ConnectionError:
-            raise Exception('Unreachable host "{}"'.format(host))
+            raise Exception('Unreachable host "{}"'.format(self.host))
 
     @property
     def configuration(self):
@@ -77,7 +87,19 @@ class ClientConfiguration(object):
     @host.setter
     def host(self, host):
         self._config['rest']['host'] = host
-        self._validate_host(host)
+        self._validate_host()
+
+    @property
+    def tlsAllowInvalidCertificates(self):
+        if ('tlsAllowInvalidCertificates' in self._config['rest'] and
+                self._config['rest']['tlsAllowInvalidCertificates'] is not None):
+            return self._config['rest']['tlsAllowInvalidCertificates']
+        else:
+            return False
+
+    @tlsAllowInvalidCertificates.setter
+    def tlsAllowInvalidCertificates(self, tlsAllowInvalidCertificates):
+        self._config['rest']['tlsAllowInvalidCertificates'] = tlsAllowInvalidCertificates
 
     @property
     def version(self):

{pyxetabase-3.1.0.dev6 → pyxetabase-3.1.0.dev8}/pyxetabase.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyxetabase
-Version: 3.1.0.dev6
+Version: 3.1.0.dev8
 Summary: A REST client for OpenCGA enterprise REST web services
 Author: Daniel Perez-Gil
 Author-email: daniel.perez@zettagenomics.com

{pyxetabase-3.1.0.dev6 → pyxetabase-3.1.0.dev8}/setup.py

@@ -14,7 +14,7 @@ with open(path.join(here, 'README.rst'), encoding='utf-8') as f:
 
 setup(
     name='pyxetabase',
-    version='3.1.0.dev6',
+    version='3.1.0.dev8',
     description='A REST client for OpenCGA enterprise REST web services',
     long_description=long_description,
     long_description_content_type='text/x-rst',