Merge pull request #1028 from joachimvh/fix/windows

Fix path-related Windows problems

Author: kjetilk

lib/handlers/index.js

@@ -5,6 +5,7 @@ const debug = require('debug')('solid:index')
 const utils = require('../utils')
 const Negotiator = require('negotiator')
 const url = require('url')
+const URI = require('urijs')
 
 function handler (req, res, next) {
   const indexFile = 'index.html'
@@ -21,7 +22,7 @@ function handler (req, res, next) {
     }
     // redirect to the right container if missing trailing /
     if (req.path.lastIndexOf('/') !== req.path.length - 1) {
-      return res.redirect(301, path.join(req.path, '/'))
+      return res.redirect(301, URI.joinPaths(req.path, '/', '//').toString())
     }
 
     if (requestedType && requestedType.indexOf('text/html') !== 0) {

lib/header.js

@@ -53,7 +53,7 @@ function linksHandler (req, res, next) {
     return next(error(404, 'Trying to access metadata file as regular file'))
   }
   let fileMetadata = new metadata.Metadata()
-  if (filename.endsWith('/')) {
+  if (req.path.endsWith('/')) {
     fileMetadata.isContainer = true
     fileMetadata.isBasicContainer = true
   } else {

lib/ldp.js

@@ -17,6 +17,7 @@ const ldpContainer = require('./ldp-container')
 const parse = require('./utils').parse
 const fetch = require('node-fetch')
 const { promisify } = require('util')
+const URI = require('urijs')
 
 const DEFAULT_CONTENT_TYPE = 'text/turtle'
 
@@ -263,7 +264,7 @@ class LDP {
     const filePath = utils.uriToFilename(resourcePath, root, host)
 
     // PUT requests not supported on containers. Use POST instead
-    if (filePath.endsWith('/')) {
+    if (resourcePath.endsWith('/')) {
       return callback(error(409,
         'PUT not supported on containers, use POST instead'))
     }
@@ -420,6 +421,11 @@ class LDP {
         return callback(error(err, 'Can\'t find file requested: ' + filename))
       }
 
+      // windows does not differentiate between file paths with or without trailing slash
+      if (reqPath.substr(-1) === '/' && !stats.isDirectory()) {
+        return callback(error(404, 'Can\'t find directory requested: ' + filename))
+      }
+
       // Just return, since resource exists
       if (!includeBody) {
         return callback(null, {'stream': stats, 'contentType': contentType, 'container': stats.isDirectory()})
@@ -540,13 +546,13 @@ class LDP {
       // Verify whether the new path already exists
       return self.exists(host, newPath).then(
         // If it does, generate another one
-        () => ensureNotExists(self, path.join(containerURI,
-                `${uuid.v1().split('-')[0]}-${filename}`)),
+        () => ensureNotExists(self, URI.joinPaths(containerURI,
+                `${uuid.v1().split('-')[0]}-${filename}`).toString()),
         // If not, we found an appropriate path
         () => newPath
       )
     }
-    return ensureNotExists(this, path.join(containerURI, filename))
+    return ensureNotExists(this, URI.joinPaths(containerURI, filename).toString())
   }
 }
 module.exports = LDP

lib/resource-mapper.js

@@ -58,7 +58,8 @@ class ResourceMapper {
   // Maps a given server file to a URL
   async mapFileToUrl ({ path, hostname }) {
     // Determine the URL by chopping off everything after the dollar sign
-    const pathname = this._removeDollarExtension(path.substring(this._rootPath.length))
+    let pathname = this._removeDollarExtension(path.substring(this._rootPath.length))
+    pathname = this._replaceBackslashes(pathname)
     const url = `${this.getBaseUrl(hostname)}${encodeURI(pathname)}`
     return { url, contentType: this._getContentTypeByExtension(path) }
   }
@@ -101,6 +102,10 @@ class ResourceMapper {
     const dollarPos = path.lastIndexOf('$')
     return dollarPos < 0 ? path : path.substr(0, dollarPos)
   }
+
+  _replaceBackslashes (path) {
+    return path.replace(/\\/g, '/')
+  }
 }
 
 module.exports = ResourceMapper