186526
/
unpkg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: decode `%40` before splitting URLs by `@`

This commit is contained in:
William Hilton 2019-01-02 15:32:09 -05:00 committed by GitHub
parent ca35d2659f
commit 6740f76d17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
modules/utils
parsePackageURL.js

21
modules/utils/parsePackageURL.js
View File

@ -2,20 +2,13 @@ const url = require('url');
const packageURLFormat = /^\/((?:@[^/@]+\/)?[^/@]+)(?:@([^/]+))?(\/.*)?$/;
function decodeParam(param) {
if (param) {
try {
return decodeURIComponent(param);
} catch (error) {
// Ignore invalid params.
}
}
return '';
}
function parsePackageURL(originalURL) {
const { pathname, search, query } = url.parse(originalURL, true);
try {
pathname = decodeURIComponent(pathname);
} catch (error) {
return null;
}
const match = packageURLFormat.exec(pathname);
// Disallow invalid URL formats.
@ -24,8 +17,8 @@ function parsePackageURL(originalURL) {
}
const packageName = match[1];
const packageVersion = decodeParam(match[2]) || 'latest';
const filename = decodeParam(match[3]);
const packageVersion = match[2] || 'latest';
const filename = match[3] || '';
return {
// If the URL is /@scope/name@version/file.js?main=browser: