Merge branch 'develop'

kjetilk · kjetilk · commit f4b29d4d2853 · 2018-07-10T15:01:47.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -18,6 +18,11 @@ addons:
     - tim.localhost
     - nicola.localhost
 
+script:
+  - npm run standard
+  - npm run sonar
+  - npm run nyc
+
 cache:
   apt: true
   directories:
diff --git a/bin/lib/options.js b/bin/lib/options.js
@@ -277,7 +277,7 @@ module.exports = [
       return answers.useEmail
     },
     validate: (value) => {
-      if (!value || value === '') {
+      if (!value) {
         return 'You must enter this information'
       }
       return true
@@ -330,7 +330,7 @@ function validPath (value) {
   if (value === 'default') {
     return Promise.resolve(true)
   }
-  if (!value || value === '') {
+  if (!value) {
     return Promise.resolve('You must enter a valid path')
   }
   return new Promise((resolve) => {
diff --git a/default-templates/new-account/.well-known/.acl b/default-templates/new-account/.well-known/.acl
@@ -0,0 +1,19 @@
+# ACL resource for the well-known folder
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+# The owner has all permissions
+<#owner>
+    a acl:Authorization;
+    acl:agent <{{webId}}>;
+    acl:accessTo <./>;
+    acl:defaultForNew <./>;
+    acl:mode acl:Read, acl:Write, acl:Control.
+
+# The public has read permissions
+<#public>
+    a acl:Authorization;
+    acl:agentClass foaf:Agent;
+    acl:accessTo <./>;
+    acl:defaultForNew <./>;
+    acl:mode acl:Read.
diff --git a/default-templates/new-account/robots.txt b/default-templates/new-account/robots.txt
@@ -0,0 +1,3 @@
+User-agent: *
+# Allow all crawling (subject to ACLs as usual, of course)
+Disallow:
diff --git a/default-templates/new-account/robots.txt.acl b/default-templates/new-account/robots.txt.acl
@@ -0,0 +1,26 @@
+# ACL for the default robots.txt resource
+# Individual users will be able to override it as they wish
+# Public-readable
+
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#owner>
+    a acl:Authorization;
+
+    acl:agent
+        <{{webId}}>;
+
+    acl:accessTo </robots.txt>;
+
+    acl:mode
+        acl:Read, acl:Write, acl:Control.
+
+<#public>
+    a acl:Authorization;
+
+    acl:agentClass foaf:Agent;  # everyone
+
+    acl:accessTo </robots.txt>;
+
+    acl:mode acl:Read.
diff --git a/default-templates/server/.well-known/.acl b/default-templates/server/.well-known/.acl
@@ -0,0 +1,15 @@
+# ACL for the default .well-known/ resource
+# Server operators will be able to override it as they wish
+# Public-readable
+
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#public>
+    a acl:Authorization;
+
+    acl:agentClass foaf:Agent;  # everyone
+
+    acl:accessTo </.well-known/>;
+
+    acl:mode acl:Read.
diff --git a/default-templates/server/favicon.ico b/default-templates/server/favicon.ico
diff --git a/default-templates/server/favicon.ico.acl b/default-templates/server/favicon.ico.acl
@@ -0,0 +1,15 @@
+# ACL for the default favicon.ico resource
+# Server operators will be able to override it as they wish
+# Public-readable
+
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#public>
+    a acl:Authorization;
+
+    acl:agentClass foaf:Agent;  # everyone
+
+    acl:accessTo </favicon.ico>;
+
+    acl:mode acl:Read.
diff --git a/default-templates/server/robots.txt b/default-templates/server/robots.txt
@@ -0,0 +1,3 @@
+User-agent: *
+# Allow all crawling (subject to ACLs as usual, of course)
+Disallow:
diff --git a/default-templates/server/robots.txt.acl b/default-templates/server/robots.txt.acl
@@ -0,0 +1,15 @@
+# ACL for the default robots.txt resource
+# Server operators will be able to override it as they wish
+# Public-readable
+
+@prefix acl: <http://www.w3.org/ns/auth/acl#>.
+@prefix foaf: <http://xmlns.com/foaf/0.1/>.
+
+<#public>
+    a acl:Authorization;
+
+    acl:agentClass foaf:Agent;  # everyone
+
+    acl:accessTo </robots.txt>;
+
+    acl:mode acl:Read.
diff --git a/lib/acl-checker.js b/lib/acl-checker.js
@@ -49,9 +49,8 @@ class ACLChecker {
     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) => {
+    const nearestACL = this.getPossibleACLs().reduce((prevACL, acl) => {
+      return prevACL.catch(() => new Promise((resolve, reject) => {
         this.fetch(acl, (err, graph) => {
           if (err || !graph || !graph.length) {
             isContainer = true
@@ -63,7 +62,7 @@ class ACLChecker {
           }
         })
       }))
-    }
+    }, Promise.reject())
     return nearestACL.catch(e => { throw new Error('No ACL resource found') })
   }
 
diff --git a/lib/handlers/get.js b/lib/handlers/get.js
@@ -95,14 +95,14 @@ function handler (req, res, next) {
         debug('   sending data browser file: ' + dataBrowserPath)
         res.sendFile(dataBrowserPath)
         return
-      } else {
+      } else if (stream) {
         res.setHeader('Content-Type', contentType)
         return stream.pipe(res)
       }
     }
 
     // If request accepts the content-type we found
-    if (negotiator.mediaType([contentType])) {
+    if (stream && negotiator.mediaType([contentType])) {
       res.setHeader('Content-Type', contentType)
       if (contentRange) {
         const headers = { 'Content-Range': contentRange, 'Accept-Ranges': 'bytes', 'Content-Length': chunksize }
diff --git a/lib/handlers/post.js b/lib/handlers/post.js
@@ -37,16 +37,16 @@ function handler (req, res, next) {
     }
 
     // Check if container is a directory
-    if (!stats.isDirectory()) {
+    if (stats && !stats.isDirectory()) {
       debug('Path is not a container, 405!')
       return next(error(405, 'Requested resource is not a container'))
     }
 
     // Dispatch to the right handler
     if (req.is('multipart/form-data')) {
-      multi(req, res, next)
+      multi()
     } else {
-      one(req, res, next)
+      one()
     }
   })
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/test/integration/header-test.js b/test/integration/header-test.js

Original file line number	Diff line number	Diff line change
`@@ -277,7 +277,7 @@ module.exports = [`
`277`	`277`	`return answers.useEmail`
`278`	`278`	`},`
`279`	`279`	`validate: (value) => {`
`280`		`- if (!value \|\| value === '') {`
	`280`	`+ if (!value) {`
`281`	`281`	`return 'You must enter this information'`
`282`	`282`	`}`
`283`	`283`	`return true`
`@@ -330,7 +330,7 @@ function validPath (value) {`
`330`	`330`	`if (value === 'default') {`
`331`	`331`	`return Promise.resolve(true)`
`332`	`332`	`}`
`333`		`- if (!value \|\| value === '') {`
	`333`	`+ if (!value) {`
`334`	`334`	`return Promise.resolve('You must enter a valid path')`
`335`	`335`	`}`
`336`	`336`	`return new Promise((resolve) => {`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+User-agent: *`
	`2`	`+# Allow all crawling (subject to ACLs as usual, of course)`
	`3`	`+Disallow:`