Skip to content

Commit 19192fa

Browse files
BATIK-1346: Allow configuration of rhino whitelist
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/batik/trunk@1904885 13f79535-47bb-0310-9956-ffa450edef68
1 parent 052b201 commit 19192fa

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

batik-script/src/main/java/org/apache/batik/script/rhino/RhinoClassShutter.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2020

2121
import org.mozilla.javascript.ClassShutter;
2222

23+
import java.util.ArrayList;
2324
import java.util.Arrays;
2425
import java.util.List;
2526

@@ -30,7 +31,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more
3031
* @version $Id$
3132
*/
3233
public class RhinoClassShutter implements ClassShutter {
33-
private static final List<String> WHITELIST = Arrays.asList("java.io.PrintStream", "java.lang.System", "java.net.URL");
34+
public static final List<String> WHITELIST = new ArrayList<>();
35+
static {
36+
WHITELIST.addAll(Arrays.asList("java.io.PrintStream", "java.lang.System", "java.net.URL"));
37+
}
3438

3539
/*
3640
public RhinoClassShutter() {

batik-test-old/src/test/java/org/apache/batik/script/rhino/RhinoClassShutterTest.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,10 @@ Licensed to the Apache Software Foundation (ASF) under one or more
2424
public class RhinoClassShutterTest {
2525
@Test
2626
public void testImports() {
27-
Assert.assertFalse(new RhinoClassShutter().visibleToScripts("java.lang.Runtime"));
27+
String runtimeClass = "java.lang.Runtime";
28+
Assert.assertFalse(new RhinoClassShutter().visibleToScripts(runtimeClass));
29+
RhinoClassShutter.WHITELIST.add(runtimeClass);
30+
Assert.assertTrue(new RhinoClassShutter().visibleToScripts(runtimeClass));
31+
RhinoClassShutter.WHITELIST.remove(runtimeClass);
2832
}
2933
}

0 commit comments

Comments
 (0)