Skip to content

Commit 24cae6b

Browse files
aduh95targos
aduh95
authored and
targos
committed
repl: improve robustness wrt to prototype pollution
PR-URL: #45604 Reviewed-By: James M Snell <[email protected]>
1 parent 124c2b3 commit 24cae6b

File tree

5 files changed

+142
-27
lines changed

5 files changed

+142
-27
lines changed

‎lib/internal/debugger/inspect_repl.js

+19-18
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,15 @@ const {
2828
ReflectGetOwnPropertyDescriptor,
2929
ReflectOwnKeys,
3030
RegExpPrototypeExec,
31-
RegExpPrototypeSymbolReplace,
3231
SafeMap,
33-
SafePromiseAll,
32+
SafePromiseAllReturnArrayLike,
33+
SafePromiseAllReturnVoid,
3434
String,
3535
StringFromCharCode,
3636
StringPrototypeEndsWith,
3737
StringPrototypeIncludes,
3838
StringPrototypeRepeat,
39+
StringPrototypeReplaceAll,
3940
StringPrototypeSlice,
4041
StringPrototypeSplit,
4142
StringPrototypeStartsWith,
@@ -53,7 +54,7 @@ const Repl = require('repl');
5354
const vm = require('vm');
5455
const { fileURLToPath } = require('internal/url');
5556

56-
const { customInspectSymbol } = require('internal/util');
57+
const { customInspectSymbol, SideEffectFreeRegExpPrototypeSymbolReplace } = require('internal/util');
5758
const { inspect: utilInspect } = require('internal/util/inspect');
5859
const debuglog = require('internal/util/debuglog').debuglog('inspect');
5960

@@ -121,7 +122,7 @@ const {
121122
} = internalBinding('builtins');
122123
const NATIVES = internalBinding('natives');
123124
function isNativeUrl(url) {
124-
url = RegExpPrototypeSymbolReplace(/\.js$/, url, '');
125+
url = SideEffectFreeRegExpPrototypeSymbolReplace(/\.js$/, url, '');
125126

126127
return StringPrototypeStartsWith(url, 'node:internal/') ||
127128
ArrayPrototypeIncludes(PUBLIC_BUILTINS, url) ||
@@ -159,8 +160,8 @@ function markSourceColumn(sourceText, position, useColors) {
159160

160161
// Colourize char if stdout supports colours
161162
if (useColors) {
162-
tail = RegExpPrototypeSymbolReplace(/(.+?)([^\w]|$)/, tail,
163-
'\u001b[32m$1\u001b[39m$2');
163+
tail = SideEffectFreeRegExpPrototypeSymbolReplace(/(.+?)([^\w]|$)/, tail,
164+
'\u001b[32m$1\u001b[39m$2');
164165
}
165166

166167
// Return source line with coloured char at `position`
@@ -340,9 +341,9 @@ class ScopeSnapshot {
340341
StringPrototypeSlice(this.type, 1);
341342
const name = this.name ? `<${this.name}>` : '';
342343
const prefix = `${type}${name} `;
343-
return RegExpPrototypeSymbolReplace(/^Map /,
344-
utilInspect(this.properties, opts),
345-
prefix);
344+
return SideEffectFreeRegExpPrototypeSymbolReplace(/^Map /,
345+
utilInspect(this.properties, opts),
346+
prefix);
346347
}
347348
}
348349

@@ -517,7 +518,7 @@ function createRepl(inspector) {
517518
}
518519

519520
loadScopes() {
520-
return SafePromiseAll(
521+
return SafePromiseAllReturnArrayLike(
521522
ArrayPrototypeFilter(
522523
this.scopeChain,
523524
(scope) => scope.type !== 'global'
@@ -656,14 +657,14 @@ function createRepl(inspector) {
656657
(error) => `<${error.message}>`);
657658
const lastIndex = watchedExpressions.length - 1;
658659

659-
const values = await SafePromiseAll(watchedExpressions, inspectValue);
660+
const values = await SafePromiseAllReturnArrayLike(watchedExpressions, inspectValue);
660661
const lines = ArrayPrototypeMap(watchedExpressions, (expr, idx) => {
661662
const prefix = `${leftPad(idx, ' ', lastIndex)}: ${expr} =`;
662663
const value = inspect(values[idx]);
663664
if (!StringPrototypeIncludes(value, '\n')) {
664665
return `${prefix} ${value}`;
665666
}
666-
return `${prefix}\n ${RegExpPrototypeSymbolReplace(/\n/g, value, '\n ')}`;
667+
return `${prefix}\n ${StringPrototypeReplaceAll(value, '\n', '\n ')}`;
667668
});
668669
const valueList = ArrayPrototypeJoin(lines, '\n');
669670
return verbose ? `Watchers:\n${valueList}\n` : valueList;
@@ -805,8 +806,8 @@ function createRepl(inspector) {
805806
registerBreakpoint);
806807
}
807808

808-
const escapedPath = RegExpPrototypeSymbolReplace(/([/\\.?*()^${}|[\]])/g,
809-
script, '\\$1');
809+
const escapedPath = SideEffectFreeRegExpPrototypeSymbolReplace(/([/\\.?*()^${}|[\]])/g,
810+
script, '\\$1');
810811
const urlRegex = `^(.*[\\/\\\\])?${escapedPath}$`;
811812

812813
return PromisePrototypeThen(
@@ -860,9 +861,9 @@ function createRepl(inspector) {
860861
location.lineNumber + 1));
861862
if (!newBreakpoints.length) return PromiseResolve();
862863
return PromisePrototypeThen(
863-
SafePromiseAll(newBreakpoints),
864-
(results) => {
865-
print(`${results.length} breakpoints restored.`);
864+
SafePromiseAllReturnVoid(newBreakpoints),
865+
() => {
866+
print(`${newBreakpoints.length} breakpoints restored.`);
866867
});
867868
}
868869

@@ -896,7 +897,7 @@ function createRepl(inspector) {
896897

897898
inspector.suspendReplWhile(() =>
898899
PromisePrototypeThen(
899-
SafePromiseAll([formatWatchers(true), selectedFrame.list(2)]),
900+
SafePromiseAllReturnArrayLike([formatWatchers(true), selectedFrame.list(2)]),
900901
({ 0: watcherList, 1: context }) => {
901902
const breakContext = watcherList ?
902903
`${watcherList}\n${inspect(context)}` :

‎lib/internal/util.js

+42
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,24 @@ const {
2323
ReflectApply,
2424
ReflectConstruct,
2525
RegExpPrototypeExec,
26+
RegExpPrototypeGetDotAll,
27+
RegExpPrototypeGetGlobal,
28+
RegExpPrototypeGetHasIndices,
29+
RegExpPrototypeGetIgnoreCase,
30+
RegExpPrototypeGetMultiline,
31+
RegExpPrototypeGetSticky,
32+
RegExpPrototypeGetUnicode,
33+
RegExpPrototypeGetSource,
2634
SafeMap,
2735
SafeSet,
36+
SafeWeakMap,
2837
StringPrototypeReplace,
2938
StringPrototypeToLowerCase,
3039
StringPrototypeToUpperCase,
3140
Symbol,
3241
SymbolFor,
42+
SymbolReplace,
43+
SymbolSplit,
3344
} = primordials;
3445

3546
const {
@@ -646,6 +657,35 @@ function SideEffectFreeRegExpPrototypeExec(regex, string) {
646657
return FunctionPrototypeCall(RegExpFromAnotherRealm.prototype.exec, regex, string);
647658
}
648659

660+
const crossRelmRegexes = new SafeWeakMap();
661+
function getCrossRelmRegex(regex) {
662+
const cached = crossRelmRegexes.get(regex);
663+
if (cached) return cached;
664+
665+
let flagString = '';
666+
if (RegExpPrototypeGetHasIndices(regex)) flagString += 'd';
667+
if (RegExpPrototypeGetGlobal(regex)) flagString += 'g';
668+
if (RegExpPrototypeGetIgnoreCase(regex)) flagString += 'i';
669+
if (RegExpPrototypeGetMultiline(regex)) flagString += 'm';
670+
if (RegExpPrototypeGetDotAll(regex)) flagString += 's';
671+
if (RegExpPrototypeGetUnicode(regex)) flagString += 'u';
672+
if (RegExpPrototypeGetSticky(regex)) flagString += 'y';
673+
674+
const { RegExp: RegExpFromAnotherRealm } = getInternalGlobal();
675+
const crossRelmRegex = new RegExpFromAnotherRealm(RegExpPrototypeGetSource(regex), flagString);
676+
crossRelmRegexes.set(regex, crossRelmRegex);
677+
return crossRelmRegex;
678+
}
679+
680+
function SideEffectFreeRegExpPrototypeSymbolReplace(regex, string, replacement) {
681+
return getCrossRelmRegex(regex)[SymbolReplace](string, replacement);
682+
}
683+
684+
function SideEffectFreeRegExpPrototypeSymbolSplit(regex, string, limit = undefined) {
685+
return getCrossRelmRegex(regex)[SymbolSplit](string, limit);
686+
}
687+
688+
649689
function isArrayBufferDetached(value) {
650690
if (ArrayBufferPrototypeGetByteLength(value) === 0) {
651691
return _isArrayBufferDetached(value);
@@ -684,6 +724,8 @@ module.exports = {
684724
once,
685725
promisify,
686726
SideEffectFreeRegExpPrototypeExec,
727+
SideEffectFreeRegExpPrototypeSymbolReplace,
728+
SideEffectFreeRegExpPrototypeSymbolSplit,
687729
sleep,
688730
spliceOne,
689731
toUSVString,

‎lib/repl.js

+9-9
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ const {
7777
ReflectApply,
7878
RegExp,
7979
RegExpPrototypeExec,
80-
RegExpPrototypeSymbolReplace,
81-
RegExpPrototypeSymbolSplit,
8280
SafePromiseRace,
8381
SafeSet,
8482
SafeWeakSet,
@@ -111,7 +109,9 @@ const {
111109
const {
112110
decorateErrorStack,
113111
isError,
114-
deprecate
112+
deprecate,
113+
SideEffectFreeRegExpPrototypeSymbolReplace,
114+
SideEffectFreeRegExpPrototypeSymbolSplit,
115115
} = require('internal/util');
116116
const { inspect } = require('internal/util/inspect');
117117
const vm = require('vm');
@@ -455,7 +455,7 @@ function REPLServer(prompt,
455455

456456
// Remove all "await"s and attempt running the script
457457
// in order to detect if error is truly non recoverable
458-
const fallbackCode = RegExpPrototypeSymbolReplace(/\bawait\b/g, code, '');
458+
const fallbackCode = SideEffectFreeRegExpPrototypeSymbolReplace(/\bawait\b/g, code, '');
459459
try {
460460
vm.createScript(fallbackCode, {
461461
filename: file,
@@ -680,22 +680,22 @@ function REPLServer(prompt,
680680
if (e.stack) {
681681
if (e.name === 'SyntaxError') {
682682
// Remove stack trace.
683-
e.stack = RegExpPrototypeSymbolReplace(
683+
e.stack = SideEffectFreeRegExpPrototypeSymbolReplace(
684684
/^\s+at\s.*\n?/gm,
685-
RegExpPrototypeSymbolReplace(/^REPL\d+:\d+\r?\n/, e.stack, ''),
685+
SideEffectFreeRegExpPrototypeSymbolReplace(/^REPL\d+:\d+\r?\n/, e.stack, ''),
686686
'');
687687
const importErrorStr = 'Cannot use import statement outside a ' +
688688
'module';
689689
if (StringPrototypeIncludes(e.message, importErrorStr)) {
690690
e.message = 'Cannot use import statement inside the Node.js ' +
691691
'REPL, alternatively use dynamic import';
692-
e.stack = RegExpPrototypeSymbolReplace(
692+
e.stack = SideEffectFreeRegExpPrototypeSymbolReplace(
693693
/SyntaxError:.*\n/,
694694
e.stack,
695695
`SyntaxError: ${e.message}\n`);
696696
}
697697
} else if (self.replMode === module.exports.REPL_MODE_STRICT) {
698-
e.stack = RegExpPrototypeSymbolReplace(
698+
e.stack = SideEffectFreeRegExpPrototypeSymbolReplace(
699699
/(\s+at\s+REPL\d+:)(\d+)/,
700700
e.stack,
701701
(_, pre, line) => pre + (line - 1)
@@ -727,7 +727,7 @@ function REPLServer(prompt,
727727
if (errStack === '') {
728728
errStack = self.writer(e);
729729
}
730-
const lines = RegExpPrototypeSymbolSplit(/(?<=\n)/, errStack);
730+
const lines = SideEffectFreeRegExpPrototypeSymbolSplit(/(?<=\n)/, errStack);
731731
let matched = false;
732732

733733
errStack = '';

‎test/parallel/test-primordials-regexp.js

+55
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,20 @@ const { mustNotCall } = require('../common');
55
const assert = require('assert');
66

77
const {
8+
RegExpPrototypeExec,
89
RegExpPrototypeSymbolReplace,
910
RegExpPrototypeSymbolSearch,
1011
RegExpPrototypeSymbolSplit,
1112
SafeStringPrototypeSearch,
1213
hardenRegExp,
1314
} = require('internal/test/binding').primordials;
1415

16+
const {
17+
SideEffectFreeRegExpPrototypeExec,
18+
SideEffectFreeRegExpPrototypeSymbolReplace,
19+
SideEffectFreeRegExpPrototypeSymbolSplit,
20+
} = require('internal/util');
21+
1522

1623
Object.defineProperties(RegExp.prototype, {
1724
[Symbol.match]: {
@@ -89,14 +96,46 @@ hardenRegExp(hardenRegExp(/1/));
8996
// IMO there are no valid use cases in node core to use RegExpPrototypeSymbolMatch
9097
// or RegExpPrototypeSymbolMatchAll, they are inherently unsafe.
9198

99+
assert.strictEqual(RegExpPrototypeExec(/foo/, 'bar'), null);
100+
assert.strictEqual(RegExpPrototypeExec(hardenRegExp(/foo/), 'bar'), null);
101+
assert.strictEqual(SideEffectFreeRegExpPrototypeExec(/foo/, 'bar'), null);
102+
assert.strictEqual(SideEffectFreeRegExpPrototypeExec(hardenRegExp(/foo/), 'bar'), null);
103+
{
104+
const expected = ['bar'];
105+
Object.defineProperties(expected, {
106+
index: { __proto__: null, configurable: true, writable: true, enumerable: true, value: 0 },
107+
input: { __proto__: null, configurable: true, writable: true, enumerable: true, value: 'bar' },
108+
groups: { __proto__: null, configurable: true, writable: true, enumerable: true },
109+
});
110+
const actual = SideEffectFreeRegExpPrototypeExec(/bar/, 'bar');
111+
112+
// assert.deepStrictEqual(actual, expected) doesn't work for cross-realm comparison.
113+
114+
assert.strictEqual(Array.isArray(actual), Array.isArray(expected));
115+
assert.deepStrictEqual(Reflect.ownKeys(actual), Reflect.ownKeys(expected));
116+
for (const key of Reflect.ownKeys(expected)) {
117+
assert.deepStrictEqual(
118+
Reflect.getOwnPropertyDescriptor(actual, key),
119+
Reflect.getOwnPropertyDescriptor(expected, key),
120+
);
121+
}
122+
}
92123
{
93124
const myRegex = hardenRegExp(/a/);
94125
assert.strictEqual(RegExpPrototypeSymbolReplace(myRegex, 'baar', 'e'), 'bear');
95126
}
127+
{
128+
const myRegex = /a/;
129+
assert.strictEqual(SideEffectFreeRegExpPrototypeSymbolReplace(myRegex, 'baar', 'e'), 'bear');
130+
}
96131
{
97132
const myRegex = hardenRegExp(/a/g);
98133
assert.strictEqual(RegExpPrototypeSymbolReplace(myRegex, 'baar', 'e'), 'beer');
99134
}
135+
{
136+
const myRegex = /a/g;
137+
assert.strictEqual(SideEffectFreeRegExpPrototypeSymbolReplace(myRegex, 'baar', 'e'), 'beer');
138+
}
100139
{
101140
const myRegex = hardenRegExp(/a/);
102141
assert.strictEqual(RegExpPrototypeSymbolSearch(myRegex, 'baar'), 1);
@@ -109,6 +148,22 @@ hardenRegExp(hardenRegExp(/1/));
109148
const myRegex = hardenRegExp(/a/);
110149
assert.deepStrictEqual(RegExpPrototypeSymbolSplit(myRegex, 'baar', 0), []);
111150
}
151+
{
152+
const myRegex = /a/;
153+
const expected = [];
154+
const actual = SideEffectFreeRegExpPrototypeSymbolSplit(myRegex, 'baar', 0);
155+
156+
// assert.deepStrictEqual(actual, expected) doesn't work for cross-realm comparison.
157+
158+
assert.strictEqual(Array.isArray(actual), Array.isArray(expected));
159+
assert.deepStrictEqual(Reflect.ownKeys(actual), Reflect.ownKeys(expected));
160+
for (const key of Reflect.ownKeys(expected)) {
161+
assert.deepStrictEqual(
162+
Reflect.getOwnPropertyDescriptor(actual, key),
163+
Reflect.getOwnPropertyDescriptor(expected, key),
164+
);
165+
}
166+
}
112167
{
113168
const myRegex = hardenRegExp(/a/);
114169
assert.deepStrictEqual(RegExpPrototypeSymbolSplit(myRegex, 'baar', 1), ['b']);

‎test/parallel/test-startup-empty-regexp-statics.js

+17
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,23 @@ const allRegExpStatics =
4040
assert.strictEqual(child.signal, null);
4141
}
4242

43+
{
44+
const child = spawnSync(process.execPath,
45+
[ '--expose-internals', '-p', `const {
46+
SideEffectFreeRegExpPrototypeExec,
47+
SideEffectFreeRegExpPrototypeSymbolReplace,
48+
SideEffectFreeRegExpPrototypeSymbolSplit,
49+
} = require("internal/util");
50+
SideEffectFreeRegExpPrototypeExec(/foo/, "foo");
51+
SideEffectFreeRegExpPrototypeSymbolReplace(/o/, "foo", "a");
52+
SideEffectFreeRegExpPrototypeSymbolSplit(/o/, "foo");
53+
${allRegExpStatics}` ],
54+
{ stdio: ['inherit', 'pipe', 'inherit'] });
55+
assert.match(child.stdout.toString(), /^undefined\r?\n$/);
56+
assert.strictEqual(child.status, 0);
57+
assert.strictEqual(child.signal, null);
58+
}
59+
4360
{
4461
const child = spawnSync(process.execPath,
4562
[ '-e', `console.log(${allRegExpStatics})`, '--input-type=module' ],

0 commit comments

Comments
 (0)