Skip to content
Open
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
2 changes: 1 addition & 1 deletion packages/query-parser/src/stringify.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ const BSON_TO_JS_STRING = {
ISODate: function (v: Date) {
try {
return `ISODate('${v.toISOString()}')`;
} catch (ex) {
} catch {
return `ISODate('${v.toString()}')`;
}
},
Expand Down
62 changes: 31 additions & 31 deletions packages/shell-bson-parser/src/check.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,32 +18,30 @@ class Checker {
node.arguments.every(this.checkSafeExpression)
);
}
if (allowMethods) {
if (node.callee.type === 'MemberExpression') {
const object = node.callee.object;
const property = node.callee.property as Identifier;
// If we're only referring to identifiers, we don't need to check deeply.
if (object.type === 'Identifier' && property.type === 'Identifier') {
return (
isMethodWhitelisted(object.name, property.name) &&
node.arguments.every(this.checkSafeExpression)
);
} else if (
(object.type === 'NewExpression' ||
object.type === 'CallExpression') &&
object.callee.type === 'Identifier'
) {
const callee = object.callee;
return (
isMethodWhitelisted(callee.name, property.name) &&
node.arguments.every(this.checkSafeExpression)
);
} else {
return (
this.checkSafeExpression(object) &&
node.arguments.every(this.checkSafeExpression)
);
}
if (allowMethods && node.callee.type === 'MemberExpression') {
const object = node.callee.object;
const property = node.callee.property as Identifier;
// If we're only referring to identifiers, we don't need to check deeply.
if (object.type === 'Identifier' && property.type === 'Identifier') {
return (
isMethodWhitelisted(object.name, property.name) &&
node.arguments.every(this.checkSafeExpression)
);
} else if (
(object.type === 'NewExpression' ||
object.type === 'CallExpression') &&
object.callee.type === 'Identifier'
) {
const callee = object.callee;
return (
isMethodWhitelisted(callee.name, property.name) &&
node.arguments.every(this.checkSafeExpression)
);
} else {
return (
this.checkSafeExpression(object) &&
node.arguments.every(this.checkSafeExpression)
);
}
}
return false;
Expand Down Expand Up @@ -106,11 +104,13 @@ class Checker {
}

export const checkTree = (node: Node, options: Options) => {
if (node.type === 'Program') {
if (node.body.length === 1 && node.body[0].type === 'ExpressionStatement') {
const checker = new Checker(options);
return checker.checkSafeExpression(node.body[0].expression);
}
if (
node.type === 'Program' &&
node.body.length === 1 &&
node.body[0].type === 'ExpressionStatement'
) {
const checker = new Checker(options);
return checker.checkSafeExpression(node.body[0].expression);
}
return false;
};
10 changes: 6 additions & 4 deletions packages/shell-bson-parser/src/eval.ts
Original file line number Diff line number Diff line change
Expand Up @@ -158,10 +158,12 @@ const walk = (node: Node | null): any => {
};

export const executeAST = (node: Node) => {
if (node.type === 'Program') {
if (node.body.length === 1 && node.body[0].type === 'ExpressionStatement') {
return walk(node.body[0].expression);
}
if (
node.type === 'Program' &&
node.body.length === 1 &&
node.body[0].type === 'ExpressionStatement'
) {
return walk(node.body[0].expression);
}
throw new Error('Invalid AST Found');
};
Loading