oldaplib 0.2.6__tar.gz → 0.2.8__tar.gz

{oldaplib-0.2.6 → oldaplib-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: oldaplib
-Version: 0.2.6
+Version: 0.2.8
 Summary: Open Media Access Server Library (Linked Open Data middleware/RESTApi)
 License: GNU Affero General Public License version 3
 Author: Lukas Rosenthaler

{oldaplib-0.2.6 → oldaplib-0.2.8}/oldaplib/src/connection.py

@@ -14,6 +14,9 @@ from pathlib import Path
 
 from requests.auth import HTTPBasicAuth
 
+from oldaplib.src.oldaplogging import get_logger
+from oldaplib.src.version import __version__
+
 from oldaplib.src.cachesingleton import CacheSingleton, CacheSingletonRedis
 from oldaplib.src.enums.adminpermissions import AdminPermission
 from oldaplib.src.userdataclass import UserData
@@ -144,11 +147,15 @@ class Connection(IConnection):
         self._query_url = f'{self._server}/repositories/{self._repo}'
         self._update_url = f'{self._server}/repositories/{self._repo}/statements'
         self._store = SPARQLUpdateStore(self._query_url, self._update_url)
+
+        logger = get_logger()
+
         context = Context(name=context_name)
         if token is not None:
             try:
                 payload = jwt.decode(jwt=token, key=Connection.__jwtkey, algorithms="HS256")
             except InvalidTokenError:
+                logger.error("Connection with invalid token")
                 raise OldapError("Wrong credentials")
             self._userdata = json.loads(payload['userdata'], object_hook=serializer.decoder_hook)
             self._token = token
@@ -158,6 +165,7 @@ class Connection(IConnection):
         if not isinstance(userId, Xsd_NCName):
             userId = Xsd_NCName(userId)
         if userId is None:
+            logger.error("Connection with wrong credentials")
             raise OldapError("Wrong credentials")
         sparql = UserData.sparql_query(context=context, userId=userId)
         headers = {
@@ -168,22 +176,25 @@ class Connection(IConnection):
             'query': sparql,
         }
         #
-        # if we have protected the triplestore by a user/password, add it tothe request
+        # 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()
         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)
 
         self._userdata = UserData.from_query(res)
         if not self._userdata.isActive:
+            logger.error("Connection with wrong credentials")
             raise OldapError("Wrong credentials")  # On purpose, we are not providing too much information why the login failed
         if userId != "unknown":
             hashed = str(self._userdata.credentials).encode('utf-8')
             if not bcrypt.checkpw(credentials.encode('utf-8'), hashed):
+                logger.error("Connection with wrong credentials")
                 raise OldapError("Wrong credentials")  # On purpose, we are not providing too much information why the login failed
 
         expiration = datetime.now().astimezone() + timedelta(days=1)
@@ -225,19 +236,21 @@ class Connection(IConnection):
         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
+    def version(self) -> str:
+        return __version__
 
     @property
     def jwtkey(self) -> str:
         """Getter for the JWT token"""
-        return self.__jwtkey
-
-    @jwtkey.setter
-    def wtkey(self, value: str) -> None:
-        self.__jwtkey = value
+        return Connection.__jwtkey
 
     @property
     def server(self) -> str:
@@ -267,7 +280,9 @@ class Connection(IConnection):
                                         permission to clear the graph.
         :raises OldapError: If the SPARQL update operation fails.
         """
+        logger = get_logger()
         if not self._userdata:
+            logger.error("Connection with no permission to clear graph.")
             raise OldapErrorNoPermission("No permission")
         actor = self._userdata
         sysperms = actor.inProject.get(Xsd_QName('oldap:SystemProject'))
@@ -289,7 +304,9 @@ class Connection(IConnection):
                             data=data,
                             auth=auth)
         if not req.ok:
+            logger.error(f'Clearing of graph "{graph_iri}" failed: {req.text}')
             raise OldapError(req.text)
+        logger.info(f'Graph "{graph_iri}" cleared.')
 
     def clear_repo(self) -> None:
         """
@@ -344,6 +361,7 @@ class Connection(IConnection):
         # if not is_root:
         #     raise OldapErrorNoPermission("No permission")
 
+        logger = get_logger()
         with open(filename, encoding="utf-8") as f:
             content = f.read()
             ext = Path(filename).suffix
@@ -390,7 +408,9 @@ class Connection(IConnection):
                                 data=jsondata,
                                 auth=auth)
         if not req.ok:
+            logger.error(f'Upload of file "{filename}" failed: {req.text}')
             raise OldapError(req.text)
+        logger.info(f'File "{filename}" uploaded.')
 
     def query(self, query: str, format: SparqlResultFormat = SparqlResultFormat.JSON) -> Any:
         """
@@ -404,7 +424,9 @@ class Connection(IConnection):
         :rtype: Any
         :raises OldapError: Raised if not logged in or if there is an issue with the query execution.
         """
+        logger = get_logger()
         if not self._userdata:
+            logger.error("Not a valid user session.")
             raise OldapError("No login")
         headers = {
             "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
@@ -421,6 +443,7 @@ class Connection(IConnection):
         if res.status_code == 200:
             return Connection._switcher[format](res)
         else:
+            logger.error(f"SPARQL query failed: {res.text}")
             raise OldapError(res.text)
 
     def update_query(self, query: str) -> Dict[str,str]:
@@ -436,7 +459,9 @@ class Connection(IConnection):
         :rtype: Dict[str, str
         :raises OldapError: If user authentication is missing or the SPARQL UPDATE execution fails.
         """
+        logger = get_logger()
         if not self._userdata:
+            logger.error("Not a valid user session.")
             raise OldapError("No login")
         headers = {
             "Accept": "*/*"
@@ -445,6 +470,7 @@ class Connection(IConnection):
         auth = HTTPBasicAuth(self._dbuser, self._dbpassword) if self._dbuser and self._dbpassword else None
         res = requests.post(url, data={"update": query}, headers=headers, auth=auth)
         if not res.ok:
+            logger.error(f"SPARQL update query failed: {res.text}")
             raise OldapError(f'Update query failed. Reason: "{res.text}"')
 
     def transaction_start(self) -> None:

oldaplib-0.2.8/oldaplib/src/version.py

@@ -0,0 +1 @@
+__version__ = "0.2.8"

{oldaplib-0.2.6 → oldaplib-0.2.8}/oldaplib/test/test_connection.py

@@ -1,3 +1,5 @@
+import json
+import os
 import unittest
 from datetime import datetime, timezone
 from pathlib import Path
@@ -11,6 +13,7 @@ from oldaplib.src.enums.sparql_result_format import SparqlResultFormat
 from oldaplib.src.helpers.context import Context
 from oldaplib.src.dtypes.bnode import BNode
 from oldaplib.src.dtypes.namespaceiri import NamespaceIRI
+from oldaplib.src.helpers.serializer import serializer
 from oldaplib.src.xsd.iri import Iri
 from oldaplib.src.xsd.xsd_anyuri import Xsd_anyURI
 from oldaplib.src.xsd.xsd_qname import Xsd_QName
@@ -79,7 +82,7 @@ class TestBasicConnection(unittest.TestCase):
         self.assertEqual(con.server, 'http://localhost:7200')
         self.assertEqual(con.repo, 'oldap')
         self.assertEqual(con.context_name, 'DEFAULT')
-        payload = jwt.decode(jwt=con.token, key=con.wtkey, algorithms="HS256")
+        payload = jwt.decode(jwt=con.token, key=con.jwtkey, algorithms="HS256")
         self.assertEqual(payload['iss'], 'http://oldap.org')
 
 
@@ -113,11 +116,15 @@ class TestBasicConnection(unittest.TestCase):
 
     #@unittest.skip('No longer used')
     def test_token(self):
-        Connection.jwtkey = "This is a very special secret, yeah!"
+        os.environ["OLDAP_JWT_SECRET"] = "This is a very special secret, yeah!"
         con = Connection(userId="rosenth",
                          credentials="RioGrande",
                          context_name="DEFAULT")
         token = con.token
+        tokendata = jwt.decode(jwt=token, key=con.jwtkey, algorithms="HS256")
+        userdata = json.loads(tokendata['userdata'], object_hook=serializer.decoder_hook)
+        self.assertEqual(userdata.userId, "rosenth")
+
         con = Connection(token=token,
                          context_name="DEFAULT")
         self.assertEqual(con.userid, Xsd_NCName("rosenth"))

{oldaplib-0.2.6 → oldaplib-0.2.8}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "oldaplib"
-version = "0.2.6"
+version = "0.2.8"
 description = "Open Media Access Server Library (Linked Open Data middleware/RESTApi)"
 authors = ["Lukas Rosenthaler <lukas.rosenthaler@unibas.ch>"]
 license = "GNU Affero General Public License version 3"

oldaplib-0.2.6/oldaplib/version.py

@@ -1 +0,0 @@
-__version__ = "0.2.6"