feat: made N3 ruleset configurable

Signed-off-by: Wouter Termont <wouter.termont@ugent.be>

Author: termontwouter

packages/uma/bin/demo.ts

@@ -21,6 +21,7 @@ export const launch: () => Promise<void> = async () => {
   variables['urn:uma:variables:baseUrl'] = baseUrl;
 
   // variables['urn:uma:variables:policyDir'] = path.join(rootDir, './config/rules/policy');
+  variables['urn:uma:variables:rulesDir'] = path.join(rootDir, './config/rules/n3');
 
   variables['urn:uma:variables:mainModulePath'] = rootDir;
   variables['urn:uma:variables:customConfigPath'] = path.join(rootDir, './config/demo.json');

packages/uma/bin/main.ts

@@ -21,6 +21,7 @@ export const launch: () => Promise<void> = async () => {
   variables['urn:uma:variables:baseUrl'] = baseUrl;
 
   variables['urn:uma:variables:policyDir'] = path.join(rootDir, './config/rules/policy');
+  variables['urn:uma:variables:rulesDir'] = path.join(rootDir, './config/rules/n3');
 
   variables['urn:uma:variables:mainModulePath'] = rootDir;
   variables['urn:uma:variables:customConfigPath'] = path.join(rootDir, './config/default.json');

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

@@ -35,8 +35,10 @@
       "fallback": {
         "@id": "urn:uma:default:PolicyBasedAuthorizer",
         "@type": "PolicyBasedAuthorizer",
-        "n3Rules": "config/rules/crud.n3",
-        "rules": {
+        "rulesDir": {
+          "@id": "urn:uma:variables:rulesDir"
+        },
+        "policies": {
           "@id": "urn:uma:default:RulesStorage",
           "@type": "DirectoryUCRulesStorage",
           "directoryPath": {

packages/uma/config/rules/crud.n3 packages/uma/config/rules/n3/crud.n3packages/uma/config/rules/crud.n3 renamed to packages/uma/config/rules/n3/crud.n3

@@ -21,6 +21,11 @@
         "comment": "Path to the directory containing the policy rules.",
         "@id": "urn:uma:variables:policyDir",
         "@type": "Variable"
+      },
+      {
+        "comment": "Path to the directory containing the N3 rules.",
+        "@id": "urn:uma:variables:rulesDir",
+        "@type": "Variable"
       }
     ]
   }

demo/purpose-time.n3 …ages/uma/config/rules/n3/purpose-time.n3demo/purpose-time.n3 renamed to packages/uma/config/rules/n3/purpose-time.n3 demo/purpose-time.n3 renamed to packages/uma/config/rules/n3/purpose-time.n3

@@ -7,7 +7,7 @@ import { ClaimSet } from '../../credentials/ClaimSet';
 import { DirectoryUCRulesStorage, PolicyExecutor, UconRequest, 
   UcpPatternEnforcement, UcpPlugin, UCRulesStorage } from '@solidlab/ucp';
 import { EyeJsReasoner } from "koreografeye";
-import { readFileSync } from 'fs';
+import { lstatSync, readFileSync, readdirSync } from 'fs';
 import path from 'path';
 import { UNSOLVABLE, WEBID } from '../../credentials/Claims';
 
@@ -21,7 +21,6 @@ export class PolicyBasedAuthorizer implements Authorizer {
   private plugins = { "http://example.org/dataUsage": new UcpPlugin() };
   private executor = new PolicyExecutor(this.plugins);
   private enforcer: UcpPatternEnforcement;
-  private n3: string;
 
   /**
    * Creates a PublicNamespaceAuthorizer with the given public namespaces.
@@ -32,11 +31,16 @@ export class PolicyBasedAuthorizer implements Authorizer {
   constructor(
     // protected rules: UCRulesStorage,
     // protected enforcer: UcpPatternEnforcement
-    rules: UCRulesStorage,
-    n3Rules: string,
+    policies: UCRulesStorage,
+    rulesDir: string,
   ) {
-    this.n3 = readFileSync(path.join(__dirname, '../../../', n3Rules)).toString();
-    this.enforcer = new UcpPatternEnforcement(rules, [this.n3], this.reasoner, this.executor)
+    if (!lstatSync(rulesDir).isDirectory()) {
+      throw Error(`${rulesDir} does not resolve to a directory`)
+    }
+    const ruleSet = readdirSync(rulesDir).map(file => {
+      return readFileSync(path.join(rulesDir, file)).toString();
+    });
+    this.enforcer = new UcpPatternEnforcement(policies, ruleSet, this.reasoner, this.executor)
   }