Fix utils.uriBase() and usage

Author: dmitrizagidulin

lib/handlers/allow.js

@@ -16,7 +16,7 @@ function allow (mode) {
     if (!ldp.webid) {
       return next()
     }
-    var baseUri = utils.uriBase(req)
+    var baseUri = utils.uriAbs(req)
 
     var acl = new ACL({
       debug: debug,

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.uriAbs(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/utils.js

@@ -19,6 +19,7 @@ var path = require('path')
 var S = require('string')
 var $rdf = require('rdflib')
 var from = require('from2')
+const url = require('url')
 
 function debrack (s) {
   if (s.length < 2) {
@@ -65,8 +66,22 @@ function uriAbs (req) {
   return req.protocol + '://' + req.get('host')
 }
 
+/**
+ * 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:
+ *
+ *   ```
+ *   uriBase(req)  // -> 'https://example.com/files/'
+ *   ```
+ *
+ * @param req {IncomingMessage}
+ *
+ * @return {string}
+ */
 function uriBase (req) {
-  return uriAbs(req) + (req.baseUrl || '')
+  return uriAbs(req) + url.resolve(req.baseUrl, req.path)
 }
 
 function pathBasename (fullpath) {