Skip to content

Resource mapper properly encodes special characters in the uri #1327

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jaxoncreed merged 7 commits into from
Nov 4, 2019
Merged

Resource mapper properly encodes special characters in the uri #1327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
364be6b
Resource mapper properly encodes special characters in the uri
Oct 23, 2019
508bc86
Use path.sep
Oct 23, 2019
a7db6af
Merge branch 'master' of https://github.com/solid/node-solid-server i…
Nov 4, 2019
30f1216
Resource mapper properly encodes special characters in the uri
Oct 23, 2019
89ba51e
Use path.sep
Oct 23, 2019
e0b3a64
Merge fix/1324 with dev
Nov 4, 2019
68f8fca
Correct _getContentTypeFromExtension name
Nov 4, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/resource-mapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ const { promisify } = require('util')
const { types, extensions } = require('mime-types')
const readdir = promisify(fs.readdir)
const HTTPError = require('./http-error')
const pathUtil = require('path')

/*
* A ResourceMapper maintains the mapping between HTTP URLs and server filenames,
Expand Down Expand Up @@ -78,7 +79,9 @@ class ResourceMapper {

// Determine the URL by chopping off everything after the dollar sign
const pathname = this._removeDollarExtension(path)
const url = `${this.resolveUrl(hostname)}${encodeURI(pathname)}`
const url = `${this.resolveUrl(hostname)}${
pathname.split(pathUtil.sep).map((component) => encodeURIComponent(component)).join('/')
}`
return { url, contentType: this._getContentTypeFromExtension(path) }
}

Expand Down
7 changes: 7 additions & 0 deletions test/unit/resource-mapper-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,6 +489,13 @@ describe('ResourceMapper', () => {
url: 'http://localhost/space/foo%20bar%20bar.html',
contentType: 'text/html'
})

itMapsFile(mapper, 'a file with even stranger disallowed IRI characters',
{ path: `${rootPath}space/Blog discovery for the future? · Issue #96 · scripting:Scripting-News · GitHub.pdf` },
{
url: 'http://localhost/space/Blog%20discovery%20for%20the%20future%3F%20%C2%B7%20Issue%20%2396%20%C2%B7%20scripting%3AScripting-News%20%C2%B7%20GitHub.pdf',
contentType: 'application/pdf'
})
})

describe('A ResourceMapper instance for a multi-host setup', () => {
Expand Down