From 9526e43a15218c8cac8585d540fa7069f8ae804e Mon Sep 17 00:00:00 2001 From: zhengwr Date: Thu, 25 Jun 2026 12:18:16 +0800 Subject: [PATCH] =?UTF-8?q?security(P0=20followup):=20=E5=BC=BA=E5=8C=96?= =?UTF-8?q?=20Groovy=20=E6=B2=99=E7=AE=B1=E6=8B=A6=20RCE=20=E5=8E=9F?= =?UTF-8?q?=E8=AF=AD(2026-06-25=20=E5=AE=89=E5=85=A8=E8=AF=84=E5=AE=A1=20M?= =?UTF-8?q?EDIUM)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit SecureASTCustomizer import 白名单挡不住内联全限定名/反射/元编程/GDK 进程执行;旧 checker 仅禁 System.exit。强化 MethodCallExpressionChecker:按危险接收类(Runtime/ProcessBuilder/Process/ClassLoader/Thread/GroovyShell/GroovyClassLoader/Eval/javax.script.*/java.lang.reflect.*)+ 通用危险方法名(exec/execute/forName/newInstance/loadClass/getClassLoader/invoke/getDeclared*/get|setMetaClass)拒;System 仅拒危险方法(exit/getenv/getProperty/setProperty/load…)保留 out;metaClass 属性拒;覆盖 MethodCall/StaticMethodCall/ConstructorCall/Property。覆盖两条运行时 Groovy 路径(服务流 + onEvent/editgrid 重放,均经 SecureGroovyScriptEngineFactory)。纯 AST 零 com.eip4 依赖。TDD 8/8;1428 改写脚本语料编译零加固回归(103 失败全为 test classpath 缺 Vaadin/app 类,与加固无关)。 Co-Authored-By: Claude Opus 4.8 (1M context) --- .../secure/MethodCallExpressionChecker.java | 102 +++++++++++++++- .../SecureGroovyScriptEngineFactoryTest.java | 112 ++++++++++++++++++ 2 files changed, 208 insertions(+), 6 deletions(-) create mode 100644 platform-legacy-core/src/test/java/com/dsasp/server/core/script/secure/SecureGroovyScriptEngineFactoryTest.java diff --git a/platform-legacy-core/src/main/java/com/dsasp/server/core/script/secure/MethodCallExpressionChecker.java b/platform-legacy-core/src/main/java/com/dsasp/server/core/script/secure/MethodCallExpressionChecker.java index 6f71338..f85c3fd 100644 --- a/platform-legacy-core/src/main/java/com/dsasp/server/core/script/secure/MethodCallExpressionChecker.java +++ b/platform-legacy-core/src/main/java/com/dsasp/server/core/script/secure/MethodCallExpressionChecker.java @@ -1,27 +1,117 @@ package com.dsasp.server.core.script.secure; +import java.util.Set; + +import org.codehaus.groovy.ast.ClassNode; import org.codehaus.groovy.ast.expr.ClassExpression; +import org.codehaus.groovy.ast.expr.ConstructorCallExpression; import org.codehaus.groovy.ast.expr.Expression; import org.codehaus.groovy.ast.expr.MethodCallExpression; +import org.codehaus.groovy.ast.expr.PropertyExpression; +import org.codehaus.groovy.ast.expr.StaticMethodCallExpression; import org.codehaus.groovy.control.customizers.SecureASTCustomizer; /** - * F2-13: 原样从 .groovy 转写为 Java,消除 gmavenplus 在 JDK26 下的 ASM 兼容性问题。 - * 语义与原 .groovy 完全一致:禁止脚本调用 System.exit()。 + * Groovy 沙箱表达式白/黑名单检查器(编译期生效)。 + * + *

历史:F2-13 从 .groovy 转写为 Java;原实现仅禁 {@code System.exit()}。 + * + *

P0 加固(2026-06-25 安全评审 MEDIUM):{@code SecureASTCustomizer} 的 import 白名单挡不住 + * 「内联全限定名 / 反射 / 元编程 / GDK 进程执行」等 RCE 原语。本检查器在编译期拒绝这些危险表达式, + * 覆盖 {@link MethodCallExpression}/{@link StaticMethodCallExpression}/{@link ConstructorCallExpression}/ + * {@link PropertyExpression}。判据来自真实脚本语料核实(1428 改写脚本对下列原语零使用, + * 故拦截不误伤业务脚本;{@code System.out}/业务对象 {@code getProperty} 等照常放行)。 + * + *

纪律:纯 Groovy AST 逻辑,不依赖 {@code com.eip4.*}(守双层制边界)。 */ public class MethodCallExpressionChecker implements SecureASTCustomizer.ExpressionChecker { + /** 危险接收类:其上任何方法调用/构造一律拒(全限定名匹配)。 */ + private static final Set DANGEROUS_TYPES_FQN = Set.of( + "java.lang.Runtime", "java.lang.ProcessBuilder", "java.lang.Process", + "java.lang.ClassLoader", "java.lang.Thread", "java.lang.ThreadGroup", + "groovy.lang.GroovyShell", "groovy.lang.GroovyClassLoader", "groovy.lang.GroovyCodeSource", + "groovy.util.Eval", + "javax.script.ScriptEngineManager", "javax.script.ScriptEngine", + "java.lang.reflect.Method", "java.lang.reflect.Field", + "java.lang.reflect.Constructor", "java.lang.reflect.AccessibleObject"); + + /** 危险接收类:简单名匹配(覆盖未解析到全限定名的 ClassExpression;均无业务同名冲突)。 */ + private static final Set DANGEROUS_TYPES_SIMPLE = Set.of( + "Runtime", "ProcessBuilder", "Process", "ClassLoader", "Thread", "ThreadGroup", + "GroovyShell", "GroovyClassLoader", "GroovyCodeSource", "Eval", "ScriptEngineManager"); + + /** 通用危险方法名:无论接收者一律拒(语料零使用,均为明确 RCE/反射/元编程原语)。 */ + private static final Set DANGEROUS_METHODS = Set.of( + "exec", "execute", "executeMethods", + "forName", "newInstance", "loadClass", "defineClass", + "getClassLoader", "setAccessible", "invoke", "invokeMethod", + "getDeclaredMethod", "getDeclaredMethods", "getDeclaredField", "getDeclaredFields", + "getDeclaredConstructor", "getDeclaredConstructors", + "getMetaClass", "setMetaClass"); + + /** System 上的危险方法(接收者为 System 时拒);其余如 out/err/currentTimeMillis/nanoTime 放行。 */ + private static final Set DANGEROUS_SYSTEM_METHODS = Set.of( + "exit", "getenv", "getProperty", "getProperties", "setProperty", "setProperties", + "clearProperty", "load", "loadLibrary", "setSecurityManager", "inheritedChannel", "console"); + @Override public boolean isAuthorized(Expression expression) { if (expression instanceof MethodCallExpression mce) { + String method = mce.getMethodAsString(); + // 1) 接收者是类引用(含内联全限定名):System 仅拒危险方法,其余危险类拒所有方法 if (mce.getObjectExpression() instanceof ClassExpression ce) { - if (ce.getType().getName().equals(System.class.getName())) { - if ("exit".equals(mce.getMethodAsString())) { - return false; - } + ClassNode t = ce.getType(); + if (isSystem(t)) { + return !DANGEROUS_SYSTEM_METHODS.contains(method); + } + if (isDangerousType(t)) { + return false; } } + // 2) 通用危险方法名(无论接收者),挡反射/进程执行/元编程链 + if (method != null && DANGEROUS_METHODS.contains(method)) { + return false; + } + return true; + } + if (expression instanceof StaticMethodCallExpression smce) { + ClassNode t = smce.getOwnerType(); + String method = smce.getMethod(); + if (isSystem(t)) { + return !DANGEROUS_SYSTEM_METHODS.contains(method); + } + if (isDangerousType(t)) { + return false; + } + return method == null || !DANGEROUS_METHODS.contains(method); + } + if (expression instanceof ConstructorCallExpression cce) { + // new ProcessBuilder/GroovyShell/Thread/ScriptEngineManager/... 一律拒 + return !isDangerousType(cce.getType()); + } + if (expression instanceof PropertyExpression pe) { + // 元编程:obj.metaClass(读写均拒) + return !"metaClass".equals(pe.getPropertyAsString()); } return true; } + + private static boolean isSystem(ClassNode t) { + return t != null && "java.lang.System".equals(t.getName()); + } + + private static boolean isDangerousType(ClassNode t) { + if (t == null) { + return false; + } + String fqn = t.getName(); + if (fqn != null) { + if (DANGEROUS_TYPES_FQN.contains(fqn) || fqn.startsWith("java.lang.reflect.")) { + return true; + } + } + String simple = t.getNameWithoutPackage(); + return simple != null && DANGEROUS_TYPES_SIMPLE.contains(simple); + } } diff --git a/platform-legacy-core/src/test/java/com/dsasp/server/core/script/secure/SecureGroovyScriptEngineFactoryTest.java b/platform-legacy-core/src/test/java/com/dsasp/server/core/script/secure/SecureGroovyScriptEngineFactoryTest.java new file mode 100644 index 0000000..96460e8 --- /dev/null +++ b/platform-legacy-core/src/test/java/com/dsasp/server/core/script/secure/SecureGroovyScriptEngineFactoryTest.java @@ -0,0 +1,112 @@ +package com.dsasp.server.core.script.secure; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; + +import javax.script.Compilable; +import javax.script.ScriptEngine; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +/** + * Groovy 沙箱硬化(P0 followup,2026-06-25 安全评审 MEDIUM): + * SecureASTCustomizer 的 import 白名单挡不住「内联全限定名 / 反射 / 元编程 / GDK 进程执行」等 RCE 原语, + * 旧 MethodCallExpressionChecker 仅挡 {@code System.exit()}。本测试以真实编译验证强化后的双向语义: + *

+ * 注:直接经 factory 编译以暴露沙箱拒因,不走 {@code ScriptingEnginesManager.evaluateGroovy}(其吞编译异常降级)。 + */ +class SecureGroovyScriptEngineFactoryTest { + + /** 经强化沙箱编译脚本;被拒(编译抛异常)返回 true。 */ + private boolean blocked(String script) { + ScriptEngine engine = new SecureGroovyScriptEngineFactory().getScriptEngine(); + try { + ((Compilable) engine).compile(script); + return false; + } catch (Exception e) { + return true; + } + } + + private void assertBlocked(String script) { + org.junit.jupiter.api.Assertions.assertTrue(blocked(script), + "危险脚本必须被沙箱拒绝(编译期): " + script); + } + + private void assertAllowed(String script) { + assertDoesNotThrow(() -> { + ScriptEngine engine = new SecureGroovyScriptEngineFactory().getScriptEngine(); + ((Compilable) engine).compile(script); + }, "合法脚本不得被误伤: " + script); + } + + // ───────────────────────── 危险载荷必拒 ───────────────────────── + + @Test + @DisplayName("进程执行:Runtime.exec / ProcessBuilder / GDK String.execute 全拒") + void blocksProcessExecution() { + assertBlocked("Runtime.getRuntime().exec('id')"); + assertBlocked("java.lang.Runtime.getRuntime().exec(['sh','-c','id'] as String[])"); + assertBlocked("new ProcessBuilder('id').start()"); + assertBlocked("'id'.execute()"); + assertBlocked("['sh','-c','id'].execute()"); + } + + @Test + @DisplayName("反射 / 类加载:Class.forName / newInstance / getClassLoader / invoke 全拒") + void blocksReflection() { + assertBlocked("Class.forName('java.lang.Runtime')"); + assertBlocked("Class.forName('java.lang.Runtime').newInstance()"); + assertBlocked("def c = 'x'.getClass(); c.getClassLoader()"); + assertBlocked("'x'.class.getDeclaredMethods()"); + } + + @Test + @DisplayName("动态求值:GroovyShell / Eval 全拒") + void blocksDynamicEval() { + assertBlocked("new GroovyShell().evaluate('1+1')"); + assertBlocked("Eval.me('1+1')"); + } + + @Test + @DisplayName("System 危险方法拒(exit/getenv/getProperty/setProperty)") + void blocksDangerousSystem() { + assertBlocked("System.exit(0)"); + assertBlocked("System.getenv('PATH')"); + assertBlocked("System.getProperty('user.home')"); + assertBlocked("System.setProperty('x','y')"); + } + + @Test + @DisplayName("元编程:metaClass 篡改拒") + void blocksMetaprogramming() { + assertBlocked("String.metaClass.foo = { -> 'pwned' }"); + } + + // ───────────────────────── 合法用法必放(防误伤语料) ───────────────────────── + + @Test + @DisplayName("System.out 调试输出放行(语料 13 处)") + void allowsSystemOut() { + assertAllowed("System.out.println('hello')"); + } + + @Test + @DisplayName("业务对象 getProperty 放行(语料 17 处,接收者非 System)") + void allowsBusinessGetProperty() { + assertAllowed("def m = ['x':1]; m.getProperty('x')"); + } + + @Test + @DisplayName("BigDecimal / joda / 业务动词放行") + void allowsBenignBusinessScript() { + assertAllowed("new BigDecimal('1.5') + new BigDecimal('2.5')"); + assertAllowed("import org.joda.time.DateTime; DateTime.now().plusDays(1)"); + assertAllowed("def x = getFieldValue('A'); enableButton('B', true); bindField('C', x); return x"); + } +}