Merge pull request #1160 from solid/fix/#1159

Fixed acl files for external webids

Author: jaxoncreed

lib/acl-checker.js

@@ -7,6 +7,8 @@ const aclCheck = require('@solid/acl-check')
 const { URL } = require('url')
 const { promisify } = require('util')
 const fs = require('fs')
+const Url = require('url')
+const httpFetch = require('node-fetch')
 
 const DEFAULT_ACL_SUFFIX = '.acl'
 const ACL = rdf.Namespace('http://www.w3.org/ns/auth/acl#')
@@ -156,7 +158,7 @@ class ACLChecker {
     return new ACLChecker(resource, {
       agentOrigin: req.get('origin'),
       // host: req.get('host'),
-      fetch: fetchFromLdp(ldp.resourceMapper),
+      fetch: fetchLocalOrRemote(ldp.resourceMapper, ldp.serverUri),
       fetchGraph: (uri, options) => {
         // first try loading from local fs
         return ldp.getGraph(uri, options.contentType)
@@ -178,17 +180,27 @@ class ACLChecker {
  *   - `callback(null, graph)` with the parsed RDF graph of the fetched resource
  * @return {Function} Returns a `fetch(uri, callback)` handler
  */
-function fetchFromLdp (mapper) {
+function fetchLocalOrRemote (mapper, serverUri) {
   return async function fetch (url, graph = rdf.graph()) {
     // Convert the URL into a filename
-    let path, contentType
-    try {
-      ({ path, contentType } = await mapper.mapUrlToFile({ url }))
-    } catch (err) {
-      throw new HTTPError(404, err)
+    let body, path, contentType
+
+    if (Url.parse(url).host.includes(Url.parse(serverUri).host)) {
+      // Fetch the acl from local
+      try {
+        ({ path, contentType } = await mapper.mapUrlToFile({ url }))
+      } catch (err) {
+        throw new HTTPError(404, err)
+      }
+      // Read the file from disk
+      body = await promisify(fs.readFile)(path, { 'encoding': 'utf8' })
+    } else {
+      // Fetch the acl from the internet
+      const response = await httpFetch(url)
+      body = await response.text()
+      contentType = response.headers.get('content-type')
     }
-    // Read the file from disk
-    const body = await promisify(fs.readFile)(path, { 'encoding': 'utf8' })
+
     // Parse the file as Turtle
     rdf.parse(body, graph, url, contentType)
     return graph