Merge pull request #1338 from solid/dev

Dev (v5.2.2)

Author: jaxoncreed

lib/create-app.js

@@ -296,6 +296,7 @@ function initAuthentication (app, argv) {
  */
 function sessionSettings (secureCookies, host) {
   let sessionSettings = {
+    name: 'nssidp.sid',
     secret: uuid.v1(),
     saveUninitialized: false,
     resave: false,

lib/handlers/get.js

@@ -45,7 +45,7 @@ async function handler (req, res, next) {
 
   let ret
   try {
-    ret = await ldp.get(options, req.accepts('html'))
+    ret = await ldp.get(options, req.accepts(['html', 'turtle', 'rdf+xml', 'n3', 'ld+json']) === 'html')
   } catch (err) {
     // use globHandler if magic is detected
     if (err.status === 404 && glob.hasMagic(path)) {

lib/ldp.js

@@ -156,12 +156,6 @@ class LDP {
     }
     // const { url: putUrl } = await this.resourceMapper.mapFileToUrl({ path: resourceUrl, hostname })
 
-    // HACK: the middleware in webid-oidc.js uses body-parser, thus ending the stream of data
-    // for JSON bodies. So, the stream needs to be reset
-    if (contentType.includes('application/json')) {
-      stream = intoStream(JSON.stringify(stream.body))
-    }
-
     await ldp.put(resourceUrl, stream, contentType)
     return URL.parse(originalUrl).path
   }
@@ -240,6 +234,11 @@ class LDP {
 
     // Directory created, now write the file
     return withLock(path, { mustExist: false }, () => new Promise((resolve, reject) => {
+      // HACK: the middleware in webid-oidc.js uses body-parser, thus ending the stream of data
+      // for JSON bodies. So, the stream needs to be reset
+      if (contentType.includes('application/json')) {
+        stream = intoStream(JSON.stringify(stream.body))
+      }
       const file = stream.pipe(fs.createWriteStream(path))
       file.on('error', function () {
         reject(error(500, 'Error writing data'))

lib/requests/sharing-request.js

@@ -82,6 +82,8 @@ class SharingRequest extends AuthRequest {
       } else {
         request.renderForm(null, req, appOrigin)
       }
+    } else {
+      request.redirectPostSharing()
     }
   }
 
@@ -119,6 +121,8 @@ class SharingRequest extends AuthRequest {
 
       // Redirect once that's all done
       request.redirectPostSharing()
+    } else {
+      request.redirectPostSharing()
     }
   }
 
@@ -144,12 +148,7 @@ class SharingRequest extends AuthRequest {
 
   isUserLoggedIn () {
     // Ensure the user arrived here by logging in
-    if (!this.session.subject || !this.session.subject._id) {
-      this.response.status(401)
-      this.response.send('User not logged in 2')
-      return false
-    }
-    return true
+    return !!(this.session.subject && this.session.subject._id)
   }
 
   getAppUrl () {

lib/resource-mapper.js

@@ -4,6 +4,7 @@ const { promisify } = require('util')
 const { types, extensions } = require('mime-types')
 const readdir = promisify(fs.readdir)
 const HTTPError = require('./http-error')
+const pathUtil = require('path')
 
 /*
  * A ResourceMapper maintains the mapping between HTTP URLs and server filenames,
@@ -33,7 +34,7 @@ class ResourceMapper {
     this._defaultContentType = defaultContentType
     this._types = { ...types, ...overrideTypes }
     this._indexFilename = indexFilename
-    this._indexContentType = this._getContentTypeByExtension(indexFilename)
+    this._indexContentType = this._getContentTypeFromExtension(indexFilename)
 
     // If the host needs to be replaced on every call, pre-split the root URL
     if (includeHost) {
@@ -78,8 +79,10 @@ class ResourceMapper {
 
     // Determine the URL by chopping off everything after the dollar sign
     const pathname = this._removeDollarExtension(path)
-    const url = `${this.resolveUrl(hostname)}${encodeURI(pathname)}`
-    return { url, contentType: this._getContentTypeByExtension(path) }
+    const url = `${this.resolveUrl(hostname)}${
+      pathname.split(pathUtil.sep).map((component) => encodeURIComponent(component)).join('/')
+    }`
+    return { url, contentType: this._getContentTypeFromExtension(path) }
   }
 
   // Maps the request for a given resource and representation format to a server file
@@ -94,7 +97,7 @@ class ResourceMapper {
     let isFolder = filePath.endsWith('/')
     let isIndex = searchIndex && filePath.endsWith('/')
 
-    // Create the path for a new ressource
+    // Create the path for a new resource
     let path
     if (createIfNotExists) {
       path = filePath
@@ -106,8 +109,8 @@ class ResourceMapper {
         path += this._indexFilename
       }
       // If the extension is not correct for the content type, append the correct extension
-      if (!isFolder && this._getContentTypeByExtension(path) !== contentType) {
-        path += `$${contentType in extensions ? `.${extensions[contentType][0]}` : '.unknown'}`
+      if (!isFolder) {
+        path = this._addContentTypeExtension(path, contentType)
       }
     // Determine the path of an existing file
     } else {
@@ -136,7 +139,7 @@ class ResourceMapper {
         }
       }
       path = `${folder}${match}`
-      contentType = this._getContentTypeByExtension(match)
+      contentType = this._getContentTypeFromExtension(match)
     }
     return { path, contentType: contentType || this._defaultContentType }
   }
@@ -157,11 +160,25 @@ class ResourceMapper {
   }
 
   // Gets the expected content type based on the extension of the path
-  _getContentTypeByExtension (path) {
+  _getContentTypeFromExtension (path) {
     const extension = /\.([^/.]+)$/.exec(path)
     return extension && this._types[extension[1].toLowerCase()] || this._defaultContentType
   }
 
+  // Appends an extension for the specific content type, if needed
+  _addContentTypeExtension (path, contentType) {
+    // If we would guess the wrong content type from the extension, try appending a better one
+    const contentTypeFromExtension = this._getContentTypeFromExtension(path)
+    if (contentTypeFromExtension !== contentType) {
+      // Some extensions fit multiple content types, so only switch if there's an improvement
+      const newExtension = contentType in extensions ? extensions[contentType][0] : 'unknown'
+      if (this._types[newExtension] !== contentTypeFromExtension) {
+        path += `$.${newExtension}`
+      }
+    }
+    return path
+  }
+
   // Removes possible trailing slashes from a path
   _removeTrailingSlash (path) {
     return path.replace(/\/+$/, '')