feat: use ODRL policy for authorisation configuration

compose/base-compose.yml

@@ -23,13 +23,11 @@ services:
     restart: always
     logging: *default-logging
   database:
-    image: semtech/sparql-parser:0.0.14
+    image: semtech/sparql-parser:feature-odrl-configuration
     environment:
-      USE_ODRL_POLICY: 'false'
       LISP_DYNAMIC_SPACE_SIZE: 8192
     volumes:
       - ../config/authorization:/config
-      - ../config/odrl-parser:/odrl
       - ../data/authorization:/data
     labels:
       - 'logging=true'

compose/data-space.yml

@@ -1,10 +1,6 @@
 services:
   dcat:
     image: lblod/dcat-service:0.0.1
-  odrl-parser:
-    image: lblod/odrl-parser-service:0.0.5
-    volumes:
-      - ../config/odrl-parser:/config
   vc-issuer:
     image: lblod/oid4vc-login-service:0.0.1
     environment:

compose/validation.yml

@@ -11,6 +11,7 @@ services:
       - logging=true
     logging: *default-logging
     environment:
+      DEFAULT_MU_AUTH_SCOPE: "http://services.semantic.works/annotation-review-service"
       TZ: Europe/Brussels
   frontend-human-validator:
     image: lblod/frontend-decide-human-validator:0.0.4

config/authorization/config.lisp

@@ -7,7 +7,7 @@
 (add-delta-messenger "http://deltanotifier/")
 
 
-; CONFIGURATION
+;; CONFIGURATION
 
 (in-package :client)
 (setf *log-sparql-query-roundtrip* t)
@@ -19,18 +19,12 @@
 (in-package :server)
 (setf *log-incoming-requests-p* t)
 
-; ACCESS RIGHTS
-;; The following functionality allows to easily switch between the manually written policy and one
-;; generated from an ODRL policy. When updating the app's policy, apply the necessary changes in the
-;; `decide.lisp' file.
-(defparameter *use-odrl-policy-p*
-  (and (uiop:getenv "USE_ODRL_POLICY")
-       (string-equal (uiop:getenv "USE_ODRL_POLICY") "true"))
-  "Indicate whether to use the configuration generated from ODRL or the rules in this file.")
-
-(let ((config-path
-        (if *use-odrl-policy-p*
-            "./odrl/decideAuthorizationPolicy.lisp"
-            "./config/decide.lisp")))
-  (format t "~& >> Loading policy from file: ~A" config-path)
-  (load config-path))
+(in-package :odrl-config)
+(setf *use-odrl-config-p* t)
+
+;; ACCESS RIGHTS
+;; The access policy is defined using ODRL in `./config.ttl'.
+;; If you do want to use the Lisp configuration, uncomment the following 3 lines:
+;; (setf *use-odrl-config-p* nil) ; Disables loading the ODRL config
+;; (unless *use-odrl-config-p* ; Extra check to be sure only correct file is loaded
+;;   (load "./config/decide.lisp")) ; Load the policy in the lisp file