My changes on top of #1122

Author: michielbdejong

lib/acl-checker.js

@@ -57,9 +57,16 @@ class ACLChecker {
     const modes = [ACL(mode)]
     const agentOrigin = this.agentOrigin
     const trustedOrigins = this.trustedOrigins
-    const originTrustedModes = agent && agentOrigin ? await this.getOriginTrustedModes(agent, agentOrigin) : []
+    let originTrustedModes = []
+    try {
+      this.fetch(aclFile.doc().value)
+      originTrustedModes = await aclCheck.getTrustedModesForOrigin(acl.graph, resource, directory, aclFile, agentOrigin, (uriNode) => {
+        return this.fetch(uriNode.doc().value, acl.graph)
+      })
+    } catch (e) {
+      console.error(e.message)
+    }
     const accessDenied = aclCheck.accessDenied(acl.graph, resource, directory, aclFile, agent, modes, agentOrigin, trustedOrigins, originTrustedModes)
-
     if (accessDenied && user) {
       this.messagesCached[cacheKey].push(HTTPError(403, accessDenied))
     } else if (accessDenied) {
@@ -69,26 +76,6 @@ class ACLChecker {
     return this.aclCached[cacheKey]
   }
 
-  async getOriginTrustedModes (agent, agentOrigin) {
-    let agentStore
-    try {
-      this.requests[agent.uri] = this.requests[agent.uri] || this.fetch(agent.uri)
-      agentStore = await this.requests[agent.uri]
-    } catch (err) {
-      if (err && (err.code === 'ENOENT' || err.status === 404)) {
-        // If we're unable to resolve the agent, we conclude that origin has no trusted modes
-        this.requests[agent.uri] = Promise.resolve(null)
-        return Promise.resolve([])
-      }
-      debug(err)
-      throw err
-    }
-    if (agentStore) {
-      return aclCheck.getTrustedModesForOrigin(agentStore, agent, agentOrigin)
-    }
-    return Promise.resolve([])
-  }
-
   async getError (user, mode) {
     const cacheKey = `${mode}-${user}`
     this.aclCached[cacheKey] = this.aclCached[cacheKey] || this.can(user, mode)

test/integration/authentication-oidc-test.js

@@ -3,10 +3,10 @@ const path = require('path')
 const fs = require('fs-extra')
 const { UserStore } = require('@solid/oidc-auth-manager')
 const UserAccount = require('../../lib/models/user-account')
-const SolidAuthOIDC = require('@solid/solid-auth-oidc')
+// const SolidAuthOIDC = require('@solid/solid-auth-oidc')
 
-const fetch = require('node-fetch')
-const localStorage = require('localstorage-memory')
+// const fetch = require('node-fetch')
+// const localStorage = require('localstorage-memory')
 const URL = require('whatwg-url').URL
 global.URL = URL
 global.URLSearchParams = require('whatwg-url').URLSearchParams
@@ -20,7 +20,7 @@ chai.use(require('dirty-chai'))
 // In this test we always assume that we are Alice
 
 describe('Authentication API (OIDC)', () => {
-  let alice, bob
+  let alice, bob // eslint-disable-line no-unused-vars
 
   let aliceServerUri = 'https://localhost:7000'
   let aliceWebId = 'https://localhost:7000/profile/card#me'