diff --git a/rasp/jvm/JVMProbe/lib/nashorn.jar b/rasp/jvm/JVMProbe/lib/nashorn.jar old mode 100644 new mode 100755 index 18faa45f4..f758cd823 Binary files a/rasp/jvm/JVMProbe/lib/nashorn.jar and b/rasp/jvm/JVMProbe/lib/nashorn.jar differ diff --git a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsExecutor.java b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsExecutor.java index 7d50d4faf..8ca68bdb2 100644 --- a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsExecutor.java +++ b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsExecutor.java @@ -11,7 +11,7 @@ import com.security.smith.common.RSAUtil; import com.security.smith.log.*; -import jdk.nashorn.api.scripting.NashornScriptEngineFactory; +import rasp.jdk.nashorn.api.scripting.NashornScriptEngineFactory; public class JsExecutor { public static final int COMMON_TYPE = 1; diff --git a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsRuleEngine.java b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsRuleEngine.java index a9c79d39b..a5f2ef8d3 100644 --- a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsRuleEngine.java +++ b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsRuleEngine.java @@ -8,7 +8,7 @@ import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import com.security.smith.log.*; -import jdk.nashorn.api.scripting.NashornScriptEngineFactory; +import rasp.jdk.nashorn.api.scripting.NashornScriptEngineFactory; public class JsRuleEngine { private static boolean bInited = false; diff --git a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsRuleInterfaceMgr.java b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsRuleInterfaceMgr.java index 4945aa0fd..93ce3072e 100644 --- a/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsRuleInterfaceMgr.java +++ b/rasp/jvm/JVMProbe/src/main/java/com/security/smith/ruleengine/JsRuleInterfaceMgr.java @@ -1,8 +1,8 @@ package com.security.smith.ruleengine; -// import jdk.nashorn.api.scripting.ScriptObjectMirror; -import jdk.nashorn.internal.objects.NativeArray; +// import rasp.jdk.nashorn.api.scripting.ScriptObjectMirror; +import rasp.jdk.nashorn.internal.objects.NativeArray; import com.security.smith.log.*; import java.util.ArrayList; import java.util.List; @@ -41,9 +41,9 @@ public Object java_callback(int functionID, Object[] args) { } private String[] Convert_JsStringArray_To_JavaStringArray(Object jsArray) { - if (jsArray instanceof jdk.nashorn.internal.objects.NativeArray) { + if (jsArray instanceof rasp.jdk.nashorn.internal.objects.NativeArray) { try { - jdk.nashorn.internal.objects.NativeArray array = (jdk.nashorn.internal.objects.NativeArray)jsArray; + rasp.jdk.nashorn.internal.objects.NativeArray array = (rasp.jdk.nashorn.internal.objects.NativeArray)jsArray; List javaList = new ArrayList<>(); for (Object obj : array.values()) {