Avoid problem with URIs with spaces.

Author: Tim Berners-Lee

lib/handlers/get.js

@@ -135,7 +135,7 @@ async function globHandler (req, res, next) {
   const ldp = req.app.locals.ldp
   // TODO: This is a hack, that does not check if the target file exists, as this is quite complex with globbing.
   // TODO: Proper support for this is not implemented, as globbing support might be removed in the future.
-  const filename = ldp.resourceMapper.getFullPath(req)
+  const filename = ldp.resourceMapper.getFilePath(req)
   const requestUri = (await ldp.resourceMapper.mapFileToUrl({ path: filename, hostname: req.hostname })).url
 
   const globOptions = {

lib/handlers/put.js

@@ -36,8 +36,9 @@ async function putStream (req, res, next, stream = req) {
 async function putAcl (req, res, next) {
   const ldp = req.app.locals.ldp
   const contentType = req.get('content-type')
-  const path = ldp.resourceMapper.getFullPath(req)
-  const requestUri = await ldp.resourceMapper.resolveUrl(req.hostname, path)
+  const filename = ldp.resourceMapper.getFilePath(req) // @@ Note: weird to go through filename @@
+  const requestUri = (await ldp.resourceMapper.mapFileToUrl({ path: filename, hostname: req.hostname })).url
+
   if (ldp.isValidRdf(req.body, requestUri, contentType)) {
     const stream = stringToStream(req.body)
     return putStream(req, res, next, stream)

lib/resource-mapper.js

@@ -44,8 +44,8 @@ class ResourceMapper {
   // Maps the request for a given resource and representation format to a server file
   // When searchIndex is true and the URL ends with a '/', and contentType includes 'text/html' indexFilename will be matched.
   async mapUrlToFile ({ url, contentType, createIfNotExists, searchIndex = true }) {
-    let fullPath = this.getFullPath(url)
-    let isIndex = searchIndex && fullPath.endsWith('/')
+    let fullFilePath = this.getFilePath(url)
+    let isIndex = searchIndex && fullFilePath.endsWith('/')
     let path
 
     // Append index filename if the URL ends with a '/'
@@ -54,21 +54,21 @@ class ResourceMapper {
         throw new Error(`Index file needs to have ${this._indexContentType} as content type`)
       }
       if (contentType && contentType.includes(this._indexContentType)) {
-        fullPath += this._indexFilename
+        fullFilePath += this._indexFilename
       }
     }
     // Create the path for a new file
     if (createIfNotExists) {
-      path = fullPath
+      path = fullFilePath
       // If the extension is not correct for the content type, append the correct extension
       if (searchIndex && this._getContentTypeByExtension(path) !== contentType) {
         path += `$${contentType in extensions ? `.${extensions[contentType][0]}` : '.unknown'}`
       }
     // Determine the path of an existing file
     } else {
       // Read all files in the corresponding folder
-      const filename = fullPath.substr(fullPath.lastIndexOf('/') + 1)
-      const folder = fullPath.substr(0, fullPath.length - filename.length)
+      const filename = fullFilePath.substr(fullFilePath.lastIndexOf('/') + 1)
+      const folder = fullFilePath.substr(0, fullFilePath.length - filename.length)
 
       // Find a file with the same name (minus the dollar extension)
       let match = searchIndex ? await this._getMatchingFile(folder, filename, isIndex, contentType) : ''
@@ -79,7 +79,7 @@ class ResourceMapper {
         if (isIndex) {
           match = ''
         } else {
-          throw new HTTPError(404, `File not found: ${fullPath}`)
+          throw new HTTPError(404, `File not found: ${fullFilePath}`)
         }
       }
       path = `${folder}${match}`
@@ -101,17 +101,17 @@ class ResourceMapper {
   }
 
   async getRepresentationUrlForResource (resourceUrl) {
-    let fullPath = this.getFullPath(resourceUrl)
-    let isIndex = fullPath.endsWith('/')
+    let fullFilePath = this.getFilePath(resourceUrl)
+    let isIndex = fullFilePath.endsWith('/')
 
     // Append index filename if the URL ends with a '/'
     if (isIndex) {
-      fullPath += this._indexFilename
+      fullFilePath += this._indexFilename
     }
 
     // Read all files in the corresponding folder
-    const filename = fullPath.substr(fullPath.lastIndexOf('/') + 1)
-    const folder = fullPath.substr(0, fullPath.length - filename.length)
+    const filename = fullFilePath.substr(fullFilePath.lastIndexOf('/') + 1)
+    const folder = fullFilePath.substr(0, fullFilePath.length - filename.length)
     const files = await this._readdir(folder)
 
     // Find a file with the same name (minus the dollar extension)
@@ -141,13 +141,13 @@ class ResourceMapper {
   }
 
   // Determine the full file path corresponding to a URL
-  getFullPath (url) {
+  getFilePath (url) {
     const { pathname, hostname } = this._parseUrl(url)
-    const fullPath = decodeURIComponent(`${this.getBasePath(hostname)}${pathname}`)
-    if (fullPath.indexOf('/..') >= 0) {
+    const fullFilePath = decodeURIComponent(`${this.getBasePath(hostname)}${pathname}`)
+    if (fullFilePath.indexOf('/..') >= 0) {
       throw new Error('Disallowed /.. segment in URL')
     }
-    return fullPath
+    return fullFilePath
   }
 
   // Parses a URL into a hostname and pathname