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

feat: support scoped client certificates #7626

Merged
merged 18 commits into from
Feb 14, 2024
Merged

feat: support scoped client certificates #7626

Changes from 1 commit
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
c287f7f
feat: support scoped client certificates
nachoaldamav Jan 22, 2024
78596f9
feat: bump `@pnpm/network.agent`
nachoaldamav Feb 7, 2024
5b01af9
style: fix unknown word
nachoaldamav Feb 7, 2024
07637a2
fix: add `TLSV` as a known word
nachoaldamav Feb 7, 2024
c5a3c64
fix: cspell array order
nachoaldamav Feb 7, 2024
c6affea
fix: type error
nachoaldamav Feb 7, 2024
ee12ec6
Merge branch 'main' into support-client-certs
zkochan Feb 8, 2024
8f4a42c
Merge remote-tracking branch 'origin/main' into support-client-certs
zkochan Feb 10, 2024
601b309
Merge remote-tracking branch 'origin/main' into support-client-certs
zkochan Feb 13, 2024
b74d388
fix: update deps
zkochan Feb 13, 2024
cf73260
test: match missing cert code for Node v18
nachoaldamav Feb 13, 2024
65d6f18
refactor: read ssl config in @pnpm/config
zkochan Feb 13, 2024
eff2b7f
test: fix
zkochan Feb 14, 2024
a5780b3
test: fix
zkochan Feb 14, 2024
5a56e04
test: fix
zkochan Feb 14, 2024
f3a0d46
test: fix
zkochan Feb 14, 2024
4ca4328
refactor: fetch test
zkochan Feb 14, 2024
3bcb7cc
docs: add changesets
zkochan Feb 14, 2024
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
Prev Previous commit
Next Next commit
style: fix unknown word
  • Loading branch information
@nachoaldamav
nachoaldamav committed Feb 7, 2024
commit 5b01af92ec16eb81c783673f9b6a98ca9c44c38b
14 changes: 7 additions & 7 deletions network/fetch/src/fetchFromRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export type { AgentOptions }

function getUserCertificates (authOptions: Record<string, string>) {
// Get all the auth options that have :certfile or :keyfile in their name
const certAuths: {
const clientCerts: {
[registry: string]: {
ca?: string
cert: string
Expand All @@ -44,21 +44,21 @@ function getUserCertificates (authOptions: Record<string, string>) {
if (key.includes(':certfile') || key.includes(':keyfile') || key.includes(':cafile')) {
// Split by '/:' because the registry may contain a port
const registry = key.split('/:')[0] + '/'
if (!certAuths[registry]) {
certAuths[registry] = { cert: '', key: '' }
if (!clientCerts[registry]) {
clientCerts[registry] = { cert: '', key: '' }
}

if (key.includes(':certfile')) {
certAuths[registry].cert = readFileSync(value, 'utf8')
clientCerts[registry].cert = readFileSync(value, 'utf8')
} else if (key.includes(':keyfile')) {
certAuths[registry].key = readFileSync(value, 'utf8')
clientCerts[registry].key = readFileSync(value, 'utf8')
} else if (key.includes(':cafile')) {
certAuths[registry].ca = readFileSync(value, 'utf8')
clientCerts[registry].ca = readFileSync(value, 'utf8')
}
}
}

return certAuths
return clientCerts
}

export function createFetchFromRegistry (
Expand Down