oldaplib 0.3.30__py3-none-any.whl → 0.4.1__py3-none-any.whl

oldaplib/src/connection.py

@@ -168,6 +168,45 @@ class Connection(IConnection):
         if userId is None:
             logger.error("Connection with wrong credentials")
             raise OldapError("Wrong credentials")
+
+        auth = HTTPBasicAuth(self._dbuser, self._dbpassword) if self._dbuser and self._dbpassword else None
+        #
+        # Get projects and add to Context
+        #
+        sparql = context.sparql_context
+        sparql += """
+        SELECT ?sname ?ns
+        FROM oldap:onto
+        FROM shared:onto
+        FROM NAMED oldap:admin
+        WHERE {
+            GRAPH oldap:admin {
+                ?proj a oldap:Project .
+                ?proj oldap:projectShortName ?sname .
+                ?proj oldap:namespaceIri ?ns .
+            }
+        }
+        """
+        headers = {
+            "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+            "Accept": "application/x-sparqlstar-results+json, application/sparql-results+json;q=0.9, */*;q=0.8",
+        }
+        data = {
+            'query': sparql,
+        }
+        res = requests.post(url=self._query_url, headers=headers, data=data, auth=auth)
+        if res.status_code == 200:
+            jsonobj = res.json()
+        else:
+            logger.error(f"Could not connect to triplestore: {res.text}")
+            raise OldapError(res.status_code, res.text)
+        res = QueryProcessor(context=context, query_result=jsonobj)
+        for r in res:
+            context[r['sname']] = r['ns']
+
+        #
+        # Query the user data
+        #
         sparql = UserData.sparql_query(context=context, userId=userId)
         headers = {
             "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
@@ -179,7 +218,6 @@ class Connection(IConnection):
         #
         # if we have protected the triplestore by a user/password, add it to the request
         #
-        auth = HTTPBasicAuth(self._dbuser, self._dbpassword) if self._dbuser and self._dbpassword else None
         res = requests.post(url=self._query_url, headers=headers, data=data, auth=auth)
         if res.status_code == 200:
             jsonobj = res.json()
@@ -209,39 +247,6 @@ class Connection(IConnection):
             payload=payload,
             key=self.__jwtkey,
             algorithm="HS256")
-        #
-        # Get projects and add to Context
-        #
-        sparql = context.sparql_context
-        sparql += """
-        SELECT ?sname ?ns
-        FROM oldap:onto
-        FROM shared:onto
-        FROM NAMED oldap:admin
-        WHERE {
-            GRAPH oldap:admin {
-                ?proj a oldap:Project .
-                ?proj oldap:projectShortName ?sname .
-                ?proj oldap:namespaceIri ?ns .
-            }
-        }
-        """
-        headers = {
-            "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
-            "Accept": "application/x-sparqlstar-results+json, application/sparql-results+json;q=0.9, */*;q=0.8",
-        }
-        data = {
-            'query': sparql,
-        }
-        res = requests.post(url=self._query_url, headers=headers, data=data, auth=auth)
-        if res.status_code == 200:
-            jsonobj = res.json()
-        else:
-            logger.error(f"Could not connect to triplestore: {res.text}")
-            raise OldapError(res.status_code, res.text)
-        res = QueryProcessor(context=context, query_result=jsonobj)
-        for r in res:
-            context[r['sname']] = r['ns']
         logger.info(f'Connection established. User "{str(self._userdata.userId)}".')
 
     @staticmethod

oldaplib/src/enums/adminpermissions.py

@@ -21,7 +21,7 @@ class AdminPermission(Enum):
     """
     ADMIN_OLDAP = 'oldap:ADMIN_OLDAP'  # Quasi root permission. This user can do everything (**dangerous!**)
     ADMIN_USERS = 'oldap:ADMIN_USERS'  # Allows to add/modify/delete users for the project this permission is given for
-    ADMIN_PERMISSION_SETS = 'oldap:ADMIN_PERMISSION_SETS'  # Allows to add/modify/delete PermissionSets
+    ADMIN_ROLES = 'oldap:ADMIN_ROLES'  # Allows to add/modify/delete Roles
     ADMIN_RESOURCES = 'oldap:ADMIN_RESOURCES'  # Override resources permission for the resources in the given project
     ADMIN_MODEL = 'oldap:ADMIN_MODEL'  # Change the data model
     ADMIN_CREATE = 'oldap:ADMIN_CREATE'  # Create new resources in the given project

oldaplib/src/enums/datapermissions.py

@@ -35,10 +35,14 @@ class PermissionWithValue(Enum):
     def numeric(self) -> Xsd_integer:
         return self._numeric
 
-    def __eq__(self, other: Self) -> bool:
+    def __eq__(self, other: Self | None) -> bool:
+        if other is None:
+            return False
         return self._numeric == other._numeric
 
-    def __ne__(self, other: Self) -> bool:
+    def __ne__(self, other: Self | None) -> bool:
+        if other is None:
+            return True
         return self._numeric != other._numeric
 
     def __gt__(self, other: Self) -> bool:
@@ -76,15 +80,20 @@ class DataPermission(PermissionWithValue):
     DATA_DELETE = ('oldap:DATA_DELETE', 5)  # Allow to delete complete resource
     DATA_PERMISSIONS = ('oldap:DATA_PERMISSIONS', 6)  # Allow to modify permissions of resource
 
+    def __str__(self) -> str:
+        return self.to_string()
+
     @property
     def toRdf(self):
         return self.value
 
-    def to_string(self):
+    def to_string(self) -> str:
         return self.name.removeprefix("oldap:")
 
     @classmethod
-    def from_string(cls, permission_string: str) -> Self:
+    def from_string(cls, permission_string: str | None) -> Self | None:
+        if permission_string is None:
+            return None
         if not permission_string.startswith('oldap:'):
             permission_string = f'oldap:{permission_string}'
         for member in cls:
@@ -92,3 +101,14 @@ class DataPermission(PermissionWithValue):
                 return member
         raise ValueError(f'{permission_string} is not in DataPermission enum.')
 
+    @classmethod
+    def from_qname(cls, permission_string: Xsd_QName | None) -> Self | None:
+        if permission_string is None:
+            return None
+        permission_string = str(permission_string)
+        for member in cls:
+            if f'oldap:{member.name}' == permission_string:
+                return member
+        raise ValueError(f'{permission_string} is not in DataPermission enum.')
+
+

oldaplib/src/enums/{permissionsetattr.py → roleattr.py}

@@ -9,10 +9,9 @@ from oldaplib.src.xsd.xsd_ncname import Xsd_NCName
 
 
 @unique
-class PermissionSetAttr(AttributeClass):
+class RoleAttr(AttributeClass):
     # order: (QName, mandatory, immutable, datatype)
-    PERMISSION_SET_ID = ('virtual:permissionSetId', True, True, Xsd_NCName)  # virtual property, no equivalent in RDF
+    ROLE_ID = ('virtual:roleId', True, True, Xsd_NCName)  # virtual property, no equivalent in RDF
     DEFINED_BY_PROJECT = ('oldap:definedByProject', True, True, IriOrNCName)
-    GIVES_PERMISSION = ('oldap:givesPermission', True, False, DataPermission)
     LABEL = ('rdfs:label', False, False, LangString)
     COMMENT = ('rdfs:comment', False, False, LangString)

oldaplib/src/enums/userattr.py

@@ -1,6 +1,7 @@
 from enum import unique, Enum
 
 from oldaplib.src.enums.attributeclass import AttributeClass
+from oldaplib.src.helpers.observable_dict import ObservableDict
 from oldaplib.src.helpers.observable_set import ObservableSet
 from oldaplib.src.helpers.serializeableset import SerializeableSet
 from oldaplib.src.in_project import InProjectClass
@@ -22,7 +23,7 @@ class UserAttr(AttributeClass):
     - _UserFields.CREDENTIALS_ (RDF: 'oldap:credentials')
     - _UserFields.ACTIVE_ (RDF: 'oldap:isActive')
     - _UserFields.IN_PROJECT_ (RDF: 'oldap:inProject')
-    - _UserFields.HAS_PERMISSIONS_ (RDF: 'oldap:hasPermissions')
+    - _UserFields.HAS_ROLE_ (RDF: 'oldap:hasRole')
     """
     # order: (QName, mandatory, immutable, datatype)
     USER_IRI = ('oldap:userIri', False, True, Iri)
@@ -33,5 +34,5 @@ class UserAttr(AttributeClass):
     CREDENTIALS = ('oldap:credentials', True, False, Xsd_string)
     ACTIVE = ('oldap:isActive', False, False, Xsd_boolean)
     IN_PROJECT = ('oldap:inProject', False, False, InProjectClass)
-    HAS_PERMISSIONS = ('oldap:hasPermissions', False, False, ObservableSet)
+    HAS_ROLE = ('oldap:hasRole', False, False, ObservableDict)
 

oldaplib/src/helpers/observable_dict.py

@@ -6,6 +6,7 @@ from typing import Callable, Self, Iterable, Mapping
 from oldaplib.src.enums.action import Action
 from oldaplib.src.helpers.attributechange import AttributeChange
 from oldaplib.src.helpers.serializer import serializer
+from oldaplib.src.xsd.xsd_qname import Xsd_QName
 
 
 @serializer

oldaplib/src/in_project.py

@@ -24,7 +24,6 @@ from oldaplib.src.helpers.serializer import serializer
 import json
 
 
-#@strict
 @serializer
 class InProjectClass(Notify):
     """