oscar-python 1.0.4__tar.gz → 1.1.0__tar.gz

{oscar_python-1.0.4 → oscar_python-1.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oscar_python
-Version: 1.0.4
+Version: 1.1.0
 Summary: OSCAR API for python
 Home-page: https://github.com/grycap/oscar_python
 Author: GRyCAP - Universitat Politecnica de Valencia

{oscar_python-1.0.4 → oscar_python-1.1.0}/oscar_python/_utils.py

@@ -13,17 +13,16 @@
 # limitations under the License. 
 
 import base64
-import json
 import os
 import requests
-_DEFAULT_TIMEOUT = 30
+import liboidcagent as agent
+_DEFAULT_TIMEOUT = 60
 
 """ Generic http request """
 def make_request(c , path, method, **kwargs):
 
     if "timeout" in kwargs.keys() and kwargs["timeout"]: 
         timeout = kwargs["timeout"]
-        print("timeout set to: ", timeout)
     else: 
         timeout = _DEFAULT_TIMEOUT
 
@@ -43,11 +42,17 @@ def make_request(c , path, method, **kwargs):
     result.raise_for_status()
     return result
 
-""" Function to generate headers with basic authentication """
+""" Function to generate headers with basic authentication or OIDC """
 def get_headers(c):
-    usr_pass_as_bytes = bytes(c.user+":"+c.password,"utf-8")
-    usr_pass_base_64 = base64.b64encode(usr_pass_as_bytes).decode("utf-8")
-    return {"Authorization": "Basic "+ usr_pass_base_64}
+    if c._AUTH_TYPE == "basicauth":
+        usr_pass_as_bytes = bytes(c.user+":"+c.password,"utf-8")
+        usr_pass_base_64 = base64.b64encode(usr_pass_as_bytes).decode("utf-8")
+        return {"Authorization": "Basic "+ usr_pass_base_64}
+    if c._AUTH_TYPE == "oidc-agent":
+        token = agent.get_access_token(c.shortname)
+        return get_headers_with_token(token)
+    if c._AUTH_TYPE == "oidc":
+        return get_headers_with_token(c.oidc_token)
 
 """ Function to generate headers with token auth """
 def get_headers_with_token(token):
@@ -104,4 +109,4 @@ def decode_output(output, file_path):
         write_text_file(output,file_path)
         return
 
- 
+ 

{oscar_python-1.0.4 → oscar_python-1.1.0}/oscar_python/client.py

@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License. 
 
-import os
 import json
 import yaml
+import liboidcagent as agent
 import oscar_python._utils as utils
 from oscar_python.storage import Storage
 
@@ -26,25 +26,55 @@ _LOGS_PATH = "/system/logs"
 _RUN_PATH = "/run"
 #_JOB_PATH = "/job"
 
-_MINIO = "minio"
-_S3 = "s3"
-_ONE_DATA = "onedata"
-_WEBDAV = "webdav"
 
 _GET = "get"
 _POST = "post"
 _PUT = "put"
 _DELETE = "delete"
-_DEFAULT_TIMEOUT = 30
 
 class Client:
     #Cluster info 
-    def __init__(self, id, endpoint, user, password, ssl) -> None:
-        self.id = id
-        self.endpoint = endpoint
-        self.user = user
-        self.password = password
-        self.ssl = ssl
+    def __init__(self, options) -> None:
+        self.set_auth_type(options)
+        if self._AUTH_TYPE == 'basicauth':
+            self.basic_auth_client(options)
+        if self._AUTH_TYPE == 'oidc-agent':
+            self.oidc_agent_client(options)
+        if self._AUTH_TYPE == 'oidc':
+            self.oidc_client(options)
+
+    def basic_auth_client(self, options):
+        self.id = options['cluster_id']
+        self.endpoint = options['endpoint']
+        self.user = options['user']
+        self.password = options['password']
+        self.ssl = bool(options['ssl'])
+
+    def oidc_agent_client(self, options):
+        self.id = options['cluster_id']
+        self.endpoint = options['endpoint']
+        self.shortname = options['shortname']
+        self.ssl = bool(options['ssl'])
+    
+    def oidc_client(self, options):
+        self.id = options['cluster_id']
+        self.endpoint = options['endpoint']
+        self.oidc_token = options['oidc_token']
+        self.ssl = bool(options['ssl'])
+
+    def set_auth_type(self, options):
+        if 'user' in options:
+            self._AUTH_TYPE = "basicauth"
+        elif 'shortname' in options:
+            self._AUTH_TYPE = "oidc-agent"
+            try:
+                agent.get_access_token(options['shortname'])
+            except agent.OidcAgentError as e:
+                print("ERROR oidc-agent: {}".format(e))
+        elif 'oidc_token' in options:
+            self._AUTH_TYPE = "oidc"
+        else:
+            raise ValueError("Unrecognized authentication credentials in options")
 
     """ Creates a generic storage client to interact with the storage providers 
     defined on a specific service of the refered OSCAR cluster """
@@ -123,7 +153,7 @@ class Client:
             send_data = utils.encode_input(exec_input)
 
             if "timeout" in kwargs.keys() and kwargs["timeout"]:
-                response = utils.make_request(self, _RUN_PATH+"/"+name, _POST, data=send_data, token=token, timeout=kwargs["timeout"])
+                response = utils._make_request(self, _RUN_PATH+"/"+name, _POST, data=send_data, token=token, timeout=kwargs["timeout"])
             else:
                 response = utils.make_request(self, _RUN_PATH+"/"+name, _POST, data=send_data, token=token)
             

{oscar_python-1.0.4 → oscar_python-1.1.0}/oscar_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oscar-python
-Version: 1.0.4
+Version: 1.1.0
 Summary: OSCAR API for python
 Home-page: https://github.com/grycap/oscar_python
 Author: GRyCAP - Universitat Politecnica de Valencia