Merge branch 'release/v5.0.0' of github.com:solid/node-solid-server into release/v5.0.0

Author: kjetilk

bin/lib/options.js

@@ -102,7 +102,7 @@ module.exports = [
       return true
     },
     when: function (answers) {
-      return answers.useOwner
+      return answers['use-owner']
     }
   },
   {
@@ -163,7 +163,7 @@ module.exports = [
     name: 'cors-proxy',
     help: 'Serve the CORS proxy on this path',
     when: function (answers) {
-      return answers.useCorsProxy
+      return answers['use-cors-proxy']
     },
     default: '/proxy',
     prompt: true
@@ -253,7 +253,7 @@ module.exports = [
     prompt: true,
     default: 'smtp.gmail.com',
     when: (answers) => {
-      return answers.useEmail
+      return answers['use-email']
     }
   },
   {
@@ -262,15 +262,15 @@ module.exports = [
     prompt: true,
     default: '465',
     when: (answers) => {
-      return answers.useEmail
+      return answers['use-email']
     }
   },
   {
     name: 'email-auth-user',
     help: 'User of your email service',
     prompt: true,
     when: (answers) => {
-      return answers.useEmail
+      return answers['use-email']
     },
     validate: (value) => {
       if (!value) {
@@ -285,7 +285,7 @@ module.exports = [
     type: 'password',
     prompt: true,
     when: (answers) => {
-      return answers.useEmail
+      return answers['use-email']
     }
   },
   {
@@ -301,7 +301,7 @@ module.exports = [
     prompt: true,
     validate: validPath,
     when: (answers) => {
-      return answers.useApiApps
+      return answers['use-api-apps']
     }
   },
   { // copied from name: 'owner'
@@ -349,7 +349,15 @@ module.exports = [
     help: 'URI to your Terms & Conditions',
     prompt: true,
     validate: validUri,
-    when: answers => answers.enforceToc
+    when: answers => answers['enforce-toc']
+  },
+  {
+    name: 'disable-password-checks',
+    help: 'Do you want to disable password strength checking?',
+    flag: true,
+    prompt: true,
+    default: false,
+    when: answers => answers.multiuser
   },
   {
     name: 'support-email',

common/js/auth-buttons.js

@@ -3,7 +3,7 @@
 (({ auth }) => {
   // Wire up DOM elements
   const [loginButton, logoutButton, registerButton, accountSettings] =
-    ['login', 'logout', 'register', 'accountSettings'].map(id =>
+    ['login', 'logout', 'register', 'account-settings'].map(id =>
       document.getElementById(id) || document.createElement('a'))
   loginButton.addEventListener('click', login)
   logoutButton.addEventListener('click', logout)
@@ -15,6 +15,7 @@
     const isOwner = loggedIn && new URL(session.webId).origin === location.origin
     loginButton.classList.toggle('hidden', loggedIn)
     logoutButton.classList.toggle('hidden', !loggedIn)
+    registerButton.classList.toggle('hidden', loggedIn)
     accountSettings.classList.toggle('hidden', !isOwner)
   })
 

common/js/solid.js

@@ -45,6 +45,8 @@
   PasswordValidator.prototype.fetchDomNodes = function () {
     this.form = this.passwordField.closest('form')
 
+    this.disablePasswordChecks = this.passwordField.classList.contains('disable-password-checks')
+
     this.passwordGroup = this.passwordField.closest('.form-group')
     this.passwordFeedback = this.passwordGroup.querySelector('.form-control-feedback')
     this.passwordStrengthMeter = this.passwordGroup.querySelector('.progress-bar')
@@ -69,8 +71,10 @@
     this.errors = []
     this.resetValidation(this.passwordGroup)
     this.resetFeedbackIcon(this.passwordFeedback)
-    this.displayPasswordErrors()
-    this.instantFeedbackForPassword()
+    if (!this.disablePasswordChecks) {
+      this.displayPasswordErrors()
+      this.instantFeedbackForPassword()
+    }
   }
 
   /**
@@ -99,14 +103,17 @@
   PasswordValidator.prototype.validatePassword = function () {
     this.errors = []
     const password = this.passwordField.value
-    const passwordStrength = this.getPasswordStrength(password)
-    this.currentStrengthLevel = this.getStrengthLevel(passwordStrength)
 
-    if (passwordStrength.errors) {
-      this.addPasswordError(passwordStrength.errors)
-    }
+    if (!this.disablePasswordChecks) {
+      const passwordStrength = this.getPasswordStrength(password)
+      this.currentStrengthLevel = this.getStrengthLevel(passwordStrength)
+
+      if (passwordStrength.errors) {
+        this.addPasswordError(passwordStrength.errors)
+      }
 
-    this.checkLeakedPassword(password).then(this.handleLeakedPasswordResponse.bind(this))
+      this.checkLeakedPassword(password).then(this.handleLeakedPasswordResponse.bind(this))
+    }
 
     this.setPasswordFeedback()
   }

config.json-default

@@ -16,6 +16,7 @@
     "logo": ""
   },
   "enforceToc": true,
+  "disablePasswordChecks": false,
   "tocUri": "https://your-toc",
   "supportEmail": "Your support email address"
 }

default-views/account/register-form.hbs

@@ -36,7 +36,7 @@
 
           <div class="form-group has-feedback">
             <label class="control-label" for="password">Password*</label>
-            <input type="password" class="form-control control-progress" name="password" id="password" required/>
+            <input type="password" class="form-control control-progress{{#if disablePasswordStrengthCheck}} disable-password-strength-check{{/if}}" name="password" id="password" required/>
             <span class="glyphicon glyphicon-remove form-control-feedback hidden" aria-hidden="true"></span>
             <div class="progress">
               <div class="progress-bar" role="progressbar" aria-valuenow="0" aria-valuemin="0" aria-valuemax="4"></div>

default-views/auth/login-required.hbs

@@ -13,6 +13,7 @@
     <div class="pull-right">
       <button id="register" type="button" class="btn btn-primary">Register</button>
       <button id="login"    type="button" class="btn btn-success">Log in</button>
+      <button id="logout"   type="button" class="hidden btn btn-danger">Log out</button>
     </div>
     <h1>Log in to access this resource</h1>
   </div>

lib/create-app.js

@@ -137,6 +137,7 @@ function initAppLocals (app, argv, ldp) {
   app.locals.tokenService = new TokenService()
   app.locals.enforceToc = argv.enforceToc
   app.locals.tocUri = argv.tocUri
+  app.locals.disablePasswordChecks = argv.disablePasswordChecks
 
   if (argv.email && argv.email.host) {
     app.locals.emailService = new EmailService(argv.templates.email, argv.email)

lib/handlers/allow.js

@@ -50,7 +50,7 @@ function allow (mode) {
       },
       suffix: ldp.suffixAcl,
       strictOrigin: ldp.strictOrigin,
-      trustedOrigins: ldp.trustedOrigins
+      trustedOrigins: [ldp.resourceMapper.resolveUrl(req.hostname)].concat(ldp.trustedOrigins)
     })
 
     // Ensure the user has the required permission

lib/ldp-container.js

@@ -13,7 +13,7 @@ const path = require('path')
 
 async function addContainerStats (ldp, reqUri, filename, resourceGraph) {
   const containerStats = await ldp.stat(filename)
-  addStats(resourceGraph, reqUri, containerStats)
+  addStats(resourceGraph, reqUri, containerStats, filename)
   resourceGraph.add(
     resourceGraph.sym(reqUri),
     ns.rdf('type'),
@@ -24,7 +24,7 @@ async function addContainerStats (ldp, reqUri, filename, resourceGraph) {
     ns.ldp('Container'))
 }
 
-async function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container, file) {
+async function addFile (ldp, resourceGraph, containerUri, reqUri, container, file) {
   // Skip .meta and .acl
   if (file.endsWith(ldp.suffixMeta) || file.endsWith(ldp.suffixAcl)) {
     return null
@@ -42,7 +42,7 @@ async function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container
   let memberUri = reqUri + (stats.isDirectory() ? '/' : '')
 
   // Add fileStats to resource Graph
-  addStats(resourceGraph, memberUri, stats)
+  addStats(resourceGraph, memberUri, stats, file)
 
   // Add to `contains` list
   resourceGraph.add(
@@ -106,7 +106,7 @@ async function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container
   return null
 }
 
-function addStats (resourceGraph, reqUri, stats) {
+function addStats (resourceGraph, reqUri, stats, filename) {
   resourceGraph.add(
     resourceGraph.sym(reqUri),
     ns.stat('mtime'),  // Deprecate?
@@ -122,8 +122,8 @@ function addStats (resourceGraph, reqUri, stats) {
     ns.stat('size'),
     stats.size)
 
-  if (mime.lookup(reqUri)) { // Is the file has a well-known type,
-    let type = 'http://www.w3.org/ns/iana/media-types/' + mime.lookup(reqUri) + '#Resource'
+  if (mime.lookup(filename)) { // Is the file has a well-known type,
+    let type = 'http://www.w3.org/ns/iana/media-types/' + mime.lookup(filename) + '#Resource'
     resourceGraph.add(
       resourceGraph.sym(reqUri),
       ns.rdf('type'), // convert MIME type to RDF

lib/ldp.js

@@ -113,7 +113,7 @@ class LDP {
     return this.readResource(url + this.suffixMeta)
   }
 
-  async listContainer (filename, reqUri, uri, containerData, contentType) {
+  async listContainer (filename, reqUri, containerData, hostname) {
     const resourceGraph = $rdf.graph()
 
     try {
@@ -129,9 +129,10 @@ class LDP {
       // read directory
       const files = await ldpContainer.readdir(filename)
       // iterate through all the files
-      await Promise.all(files.map(file => {
-        const fileUri = url.resolve(reqUri, encodeURIComponent(file))
-        return ldpContainer.addFile(this, resourceGraph, reqUri, fileUri, uri, filename, file)
+      await Promise.all(files.map(async file => {
+        const { url: fileUri } = await this.resourceMapper.mapFileToUrl(
+          { path: path.join(filename, file), hostname })
+        return await ldpContainer.addFile(this, resourceGraph, reqUri, fileUri, filename, file)
       }))
     } catch (err) {
       throw error(500, "Can't list container")
@@ -340,7 +341,6 @@ class LDP {
     } catch (err) {
       throw error(404, 'Can\'t find file requested: ' + options)
     }
-    const baseUri = this.resourceMapper.resolveUrl(options.hostname)
 
     // Just return, since resource exists
     if (!options.includeBody) {
@@ -355,7 +355,7 @@ class LDP {
         .catch(() => '') // Default to an empty meta file if it is missing
       let data
       try {
-        data = await this.listContainer(filename, absContainerUri, baseUri, metaFile, contentType)
+        data = await this.listContainer(filename, absContainerUri, metaFile, options.hostname)
       } catch (err) {
         debug.handlers('GET container -- Read error:' + err.message)
         throw err

lib/requests/create-account-request.js

@@ -38,6 +38,7 @@ class CreateAccountRequest extends AuthRequest {
     this.username = options.username
     this.userAccount = options.userAccount
     this.acceptToc = options.acceptToc
+    this.disablePasswordChecks = options.disablePasswordChecks
   }
 
   /**
@@ -69,6 +70,7 @@ class CreateAccountRequest extends AuthRequest {
 
     options.enforceToc = locals.enforceToc
     options.tocUri = locals.tocUri
+    options.disablePasswordChecks = locals.disablePasswordChecks
 
     switch (authMethod) {
       case 'oidc':
@@ -113,7 +115,8 @@ class CreateAccountRequest extends AuthRequest {
       multiuser: this.accountManager.multiuser,
       registerDisabled: authMethod === 'tls',
       returnToUrl: this.returnToUrl,
-      tocUri: this.tocUri
+      tocUri: this.tocUri,
+      disablePasswordChecks: this.disablePasswordChecks
     })
 
     if (error) {

test/integration/authentication-oidc-test.js

@@ -212,7 +212,7 @@ describe('Authentication API (OIDC)', () => {
           })
         })
 
-        // Our origin isn't trusted by default
+        // Our origin is trusted by default
         describe('with that cookie and our origin', () => {
           let response
           before(done => {
@@ -225,6 +225,24 @@ describe('Authentication API (OIDC)', () => {
               })
           })
 
+          it('should return a 200', () => {
+            expect(response).to.have.property('status', 200)
+          })
+        })
+
+        // Another origin isn't trusted by default
+        describe('with that cookie and our origin', () => {
+          let response
+          before(done => {
+            alice.get('/')
+              .set('Cookie', cookie)
+              .set('Origin', 'https://some.other.domain.com')
+              .end((err, res) => {
+                response = res
+                done(err)
+              })
+          })
+
           it('should return a 403', () => {
             expect(response).to.have.property('status', 403)
           })

test/integration/ldp-test.js

@@ -285,18 +285,18 @@ describe('LDP', function () {
         '   dcterms:title "This is a container" ;' +
         '   o:limit 500000.00 .', 'sampleContainer/basicContainerFile.ttl')
 
-      return ldp.listContainer(path.join(__dirname, '../resources/sampleContainer/'), 'https://server.tld/resources/sampleContainer/', 'https://server.tld', '', 'text/turtle')
+      return ldp.listContainer(path.join(__dirname, '../resources/sampleContainer/'), 'https://server.tld/resources/sampleContainer/', '', 'server.tld')
         .then(data => {
           var graph = $rdf.graph()
           $rdf.parse(
             data,
             graph,
-            'https://server.tld/sampleContainer',
+            'https://localhost:8443/resources/sampleContainer',
             'text/turtle')
 
           var basicContainerStatements = graph
             .each(
-              $rdf.sym('https://server.tld/basicContainerFile.ttl'),
+              $rdf.sym('https://localhost:8443/resources/sampleContainer/basicContainerFile.ttl'),
               ns.rdf('type'),
               undefined
             )
@@ -310,7 +310,7 @@ describe('LDP', function () {
 
           var containerStatements = graph
             .each(
-              $rdf.sym('https://server.tld/containerFile.ttl'),
+              $rdf.sym('https://localhost:8443/resources/sampleContainer/containerFile.ttl'),
               ns.rdf('type'),
               undefined
             )
@@ -324,15 +324,18 @@ describe('LDP', function () {
     })
 
     it('should ldp:contains the same files in dir', () => {
-      ldp.listContainer(path.join(__dirname, '../resources/sampleContainer/'), 'https://server.tld/resources/sampleContainer/', 'https://server.tld', '', 'text/turtle')
+      ldp.listContainer(path.join(__dirname, '../resources/sampleContainer/'), 'https://server.tld/resources/sampleContainer/', '', 'server.tld')
         .then(data => {
           fs.readdir(path.join(__dirname, '../resources/sampleContainer/'), function (err, expectedFiles) {
+            // Strip dollar extension
+            expectedFiles = expectedFiles.map(ldp.resourceMapper._removeDollarExtension)
+
             if (err) {
               return Promise.reject(err)
             }
 
             const graph = $rdf.graph()
-            $rdf.parse(data, graph, 'https://server.tld/sampleContainer/', 'text/turtle')
+            $rdf.parse(data, graph, 'https://localhost:8443/resources/sampleContainer/', 'text/turtle')
             const statements = graph.match(null, ns.ldp('contains'), null)
             const files = statements
               .map(s => s.object.value.replace(/.*\//, ''))