feat: make rulestorage configurable

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

Author: termontwouter

packages/uma/.componentsignore

@@ -2,6 +2,7 @@
   "AccessToken",
   "AccessToken",
   "Authorization",
+  "Authorizer",
   "Error",
   "EventEmitter",
   "Map",
@@ -13,4 +14,4 @@
   "ScopeDescription",
   "Ticket",
   "URL"
-]
+]

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

@@ -1,6 +1,7 @@
 {
   "@context": [
-    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld"
+    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/uma/^0.0.0/components/context.jsonld",
+    "https://linkedsoftwaredependencies.org/bundles/npm/@solidlab/ucp/^0.0.0/components/context.jsonld"
   ],
   "@graph": [
     {
@@ -34,8 +35,14 @@
       "fallback": {
         "@id": "urn:uma:default:PolicyBasedAuthorizer",
         "@type": "PolicyBasedAuthorizer",
-        "policyDir": "config/rules/policy/",
-        "n3Rules": "config/rules/crud.n3"
+        "n3Rules": "config/rules/crud.n3",
+        "rules": {
+          "@id": "urn:uma:default:RulesStorage",
+          "@type": "DirectoryUCRulesStorage",
+          "directoryPath": {
+            "@id": "urn:uma:variables:policyDir"
+          }
+        }
       }
     }
   ]

packages/uma/config/variables/default.json

@@ -16,6 +16,11 @@
         "comment": "Hostname of the server.",
         "@id": "urn:uma:variables:host",
         "@type": "Variable"
+      },
+      {
+        "comment": "Path to the directory containing the policy rules.",
+        "@id": "urn:uma:variables:policyDir",
+        "@type": "Variable"
       }
     ]
-  }
+  }

packages/uma/src/main.ts

@@ -15,32 +15,16 @@ const port = 4000;
 const baseUrl = `${protocol}://${host}:${port}/uma`;
 const rootDir = path.join(__dirname, '../');
 
-// const config = {
-//   jwks_uri: `${baseUrl}/keys`,
-//   token_endpoint: `${baseUrl}/token`,
-//   grant_types_supported: ['urn:ietf:params:oauth:grant-type:uma-ticket'],
-//   issuer: `${baseUrl}`,
-//   permission_endpoint: `${baseUrl}/ticket`,
-//   introspection_endpoint: `${baseUrl}/introspect`,
-//   resource_registration_endpoint: `${baseUrl}/resources`,
-//   uma_profiles_supported: ['http://openid.net/specs/openid-connect-core-1_0.html#IDToken'],
-//   dpop_signing_alg_values_supported: [...ASYMMETRIC_CRYPTOGRAPHIC_ALGORITHM],
-//   response_types_supported: [ResponseType.Token],
-// };
-
 export const launch: () => Promise<void> = async () => {
-  
-  // fs.writeFileSync(
-  //   path.join(rootDir, './config/default.json'), 
-  //   JSON.stringify(config),
-  // );
-  
+
   const variables: Record<string, any> = {};
 
   variables['urn:uma:variables:port'] = port;
   variables['urn:uma:variables:host'] = host;
   variables['urn:uma:variables:protocol'] = protocol;
   variables['urn:uma:variables:baseUrl'] = baseUrl;
+  
+  variables['urn:uma:variables:policyDir'] = path.join(rootDir, './config/rules/policy');
 
   variables['urn:uma:variables:mainModulePath'] = rootDir;
   variables['urn:uma:variables:customConfigPath'] = path.join(rootDir, './config/default.json');

packages/uma/src/policies/authorizers/PolicyBasedAuthorizer.ts

@@ -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 rules: UCRulesStorage;
   private n3: string;
 
   /**
@@ -33,12 +32,11 @@ export class PolicyBasedAuthorizer implements Authorizer {
   constructor(
     // protected rules: UCRulesStorage,
     // protected enforcer: UcpPatternEnforcement
-    policyDir: string,
+    rules: UCRulesStorage,
     n3Rules: string,
   ) {
-    this.rules = new DirectoryUCRulesStorage(path.join(__dirname, '../../../', policyDir));
     this.n3 = readFileSync(path.join(__dirname, '../../../', n3Rules)).toString();
-    this.enforcer = new UcpPatternEnforcement(this.rules, [this.n3], this.reasoner, this.executor)
+    this.enforcer = new UcpPatternEnforcement(rules, [this.n3], this.reasoner, this.executor)
   }