Skip to content

Commit 741bccf

Browse files
wraithgarwraithgar
committed
deps: @npmcli/config@4.2.1
 * correctly handle nerf-darted env vars
1 parent daaf461 commit 741bccf

10 files changed

Lines changed: 670 additions & 19 deletions

File tree

‎node_modules/@npmcli/config/lib/index.js‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ class Config {
296296
// might be a security hazard, which was the intention.
297297
try {
298298
this.setCredentialsByURI(reg, creds)
299+
// eslint-disable-next-line no-empty
299300
} catch (_) {}
300301
process.emit('timeEnd', 'config:load:credentials')
301302

@@ -366,9 +367,11 @@ class Config {
366367
if (!/^npm_config_/i.test(envKey) || envVal === '') {
367368
continue
368369
}
369-
const key = envKey.slice('npm_config_'.length)
370-
.replace(/(?!^)_/g, '-') // don't replace _ at the start of the key
371-
.toLowerCase()
370+
let key = envKey.slice('npm_config_'.length)
371+
if (!key.startsWith('//')) { // don't normalize nerf-darted keys
372+
key = key.replace(/(?!^)_/g, '-') // don't replace _ at the start of the key
373+
.toLowerCase()
374+
}
372375
conf[key] = envVal
373376
}
374377
this[_loadObject](conf, 'env', 'environment')
@@ -654,6 +657,7 @@ class Config {
654657
// saved back to the .npmrc file, so we're good.
655658
try {
656659
this.setCredentialsByURI(reg, creds)
660+
// eslint-disable-next-line no-empty
657661
} catch (_) {}
658662
}
659663

@@ -691,8 +695,6 @@ class Config {
691695
this.delete(`_password`, 'user')
692696
this.delete(`username`, 'user')
693697
}
694-
this.delete(`${nerfed}:-authtoken`, 'user')
695-
this.delete(`${nerfed}:_authtoken`, 'user')
696698
this.delete(`${nerfed}:_authToken`, 'user')
697699
this.delete(`${nerfed}:_auth`, 'user')
698700
this.delete(`${nerfed}:_password`, 'user')
@@ -732,8 +734,6 @@ class Config {
732734
// send auth if we have it, only to the URIs under the nerf dart.
733735
this.delete(`${nerfed}:always-auth`, 'user')
734736

735-
this.delete(`${nerfed}:-authtoken`, 'user')
736-
this.delete(`${nerfed}:_authtoken`, 'user')
737737
this.delete(`${nerfed}:email`, 'user')
738738
if (certfile && keyfile) {
739739
this.set(`${nerfed}:certfile`, certfile, 'user')
@@ -781,8 +781,6 @@ class Config {
781781
}
782782

783783
const tokenReg = this.get(`${nerfed}:_authToken`) ||
784-
this.get(`${nerfed}:_authtoken`) ||
785-
this.get(`${nerfed}:-authtoken`) ||
786784
nerfed === nerfDart(this.get('registry')) && this.get('_authToken')
787785

788786
if (tokenReg) {

‎node_modules/@npmcli/config/node_modules/.bin/nopt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../nopt/bin/nopt.js

‎node_modules/@npmcli/config/node_modules/nopt/LICENSE‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
The ISC License
2+
3+
Copyright (c) Isaac Z. Schlueter and Contributors
4+
5+
Permission to use, copy, modify, and/or distribute this software for any
6+
purpose with or without fee is hereby granted, provided that the above
7+
copyright notice and this permission notice appear in all copies.
8+
9+
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10+
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11+
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12+
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13+
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14+
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR
15+
IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.

‎node_modules/@npmcli/config/node_modules/nopt/bin/nopt.js‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
#!/usr/bin/env node
2+
var nopt = require('../lib/nopt')
3+
var path = require('path')
4+
var types = { num: Number,
5+
bool: Boolean,
6+
help: Boolean,
7+
list: Array,
8+
'num-list': [Number, Array],
9+
'str-list': [String, Array],
10+
'bool-list': [Boolean, Array],
11+
str: String,
12+
clear: Boolean,
13+
config: Boolean,
14+
length: Number,
15+
file: path,
16+
}
17+
var shorthands = { s: ['--str', 'astring'],
18+
b: ['--bool'],
19+
nb: ['--no-bool'],
20+
tft: ['--bool-list', '--no-bool-list', '--bool-list', 'true'],
21+
'?': ['--help'],
22+
h: ['--help'],
23+
H: ['--help'],
24+
n: ['--num', '125'],
25+
c: ['--config'],
26+
l: ['--length'],
27+
f: ['--file'],
28+
}
29+
var parsed = nopt(types
30+
, shorthands
31+
, process.argv
32+
, 2)
33+
34+
console.log('parsed', parsed)
35+
36+
if (parsed.help) {
37+
console.log('')
38+
console.log('nopt cli tester')
39+
console.log('')
40+
console.log('types')
41+
console.log(Object.keys(types).map(function M (t) {
42+
var type = types[t]
43+
if (Array.isArray(type)) {
44+
return [t, type.map(function (mappedType) {
45+
return mappedType.name
46+
})]
47+
}
48+
return [t, type && type.name]
49+
}).reduce(function (s, i) {
50+
s[i[0]] = i[1]
51+
return s
52+
}, {}))
53+
console.log('')
54+
console.log('shorthands')
55+
console.log(shorthands)
56+
}

0 commit comments

Comments
 (0)