Skip to content
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

Fix the scope regex, allow / in addition to %2f in the url #4367

Merged
merged 3 commits into from
Sep 12, 2017
Merged

Fix the scope regex, allow / in addition to %2f in the url #4367

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
365207a
Fix the scope regex, allow / in addition to %2f in the url
KidkArolis Sep 8, 2017
a276b27
Merge branch 'master' into fix-scope-regex
BYK Sep 12, 2017
64bb9ae
Add more explanation about the inconsistency
BYK Sep 12, 2017
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
6 changes: 4 additions & 2 deletions __tests__/registries/npm-registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ describe('isRequestToRegistry functional test', () => {
const packageIdents = [
['normal', ''],
['@scopedNoPkg', ''],
['@scoped/notescaped', ''],
['@scoped/notescaped', '@scoped'],
['not@scope/pkg', ''],
['@scope?query=true', ''],
['@scope%2fpkg', '@scope'],
Expand All @@ -263,13 +263,15 @@ const packageIdents = [
['@scope%2fpkg%2f1.2.3', '@scope'],
['http://foo.bar:80/normal', ''],
['http://foo.bar:80/@scopedNoPkg', ''],
['http://foo.bar:80/@scoped/notescaped', ''],
['http://foo.bar:80/@scoped/notescaped', '@scoped'],
['http://foo.bar:80/@scoped/notescaped/download/@scoped/notescaped-1.0.0.tgz', '@scoped'],
['http://foo.bar:80/not@scope/pkg', ''],
['http://foo.bar:80/@scope?query=true', ''],
['http://foo.bar:80/@scope%2fpkg', '@scope'],
['http://foo.bar:80/@scope%2fpkg%2fext', '@scope'],
['http://foo.bar:80/@scope%2fpkg?query=true', '@scope'],
['http://foo.bar:80/@scope%2fpkg%2f1.2.3', '@scope'],
['http://foo.bar:80/@scope%2fpkg/download/@scope%2fpkg-1.0.0.tgz', '@scope'],
];

describe('isScopedPackage functional test', () => {
Expand Down
7 changes: 5 additions & 2 deletions src/registries/npm-registry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,11 @@ export const SCOPE_SEPARATOR = '%2f';
// All scoped package names are of the format `@scope%2fpkg` from the use of NpmRegistry.escapeName
// `(?:^|\/)` Match either the start of the string or a `/` but don't capture
// `[^\/?]+?` Match any character that is not '/' or '?' and capture, up until the first occurance of:
// `%2f` Match SCOPE_SEPARATOR, the escaped '/', and don't capture
const SCOPED_PKG_REGEXP = /(?:^|\/)(@[^\/?]+?)(?=%2f)/;
// `(?=%2f|\/)` Match SCOPE_SEPARATOR, the escaped '/', or a raw `/` and don't capture
// The reason for matching a plain `/` is NPM registry being inconsistent about escaping `/` in
// scoped package names: when you're fetching a tarball, it is not escaped, when you want info
// about the package, it is escaped.
const SCOPED_PKG_REGEXP = /(?:^|\/)(@[^\/?]+?)(?=%2f|\/)/;

// TODO: Use the method from src/cli/commands/global.js for this instead
function getGlobalPrefix(): string {
Expand Down