feat: Store collection metadata as triples when registering

Author: joachimvh

README.md

@@ -27,7 +27,8 @@ You can then execute the following flows:
 - `yarn script:public`: `GET` the public `/alice/profile/card` without redirection to the UMA server;
 - `yarn script:private`: `PUT` some text to the private `/alice/private/resource.txt`, protected by a simple WebID check;
 - `yarn script:uma-ucp`: `PUT` some text to the private `/alice/other/resource.txt`, protected by a UCP enforcer checking WebIDs according to policies in `packages/uma/config/rules/policy/`.
-- `yarn script:registration`: `POST`, `GET` and `DELETE` some text to/from `/alice/public/resource.txt` to test the correct creation and deletion of resource registrations on the UNA server.
+- `yarn script:collection`: `POST`, `GET` and `DELETE` some text to/from `/alice/public/resource.txt` to test the correct creation and deletion of resource registrations on the UMA server.
+                            An AssetCollection policy is used to create `/alice/public/`.
 
 `yarn script:flow` runs all flows in sequence.
 

package.json

@@ -62,10 +62,10 @@
     "script:demo-test": "yarn exec tsx ./demo/flow-test.ts",
     "script:public": "yarn exec tsx ./scripts/test-public.ts",
     "script:private": "yarn exec tsx ./scripts/test-private.ts",
-    "script:registration": "yarn exec tsx ./scripts/test-registration.ts",
+    "script:collection": "yarn exec tsx ./scripts/test-collection.ts",
     "script:uma-ucp": "yarn exec tsx ./scripts/test-uma-ucp.ts",
     "script:uma-odrl": "yarn exec tsx ./scripts/test-uma-ODRL.ts",
-    "script:flow": "yarn run script:public && yarn run script:private && yarn run script:uma-ucp && yarn run script:registration",
+    "script:flow": "yarn run script:public && yarn run script:private && yarn run script:collection && yarn run script:uma-ucp",
     "sync:list": "syncpack list-mismatches",
     "sync:fix": "syncpack fix-mismatches"
   },

packages/ucp/src/util/Vocabularies.ts

@@ -106,15 +106,18 @@ export function extendVocabulary<TBase extends string, TLocal extends string, TN
 export const RDF = createVocabulary(
     'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
     'type',
-  );
+);
 
 
 export const ODRL = createVocabulary(
     'http://www.w3.org/ns/odrl/2/',
+    'AssetCollection',
     'Agreement',
     'Offer',
     'Permission',
     'Request',
+    'source',
+    'partOf',
     'action',
     'target',
     'assignee',
@@ -129,12 +132,18 @@ export const ODRL = createVocabulary(
     'gt',
     'lt',
     'eq',
-)
+);
+
+export const ODRL_P = createVocabulary(
+  'https://w3id.org/force/odrl3proposal#',
+  'relation',
+  'reverse',
+);
 
 export const XSD = createVocabulary(
     'http://www.w3.org/2001/XMLSchema#',
     'dateTime',
     'duration',
     'integer',
     'string',
-  );
+);

packages/uma/config/policies/authorizers/default.json

@@ -53,17 +53,20 @@
         "@type": "OdrlAuthorizer",
         "eyePath": { "@id": "urn:uma:variables:eyePath" },
         "policies": {
-          "@id": "urn:uma:default:RulesStorage",
-          "@type": "DirectoryUCRulesStorage",
-          "directoryPath": {
-            "@id": "urn:uma:variables:policyDir"
-          },
-          "baseIRI": {
-            "@id": "urn:uma:variables:policyBaseIRI"
-          }
+          "@id": "urn:uma:default:RulesStorage"
         }
       },
       "resourceStore": { "@id": "urn:uma:default:ResourceRegistrationStore" }
+    },
+    {
+      "@id": "urn:uma:default:RulesStorage",
+      "@type": "DirectoryUCRulesStorage",
+      "directoryPath": {
+        "@id": "urn:uma:variables:policyDir"
+      },
+      "baseIRI": {
+        "@id": "urn:uma:variables:policyBaseIRI"
+      }
     }
   ]
 }

packages/uma/config/routes/resources.json

@@ -6,7 +6,8 @@
     {
       "@id": "urn:uma:default:ResourceRegistrationHandler",
       "@type": "ResourceRegistrationRequestHandler",
-      "resourceStore": { "@id": "urn:uma:default:ResourceRegistrationStore" }
+      "resourceStore": { "@id": "urn:uma:default:ResourceRegistrationStore" },
+      "policies": { "@id": "urn:uma:default:RulesStorage" }
     },
     {
       "@id": "urn:uma:default:ResourceRegistrationRoute",

packages/uma/config/rules/policy/policy0.ttl

@@ -1,5 +1,6 @@
 @prefix ex: <http://example.org/1707120963224#> .
 @prefix odrl: <http://www.w3.org/ns/odrl/2/> .
+@prefix odrl_p: <https://w3id.org/force/odrl3proposal#> .
 
 ex:usagePolicy a odrl:Agreement .
 ex:usagePolicy odrl:permission ex:permission .
@@ -16,3 +17,15 @@ ex:permission2 odrl:action odrl:create , odrl:modify .
 ex:permission2 odrl:target <alice/> , <alice/private/> , <alice/private/resource.txt> .
 ex:permission2 odrl:assignee <https://woslabbi.pod.knows.idlab.ugent.be/profile/card#me> .
 ex:permission2 odrl:assigner <https://pod.woutslabbinck.com/profile/card#me> .
+
+ex:usagePolicy3 a odrl:Agreement .
+ex:usagePolicy3 odrl:permission ex:permission3 .
+ex:permission3 a odrl:Permission .
+ex:permission3 odrl:action odrl:read .
+ex:permission3 odrl:target <collection:alice/> .
+ex:permission3 odrl:assignee <https://woslabbi.pod.knows.idlab.ugent.be/profile/card#me> .
+ex:permission3 odrl:assigner <https://pod.woutslabbinck.com/profile/card#me> .
+
+<collection:alice/> a odrl:AssetCollection ;
+  odrl:source <alice/> ;
+  odrl_p:relation <http://www.w3.org/ns/ldp#contains> .