Skip to content

Protect __evaluate_entry and __evaluate_exit callbacks #700

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

Merged
merged 1 commit into from
Nov 26, 2024
Merged

Protect __evaluate_entry and __evaluate_exit callbacks #700

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions jsonata.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ declare namespace jsonata {
}

interface Environment {
bind(name: string, value: any): void;
lookup(name: string): any;
bind(name: string | symbol, value: any): void;
lookup(name: string | symbol): any;
readonly timestamp: Date;
readonly async: boolean;
}
Expand Down
4 changes: 2 additions & 2 deletions src/jsonata.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ var jsonata = (function() {
async function evaluate(expr, input, environment) {
var result;

var entryCallback = environment.lookup('__evaluate_entry');
var entryCallback = environment.lookup(Symbol.for('jsonata.__evaluate_entry'));
if(entryCallback) {
await entryCallback(expr, input, environment);
}
Expand Down Expand Up @@ -124,7 +124,7 @@ var jsonata = (function() {
result = await evaluateGroupExpression(expr.group, result, environment);
}

var exitCallback = environment.lookup('__evaluate_exit');
var exitCallback = environment.lookup(Symbol.for('jsonata.__evaluate_exit'));
if(exitCallback) {
await exitCallback(expr, input, environment, result);
}
Expand Down
4 changes: 2 additions & 2 deletions test/implementation-tests.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1057,11 +1057,11 @@ function timeboxExpression(expr, timeout, maxDepth) {
};

// register callbacks
expr.assign("__evaluate_entry", function() {
expr.assign(Symbol.for('jsonata.__evaluate_entry'), function() {
depth++;
checkRunnaway();
});
expr.assign("__evaluate_exit", function() {
expr.assign(Symbol.for('jsonata.__evaluate_exit'), function() {
depth--;
checkRunnaway();
});
Expand Down
4 changes: 2 additions & 2 deletions test/run-test-suite.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,12 +178,12 @@ function timeboxExpression(expr, timeout, maxDepth) {
};

// register callbacks
expr.assign("__evaluate_entry", function(expr, input, env) {
expr.assign(Symbol.for('jsonata.__evaluate_entry'), function(expr, input, env) {
if (env.isParallelCall) return;
depth++;
checkRunnaway();
});
expr.assign("__evaluate_exit", function(expr, input, env) {
expr.assign(Symbol.for('jsonata.__evaluate_exit'), function(expr, input, env) {
if (env.isParallelCall) return;
depth--;
checkRunnaway();
Expand Down