Merge pull request #742 from solid/fix/globbing

Restore globbing functionality

Author: RubenVerborgh

lib/handlers/allow.js

@@ -22,6 +22,7 @@ function allow (mode) {
     })
 
     // Determine the actual path of the request
+    // (This is used as an ugly hack to check the ACL status of other resources.)
     let reqPath = res && res.locals && res.locals.path
       ? res.locals.path
       : req.path

lib/handlers/get.js

@@ -165,14 +165,18 @@ function globHandler (req, res, next) {
           debugGlob('error ' + err)
           return resolve()
         }
-        aclAllow(match, req, res, function (allowed) {
-          if (!match.endsWith('.ttl') || !allowed) {
-            return resolve()
-          }
-          try {
-            $rdf.parse(fileData, globGraph, baseUri, 'text/turtle')
-          } catch (parseErr) {
-            debugGlob(`error parsing ${match}: ${parseErr}`)
+        // Files should have the .ttl extension or be extensionless (also Turtle)
+        if (!/\.ttl$|\/[^.]+$/.test(match)) {
+          return resolve()
+        }
+        // The agent should have Read access to the file
+        hasReadPermissions(match, req, res, function (allowed) {
+          if (allowed) {
+            try {
+              $rdf.parse(fileData, globGraph, baseUri, 'text/turtle')
+            } catch (parseErr) {
+              debugGlob(`error parsing ${match}: ${parseErr}`)
+            }
           }
           return resolve()
         })
@@ -190,17 +194,16 @@ function globHandler (req, res, next) {
   })
 }
 
-function aclAllow (match, req, res, callback) {
+// TODO: get rid of this ugly hack that uses the Allow handler to check read permissions
+function hasReadPermissions (file, req, res, callback) {
   const ldp = req.app.locals.ldp
 
   if (!ldp.webid) {
     return callback(true)
   }
 
   const root = ldp.multiuser ? ldp.root + req.hostname + '/' : ldp.root
-  const relativePath = '/' + _path.relative(root, match)
+  const relativePath = '/' + _path.relative(root, file)
   res.locals.path = relativePath
-  allow('Read', req, res, function (err) {
-    callback(err)
-  })
+  allow('Read')(req, res, err => callback(!err))
 }