From 0839e33220fd625891313c0f69156e0d3f382477 Mon Sep 17 00:00:00 2001
From: Ruben Verborgh <ruben@verborgh.org>
Date: Tue, 12 Sep 2017 18:12:00 -0400
Subject: [PATCH 1/4] Simplify ACL debugging.

Closes #589.
---
 lib/acl-checker.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/acl-checker.js b/lib/acl-checker.js
index 09fd96d97..7f7f40acb 100644
--- a/lib/acl-checker.js
+++ b/lib/acl-checker.js
@@ -46,18 +46,19 @@ class ACLChecker {
 
   // Gets the ACL that applies to the resource
   getNearestACL () {
+    const { resource } = this
     let isContainer = false
     // Create a cascade of reject handlers (one for each possible ACL)
     let nearestACL = Promise.reject()
     for (const acl of this.getPossibleACLs()) {
       nearestACL = nearestACL.catch(() => new Promise((resolve, reject) => {
-        debug(`Check if ACL exists: ${acl}`)
         this.fetch(acl, (err, graph) => {
           if (err || !graph || !graph.length) {
-            if (err) debug(`Error reading ${acl}: ${err}`)
             isContainer = true
             reject(err)
           } else {
+            const relative = resource.replace(acl.replace(/[^/]+$/, ''), './')
+            debug(`Using ACL ${acl} for ${relative}`)
             resolve({ acl, graph, isContainer })
           }
         })

From 80ec9ebb956ef905944ec0603be57f5ab2e27530 Mon Sep 17 00:00:00 2001
From: Ruben Verborgh <ruben@verborgh.org>
Date: Tue, 12 Sep 2017 18:12:52 -0400
Subject: [PATCH 2/4] Remove 'no translation' message.

---
 lib/handlers/get.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/handlers/get.js b/lib/handlers/get.js
index 49d1507d8..b0620f852 100644
--- a/lib/handlers/get.js
+++ b/lib/handlers/get.js
@@ -98,7 +98,6 @@ function handler (req, res, next) {
 
     // If request accepts the content-type we found
     if (negotiator.mediaType([contentType])) {
-      debug('no translation necessary ' + contentType)
       res.setHeader('Content-Type', contentType)
       if (contentRange) {
         var headers = { 'Content-Range': contentRange, 'Accept-Ranges': 'bytes', 'Content-Length': chunksize }

From f6ff39aeb2fe54a35ed13d0074dca969209c8ece Mon Sep 17 00:00:00 2001
From: Ruben Verborgh <ruben@verborgh.org>
Date: Tue, 12 Sep 2017 18:16:31 -0400
Subject: [PATCH 3/4] Log filenames on GET.

---
 lib/ldp.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/ldp.js b/lib/ldp.js
index c80d25a81..0f0af5a4b 100644
--- a/lib/ldp.js
+++ b/lib/ldp.js
@@ -411,11 +411,11 @@ class LDP {
         }
         stream
           .on('error', function (err) {
-            debug.handlers('GET -- Read error:' + err.message)
+            debug.handlers(`GET -- error reading ${filename}: ${err.message}`)
             return callback(error(err, "Can't create file " + err))
           })
           .on('open', function () {
-            debug.handlers('GET -- Read Start.')
+            debug.handlers(`GET -- Reading ${filename}`)
             var contentType = mime.lookup(filename) || DEFAULT_CONTENT_TYPE
             if (utils.hasSuffix(filename, ldp.turtleExtensions)) {
               contentType = 'text/turtle'

From ced2d22728e08cd402fe350c94f6193252e89785 Mon Sep 17 00:00:00 2001
From: Ruben Verborgh <ruben@verborgh.org>
Date: Tue, 12 Sep 2017 18:18:47 -0400
Subject: [PATCH 4/4] Log resource on permissions check.

---
 lib/header.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/header.js b/lib/header.js
index c46350bbf..1b9340a65 100644
--- a/lib/header.js
+++ b/lib/header.js
@@ -112,8 +112,8 @@ function addPermissions (req, res, next) {
     getPermissionsFor(acl, session.userId, resource)
   ])
   .then(([publicPerms, userPerms]) => {
-    debug.ACL(`Permissions for ${session.userId || '(none)'}: ${userPerms}`)
-    debug.ACL(`Permissions for public: ${publicPerms}`)
+    debug.ACL(`Permissions on ${resource} for ${session.userId || '(none)'}: ${userPerms}`)
+    debug.ACL(`Permissions on ${resource} for public: ${publicPerms}`)
     res.set('WAC-Allow', `user="${userPerms}",public="${publicPerms}"`)
   })
   .then(next, next)