Merge pull request #1052 from solid/fix/put-validate-request-uri

Fix that should create a correct base URI wrt validation when PUTing TTL-files

Author: kjetilk

lib/handlers/get.js

@@ -134,7 +134,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.getFullPath(req)
   const requestUri = (await ldp.resourceMapper.mapFileToUrl({ path: filename, hostname: req.hostname })).url
 
   const globOptions = {

lib/handlers/put.js

@@ -36,7 +36,8 @@ 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 requestUri = `${req.protocol}//${req.get('host')}${req.originalUrl}`
+  const path = ldp.resourceMapper.getFullPath(req)
+  const requestUri = await ldp.resourceMapper.resolveUrl(req.hostname, path)
   if (ldp.isValidRdf(req.body, requestUri, contentType)) {
     const stream = stringToStream(req.body)
     return putStream(req, res, next, stream)

lib/resource-mapper.js

@@ -42,7 +42,7 @@ class ResourceMapper {
   // When the URL ends with a '/', then files with the prefix 'index.' will be matched,
   // such as 'index.html' and 'index.ttl', unless searchIndex is false.
   async mapUrlToFile ({ url, contentType, createIfNotExists, searchIndex = true }) {
-    let fullPath = this._getFullPath(url)
+    let fullPath = this.getFullPath(url)
     let isIndex = searchIndex && fullPath.endsWith('/')
     let path
 
@@ -111,7 +111,7 @@ class ResourceMapper {
   }
 
   // Determine the full file path corresponding to a URL
-  _getFullPath (url) {
+  getFullPath (url) {
     const { pathname, hostname } = this._parseUrl(url)
     const fullPath = decodeURIComponent(`${this.getBasePath(hostname)}${pathname}`)
     if (fullPath.indexOf('/..') >= 0) {