Merge branch 'master' into dz_oidc

Author: dmitrizagidulin

lib/capability-discovery.js

@@ -47,7 +47,7 @@ function capabilityDiscovery () {
 function serviceCapabilityDocument (serviceConfig) {
   return (req, res) => {
     // Add the server root url
-    serviceConfig.root = util.uriBase(req) // TODO make sure we align with the rest
+    serviceConfig.root = util.getFullUri(req) // TODO make sure we align with the rest
     // Add the 'apps' urls section
     serviceConfig.apps = req.app.locals.appUrls
     res.json(serviceConfig)

lib/handlers/allow.js

@@ -27,7 +27,7 @@ function allow (mode) {
       }
 
       // Obtain and store the ACL of the requested resource
-      const baseUri = utils.uriBase(req)
+      const baseUri = utils.getBaseUri(req)
       req.acl = new ACL(baseUri + reqPath, {
         origin: req.get('origin'),
         host: req.protocol + '://' + req.get('host'),

lib/handlers/copy.js

@@ -20,7 +20,7 @@ function handler (req, res, next) {
     return next(error(400, 'Source header required'))
   }
   const fromExternal = !!url.parse(copyFrom).hostname
-  const serverRoot = utils.uriBase(req)
+  const serverRoot = utils.getBaseUri(req)
   const copyFromUrl = fromExternal ? copyFrom : serverRoot + copyFrom
   const copyTo = res.locals.path || req.path
   const copyToPath = utils.reqToPath(req)
@@ -33,6 +33,6 @@ function handler (req, res, next) {
     }
     res.set('Location', copyTo)
     res.sendStatus(201)
-    return next()
+    next()
   })
 }

lib/handlers/get.js

@@ -24,7 +24,7 @@ function handler (req, res, next) {
   var ldp = req.app.locals.ldp
   var includeBody = req.method === 'GET'
   var negotiator = new Negotiator(req)
-  var baseUri = utils.uriBase(req)
+  var baseUri = utils.getFullUri(req)
   var path = res.locals.path || req.path
   var requestedType = negotiator.mediaType()
   var possibleRDFType = negotiator.mediaType(RDFs)
@@ -140,7 +140,7 @@ function globHandler (req, res, next) {
   var ldp = req.app.locals.ldp
   var root = !ldp.idp ? ldp.root : ldp.root + req.hostname + '/'
   var filename = utils.uriToFilename(req.path, root)
-  var uri = utils.uriBase(req)
+  var uri = utils.getFullUri(req)
   const requestUri = url.resolve(uri, req.path)
 
   var globOptions = {
@@ -158,9 +158,11 @@ function globHandler (req, res, next) {
     // Matches found
     var globGraph = $rdf.graph()
 
+    let reqOrigin = utils.getBaseUri(req)
+
     debugGlob('found matches ' + matches)
     async.each(matches, function (match, done) {
-      var baseUri = utils.filenameToBaseUri(match, uri, root)
+      var baseUri = utils.filenameToBaseUri(match, reqOrigin, root)
       fs.readFile(match, {encoding: 'utf8'}, function (err, fileData) {
         if (err) {
           debugGlob('error ' + err)

lib/handlers/options.js

@@ -22,7 +22,7 @@ function linkAuthProvider (req, res) {
 }
 
 function linkServiceEndpoint (req, res) {
-  let serviceEndpoint = `${utils.uriBase(req)}/.well-known/solid`
+  let serviceEndpoint = `${utils.getFullUri(req)}/.well-known/solid`
   addLink(res, serviceEndpoint, 'service')
 }
 

lib/handlers/patch.js

@@ -29,7 +29,7 @@ function patchHandler (req, res, next) {
   const root = !ldp.idp ? ldp.root : `${ldp.root}${req.hostname}/`
   const target = {}
   target.file = utils.uriToFilename(req.path, root)
-  target.uri = utils.uriAbs(req) + req.originalUrl
+  target.uri = utils.getBaseUri(req) + req.originalUrl
   target.contentType = mime.lookup(target.file) || DEFAULT_TARGET_TYPE
   debug('PATCH -- Target <%s> (%s)', target.uri, target.contentType)
 

lib/ldp-container.js

@@ -12,6 +12,7 @@ var ns = require('solid-namespace')($rdf)
 var S = require('string')
 // var turtleExtension = '.ttl'
 var mime = require('mime-types')
+const url = require('url')
 
 function addContainerStats (ldp, reqUri, filename, resourceGraph, next) {
   ldp.stat(filename, function (err, containerStats) {
@@ -37,8 +38,10 @@ function addFile (ldp, resourceGraph, containerUri, reqUri, uri, container, file
     return callback(null)
   }
 
+  let filePath = url.resolve(container, file)
+
   // Get file stats
-  ldp.stat(container + file, function (err, stats) {
+  ldp.stat(filePath, function (err, stats) {
     if (err) {
       // File does not exist, skip
       return callback(null)

lib/ldp.js

@@ -171,7 +171,7 @@ class LDP {
           async.each(
             files,
             function (file, cb) {
-              let fileUri = reqUri + encodeURIComponent(file)
+              let fileUri = url.resolve(reqUri, encodeURIComponent(file))
               ldpContainer.addFile(ldp, resourceGraph, reqUri, fileUri, uri,
                 filename, file, cb)
             },
@@ -395,7 +395,7 @@ class LDP {
           if (err) {
             metaFile = ''
           }
-          let absContainerUri = baseUri + reqPath
+          let absContainerUri = url.resolve(baseUri, reqPath)
           ldp.listContainer(filename, absContainerUri, baseUri, metaFile, contentType,
             function (err, data) {
               if (err) {

lib/utils.js

@@ -1,9 +1,9 @@
 module.exports.uriToFilename = uriToFilename
 module.exports.uriToRelativeFilename = uriToRelativeFilename
 module.exports.filenameToBaseUri = filenameToBaseUri
-module.exports.uriAbs = uriAbs
+module.exports.getBaseUri = getBaseUri
 module.exports.pathBasename = pathBasename
-module.exports.uriBase = uriBase
+module.exports.getFullUri = getFullUri
 module.exports.hasSuffix = hasSuffix
 module.exports.getResourceLink = getResourceLink
 module.exports.parse = parse
@@ -20,7 +20,7 @@ var path = require('path')
 var S = require('string')
 var $rdf = require('rdflib')
 var from = require('from2')
-var url = require('url')
+const url = require('url')
 
 /**
  * Returns a fully qualified URL from an Express.js Request object.
@@ -98,12 +98,26 @@ function filenameToBaseUri (filename, uri, base) {
   return uri + '/' + uriPath
 }
 
-function uriAbs (req) {
+function getBaseUri (req) {
   return req.protocol + '://' + req.get('host')
 }
 
-function uriBase (req) {
-  return uriAbs(req) + (req.baseUrl || '')
+/**
+ * Composes and returns the fully-qualified URI for the request, to be used
+ * as a base URI for RDF parsing or serialization. For example, if a request
+ * is to `Host: example.com`, `GET /files/` using the `https:` protocol,
+ * then:
+ *
+ *   ```
+ *   getFullUri(req)  // -> 'https://example.com/files/'
+ *   ```
+ *
+ * @param req {IncomingMessage}
+ *
+ * @return {string}
+ */
+function getFullUri (req) {
+  return getBaseUri(req) + url.resolve(req.baseUrl, req.path)
 }
 
 function pathBasename (fullpath) {

package.json

@@ -1,7 +1,7 @@
 {
   "name": "solid-server",
   "description": "Solid server on top of the file-system",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "author": {
     "name": "Tim Berners-Lee",
     "email": "timbl@w3.org"