Skip to content

reject url with %2F #1678

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

Closed
bourgeoa wants to merge 2 commits into from
Closed

reject url with %2F #1678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f78c575
reject url with %2F
bourgeoa Mar 6, 2022
724d6f4
update following comments
bourgeoa Mar 7, 2022
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
16 changes: 10 additions & 6 deletions lib/resource-mapper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,17 +151,21 @@ class ResourceMapper {

// Parses a URL into hostname and pathname
_parseUrl (url) {
let parsed
// URL specified as string
if (typeof url === 'string') {
return URL.parse(url)
}
parsed = URL.parse(url)
// URL specified as Express request object
if (!url.pathname && url.path) {
} else if (!url.pathname && url.path) {
const { hostname, path } = url
return { hostname, pathname: path.replace(/[?#].*/, '') }
}
parsed = { hostname, pathname: path.replace(/[?#].*/, '') }
// URL specified as object
return url
} else {
parsed = url
}
// reject Url containning %encoded /
if (parsed.pathname.includes('%2F')) throw new Error('Url cannot contain %2F (%encoded /)')
return parsed
}

// Gets the expected content type based on the extension of the path
Expand Down
12 changes: 10 additions & 2 deletions test/unit/resource-mapper-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ describe('ResourceMapper', () => {

itMapsUrl(mapper, 'a URL of a new file with encoded characters',
{
url: 'http://localhost/space%2Ffoo%20bar%20bar.html',
url: 'http://localhost/space/foo%20bar%20bar.html',
contentType: 'text/html',
createIfNotExists: true
},
Expand All @@ -235,6 +235,14 @@ describe('ResourceMapper', () => {
contentType: 'text/html'
})

itMapsUrl(mapper, 'a URL of a new file with encoded characters',
{
url: 'http://localhost/space%2Ffoo%20bar%20bar.html',
contentType: 'text/html',
createIfNotExists: true
},
new Error('Url cannot contain %2F (%encoded /)'))

itMapsUrl(mapper, 'a URL of an existing .acl file',
{
url: 'http://localhost/space/.acl'
Expand Down Expand Up @@ -413,7 +421,7 @@ describe('ResourceMapper', () => {
{
url: 'http://localhost/space%2F..%2Fbar'
},
new Error('Disallowed /.. segment in URL'))
new Error('Url cannot contain %2F (%encoded /)'))

// File to URL mapping

Expand Down