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.

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

feat(auth): Add basic auth support for pathed registries #5322

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ Please add one entry in this file for each change in Yarn's behavior. Use the sa

## Master

*Nothing yet*
- Adds support for basic auth for registries with paths, such as artifactory

[#5322](https://github.com/yarnpkg/yarn/pull/5322) - [**Karolis Narkevicius**](https://twitter.com/KidkArolis)

## 1.12.0

Expand Down
51 changes: 50 additions & 1 deletion __tests__/registries/npm-registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@ import NpmRegistry from '../../src/registries/npm-registry.js';
import {BufferReporter} from '../../src/reporters/index.js';
import homeDir, {home} from '../../src/util/user-home-dir.js';

function basicAuth(username, password): string {
const pw = Buffer.from(String(password), 'base64').toString();
return Buffer.from(String(username) + ':' + pw).toString('base64');
}

describe('normalizeConfig', () => {
beforeAll(() => {
process.env.REPLACE = 'REPLACED';
Expand Down Expand Up @@ -554,6 +559,46 @@ describe('request', () => {
},
],
},
{
title: 'using username/password config for registries where pathnames play a role',
config: {
'@private:registry': 'https://registry.myorg.com/api/npm/registry/',
'//registry.myorg.com/api/npm/registry/:username': 'scopedPrivateUsername',
'//registry.myorg.com/api/npm/registry/:_password': 'scopedPrivatePassword',
'//registry.myorg.com/api/packages/:username': 'scopedPrivateUsername',
'//registry.myorg.com/api/packages/:_password': 'scopedPrivatePassword',
},
requests: [
{
url: '@private/pkg',
pkg: '@private/pkg',
expect: {
root: 'https://registry.myorg.com/api/npm/registry/',
auth: basicAuth('scopedPrivateUsername', 'scopedPrivatePassword'),
basicAuth: true,
},
},
{
url: 'https://some.cdn.com/some-hash/@private-pkg-1.0.0.tar.gz',
pkg: '@private/pkg',
expect: {root: 'https://some.cdn.com', auth: false},
},
{
url: 'https://some.cdn.com/@private/pkg',
pkg: null,
expect: {root: 'https://some.cdn.com', auth: false},
},
{
url: 'https://registry.myorg.com/api/packages/private---pkg.tar.gz',
pkg: '@private/pkg',
expect: {
root: 'https://registry.myorg.com/api/packages/',
auth: basicAuth('scopedPrivateUsername', 'scopedPrivatePassword'),
basicAuth: true,
},
},
],
},
];

testCases.forEach(testCase => {
Expand All @@ -566,7 +611,11 @@ describe('request', () => {
(req.skip ? it.skip : req.only ? it.only : it)(desc, () => {
const requestParams = registry.request(req.url, {}, req.pkg);
expect(requestParams.url.substr(0, req.expect.root.length)).toBe(req.expect.root);
expect(requestParams.headers.authorization).toBe(req.expect.auth ? `Bearer ${req.expect.auth}` : undefined);
if (req.expect.basicAuth) {
expect(requestParams.headers.authorization).toBe(req.expect.auth ? `Basic ${req.expect.auth}` : undefined);
} else {
expect(requestParams.headers.authorization).toBe(req.expect.auth ? `Bearer ${req.expect.auth}` : undefined);
}
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion src/registries/npm-registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ export default class NpmRegistry extends Registry {
const requestParts = urlParts(requestUrl);
return !!Object.keys(config).find(option => {
const parts = option.split(':');
if (parts.length === 2 && parts[1] === '_authToken') {
if ((parts.length === 2 && parts[1] === '_authToken') || parts[1] === '_password') {
const registryParts = urlParts(parts[0]);
if (requestParts.host === registryParts.host && requestParts.path.startsWith(registryParts.path)) {
return true;
Expand Down