Skip to content
This repository has been archived by the owner on Sep 16, 2024. It is now read-only.

fix(plugins): proxy issues with stack traces #91

Merged
merged 1 commit into from
May 3, 2024
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
48 changes: 22 additions & 26 deletions plugins/default-browser-emulator/injected-scripts/_proxyUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,13 +75,13 @@ const fnToStringProxy = internalCreateFnProxy(
} catch (error) {
cleanErrorStack(error, {
replaceLineFn: (line, i) => {
if (i === 1 && line.includes('Object.toString')) {
if (i === 1 && line.includes('at Object.toString')) {
const thisProto = ObjectCached.getPrototypeOf(thisArg);
if (
proxyToTarget.has(thisProto) &&
(overriddenFns.has(thisProto) || overriddenFns.has(target))
) {
return line.replace('Object.toString', 'Function.toString');
return line.replace('at Object.toString', 'at Function.toString');
}
}
return line;
Expand All @@ -100,31 +100,32 @@ ObjectCached.defineProperty(Function.prototype, 'toString', {
/////// END TOSTRING //////////////////////////////////////////////////////////////////////////////////////////////////

let isObjectSetPrototypeOf = 0;
let undefinedPrototypeString: string[] = [];
try {
Object.setPrototypeOf(undefined, null);
} catch (err) {
undefinedPrototypeString = err.stack.split(/\r?\n/);
}

const nativeToStringObjectSetPrototypeOfString = `${Object.setPrototypeOf}`;
Object.setPrototypeOf = new Proxy(Object.setPrototypeOf, {
apply(): any {
let isFunction = false;
isObjectSetPrototypeOf += 1;
try {
isFunction = arguments[1] && typeof arguments[1] === 'function';
return ReflectCached.apply(...arguments);
} catch (error) {
throw cleanErrorStack(error, {
stripStartingReflect: true,
replaceLineFn(line, i) {
if (i === 1 && line.includes(' Proxy.setPrototypeOf')) {
return line.replace(' Proxy.setPrototypeOf', ' Object.setPrototypeOf');
}
if (i === 1 && line.includes(' Function.setPrototypeOf')) {
return undefined;
replaceLineFn(line, i, prevLine) {
if (i === 1 || i === 2) {
if (prevLine.match(/at (?:Function|Object)\.setPrototypeOf/)) return undefined;
if (line.includes('at Proxy.setPrototypeOf')) {
const replacement = isFunction
? 'at Function.setPrototypeOf'
: 'at Object.setPrototypeOf';
return line.replace('at Proxy.setPrototypeOf', replacement);
}
if (line.includes('at Function.setPrototypeOf') && !isFunction) {
return undefined;
}
}
return line;

},
});
} finally {
Expand All @@ -143,7 +144,7 @@ declare let sourceUrl: string;
function cleanErrorStack(
error: Error,
opts: {
replaceLineFn?: (line: string, index: number) => string;
replaceLineFn?: (line: string, index: number, prevLine: string) => string;
startAfterSourceUrl?: boolean;
stripStartingReflect?: boolean;
skipFirst?: RegExp;
Expand All @@ -154,28 +155,23 @@ function cleanErrorStack(
) {
if (!error.stack) return error;

const {
replaceLineFn,
startAfterSourceUrl,
stripStartingReflect,
} = opts;
const { replaceLineFn, startAfterSourceUrl, stripStartingReflect } = opts;
const split = error.stack.includes('\r\n') ? '\r\n' : '\n';
const stack = error.stack.split(/\r?\n/);
if (stack[0] === undefinedPrototypeString[0]) {
stack[2] = undefinedPrototypeString[1];
}
const newStack = [];
for (let i = 0; i < stack.length; i += 1) {
let line = stack[i];

if (i === 1 && stripStartingReflect && line.includes(' Reflect.')) continue;
if (i === 1 && stripStartingReflect && line.includes('at Reflect.')) continue;
if (line.includes(sourceUrl)) {
if (startAfterSourceUrl === true) {
newStack.length = 1;
}
continue;
}
if (replaceLineFn) line = replaceLineFn(line, i);
if (replaceLineFn) {
line = replaceLineFn(line, i, newStack[newStack.length - 1]);
}
if (!line) continue;
newStack.push(line);
}
Expand Down
71 changes: 69 additions & 2 deletions plugins/default-browser-emulator/test/detection.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ describe('Proxy detections', () => {
const error = await page.evaluate<{ message: string; name: string; stack: string }>(`(() => {

try {
Object.setPrototypeOf.call(console.debug, console.debug, undefined)
Object.setPrototypeOf.call(console.debug, [console.debug])
return true
} catch (error) {
return {
Expand All @@ -922,7 +922,74 @@ describe('Proxy detections', () => {
}
})();`);
expect(error.stack.match(/at Proxy.setPrototypeOf/g)).toBeNull();
expect(error.stack.match(/at Object.setPrototypeOf/g)).toHaveLength(1);
expect(error.stack.match(/at Function.setPrototypeOf/g)).toHaveLength(1);
expect(error.name).toBe('TypeError');
});

test('should handle setPrototype.apply with undefined', async () => {
const agent = pool.createAgent({
logger,
});
const page = await agent.newPage();
page.on('console', console.log);
await page.goto(`${koaServer.baseUrl}`);
await page.waitForLoad(LocationStatus.AllContentLoaded);

const error = await page.evaluate<{ message: string; name: string; stack: string }>(`(() => {

try {
Object.setPrototypeOf.apply(console.debug, [console.debug, console.debug])
return true
} catch (error) {
return {
name: error.constructor.name,
message: error.message,
stack: error.stack,
}
}
})();`);
expect(error.stack.match(/at Proxy.setPrototypeOf/g)).toBeNull();
expect(error.stack.match(/at Function.setPrototypeOf/g)).toHaveLength(1);
expect(error.name).toBe('TypeError');
});

test('should handle proxied setPrototype', async () => {
const agent = pool.createAgent({
logger,
});
const page = await agent.newPage();
page.on('console', console.log);
await page.goto(`${koaServer.baseUrl}`);
await page.waitForLoad(LocationStatus.AllContentLoaded);

const error = await page.evaluate<{ message: string; name: string; stack: string }>(`(() => {

try {
const p = new Proxy(console, {
apply() {
return Reflect.apply(...arguments)
},
get() {
return Reflect.get(...arguments)
},
set() {
return Reflect.set(...arguments)
},
})

Object.setPrototypeOf.apply(p.debug, console.debug)
return true
} catch (error) {
return {
name: error.constructor.name,
message: error.message,
stack: error.stack,
}
}
})();`);
expect(error.stack.match(/at Proxy.setPrototypeOf/g)).toBeNull();
expect(error.stack.match(/at Object.setPrototypeOf/g)).toBeNull();
expect(error.stack.match(/at Function.setPrototypeOf/g)).toHaveLength(1);
expect(error.name).toBe('TypeError');
});

Expand Down
Loading