Do not expose rootPath.

Author: RubenVerborgh

lib/handlers/patch.js

@@ -67,7 +67,7 @@ async function patchHandler (req, res, next) {
     const result = await withLock(path, { mustExist: false }, async () => {
       const graph = await readGraph(resource)
       await applyPatch(patchObject, graph, url)
-      return writeGraph(graph, resource, ldp.resourceMapper.rootPath, ldp.serverUri)
+      return writeGraph(graph, resource, ldp.resourceMapper.getBaseFilePath(req.hostname), ldp.serverUri)
     })
 
     // Send the result to the client

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 URL = require('url')
 const URI = require('urijs')
 const withLock = require('./lock')
 
@@ -153,8 +154,7 @@ class LDP {
         originalPath += '/'
       }
     }
-    const { url: putUrl, contentType } = await this.resourceMapper.mapFileToUrl(
-      { path: this.resourceMapper.rootPath + resourcePath, hostname: host })
+    const { url: putUrl, contentType } = await this.resourceMapper.mapFileToUrl({ path: resourcePath, hostname: host })
 
     // 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
@@ -218,7 +218,8 @@ class LDP {
     // First check if we are above quota
     let isOverQuota
     try {
-      isOverQuota = await overQuota(this.resourceMapper.rootPath, this.serverUri)
+      const { hostname } = URL.parse(url.url || url)
+      isOverQuota = await overQuota(this.resourceMapper.getBaseFilePath(hostname), this.serverUri)
     } catch (err) {
       throw error(500, 'Error finding user quota')
     }

lib/resource-mapper.js

@@ -37,8 +37,29 @@ class ResourceMapper {
     }
   }
 
-  get rootPath () {
-    return this._rootPath
+  // Gets the base file path for the given hostname
+  getBaseFilePath (hostname) {
+    return !this._includeHost ? this._rootPath : `${this._rootPath}/${hostname}`
+  }
+
+  // Resolve a URL for the given hostname
+  // Optionally, a pathname may be passed that will be appended to the baseUrl.
+  resolveUrl (hostname, pathname = '') {
+    return !this._includeHost ? `${this._rootUrl}${pathname}`
+      : `${this._protocol}//${hostname}${this._port}${this._rootUrl}${pathname}`
+  }
+
+  // Maps a given server file to a URL
+  async mapFileToUrl ({ path, hostname }) {
+    // Remove the root path if specified
+    if (path.startsWith(this._rootPath)) {
+      path = path.substring(this._rootPath.length)
+    }
+
+    // Determine the URL by chopping off everything after the dollar sign
+    const pathname = this._removeDollarExtension(path)
+    const url = `${this.resolveUrl(hostname)}${encodeURI(pathname.replace(/\\/g, '/'))}`
+    return { url, contentType: this._getContentTypeByExtension(path) }
   }
 
   // Maps the request for a given resource and representation format to a server file
@@ -100,27 +121,6 @@ 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
-    let pathname = this._removeDollarExtension(path.substring(this._rootPath.length))
-    pathname = this._replaceBackslashes(pathname)
-    const url = `${this.resolveUrl(hostname)}${encodeURI(pathname)}`
-    return { url, contentType: this._getContentTypeByExtension(path) }
-  }
-
-  // Gets the base file path for the given hostname
-  getBaseFilePath (hostname) {
-    return !this._includeHost ? this._rootPath : `${this._rootPath}/${hostname}`
-  }
-
-  // Resolve a URL for the given hostname
-  // Optionally, a pathname may be passed that will be appended to the baseUrl.
-  resolveUrl (hostname, pathname = '') {
-    return !this._includeHost ? `${this._rootUrl}${pathname}`
-      : `${this._protocol}//${hostname}${this._port}${this._rootUrl}${pathname}`
-  }
-
   // Determine the full file path corresponding to a URL
   _getFilePath (url) {
     const { pathname, hostname } = this._parseUrl(url)
@@ -163,10 +163,6 @@ class ResourceMapper {
     const dollarPos = path.lastIndexOf('$')
     return dollarPos < 0 ? path : path.substr(0, dollarPos)
   }
-
-  _replaceBackslashes (path) {
-    return path.replace(/\\/g, '/')
-  }
 }
 
 module.exports = ResourceMapper

lib/server-config.js

@@ -20,7 +20,6 @@ function printDebugInfo (options) {
   debug.settings('Config path: ' + options.configPath)
   debug.settings('Suffix Acl: ' + options.suffixAcl)
   debug.settings('Suffix Meta: ' + options.suffixMeta)
-  debug.settings('Filesystem Root: ' + (this.resourceMapper ? this.resourceMapper.rootPath : 'none'))
   debug.settings('Allow WebID authentication: ' + !!options.webid)
   debug.settings('Live-updates: ' + !!options.live)
   debug.settings('Multi-user: ' + !!options.multiuser)