F2-13: 修编译目标降 release=21 + 升 Groovy 4.0.27 + .groovy 转 Java(修报表 500)
根因:JDK26 编译产生 major version 70 字节码,Groovy 4.0.24 内嵌 ASM 不支持, 导致报表取数链路语义分析崩溃。 修法: 1. pom.xml 将 source/target=17 改为 maven.compiler.release=21(真正约束输出字节码) 2. groovy-jsr223 版本升至 4.0.27(与本地 groovy core 4.0.27 配套) 3. SecureGroovyScriptEngineFactory/MethodCallExpressionChecker 从 .groovy 转写为 .java,彻底移除 gmavenplus 插件,消除 JDK26 下 ASM generateStubs 崩溃 Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
This commit is contained in:
@@ -48,33 +48,7 @@
|
||||
<dependency><groupId>org.springframework.boot</groupId><artifactId>spring-boot-starter-test</artifactId><scope>test</scope></dependency>
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- P1 服务流引擎:framework 函数库 GetValueFunction/GetDefaultValueFunction 与
|
||||
SecureGroovyScriptEngineFactory/MethodCallExpressionChecker 为 .groovy 源码
|
||||
(原样移植,见 src/main/groovy),需 Groovy 联合编译为字节码,运行时脚本方可按
|
||||
FQN import。gmavenplus 在 compile 阶段编译 src/main/groovy,与 javac 联合。 -->
|
||||
<plugin>
|
||||
<groupId>org.codehaus.gmavenplus</groupId>
|
||||
<artifactId>gmavenplus-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<goals>
|
||||
<!-- generateStubs 在 javac 前产出 Java 桩,使 com.dsasp.* 的 .java
|
||||
可引用 .groovy 类(GetValueFunction 等);compile 再产出真实字节码。 -->
|
||||
<goal>addSources</goal>
|
||||
<goal>addTestSources</goal>
|
||||
<goal>generateStubs</goal>
|
||||
<goal>compile</goal>
|
||||
<goal>generateTestStubs</goal>
|
||||
<goal>compileTests</goal>
|
||||
<goal>removeStubs</goal>
|
||||
<goal>removeTestStubs</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
<!-- F2-13: SecureGroovyScriptEngineFactory/MethodCallExpressionChecker 已从 .groovy 转写为
|
||||
.java(见 src/main/java/.../secure/),彻底消除 gmavenplus 在 JDK26 下的 ASM 兼容性问题。
|
||||
gmavenplus plugin 已移除,无需 Groovy 联合编译。 -->
|
||||
</project>
|
||||
|
||||
@@ -1,20 +0,0 @@
|
||||
package com.dsasp.server.core.script.secure
|
||||
|
||||
import org.codehaus.groovy.ast.expr.ClassExpression
|
||||
import org.codehaus.groovy.ast.expr.Expression
|
||||
import org.codehaus.groovy.ast.expr.MethodCallExpression
|
||||
import org.codehaus.groovy.control.customizers.SecureASTCustomizer
|
||||
|
||||
class MethodCallExpressionChecker implements SecureASTCustomizer.ExpressionChecker{
|
||||
boolean isAuthorized(Expression expression) {
|
||||
if (expression instanceof MethodCallExpression) {
|
||||
if (expression.objectExpression instanceof ClassExpression) {
|
||||
if (expression.objectExpression.type.name==System.name) {
|
||||
if (expression.methodAsString=='exit') return false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
true
|
||||
}
|
||||
}
|
||||
@@ -1,152 +0,0 @@
|
||||
package com.dsasp.server.core.script.secure;
|
||||
|
||||
import javax.script.ScriptEngine
|
||||
|
||||
import org.codehaus.groovy.control.CompilerConfiguration
|
||||
import org.codehaus.groovy.control.customizers.ImportCustomizer
|
||||
import org.codehaus.groovy.control.customizers.SecureASTCustomizer
|
||||
import org.codehaus.groovy.jsr223.GroovyScriptEngineFactory
|
||||
import org.codehaus.groovy.jsr223.GroovyScriptEngineImpl
|
||||
|
||||
|
||||
public class SecureGroovyScriptEngineFactory extends GroovyScriptEngineFactory{
|
||||
|
||||
def IMPORTSWHITELIST = [
|
||||
"com.vaadin.data.fieldgroup.FieldGroup",
|
||||
"com.vaadin.shared.ui.datefield.Resolution",
|
||||
"com.dsasp.viewframework.SingleSelectField",
|
||||
"com.dsasp.viewframework.MultiSelectField",
|
||||
"com.dsasp.viewframework.ExComboBox",
|
||||
"com.dsasp.client.viewframework.listener.TableItemSelectedListener",
|
||||
"com.dsasp.client.viewframework.listener.ConfirmDialogListener",
|
||||
"com.dsasp.client.viewframework.template.form.FormEngineUtil",
|
||||
"com.dsasp.server.common.dataDic.bean.Enumerate",
|
||||
"com.dsasp.server.common.exception.ValidationException",
|
||||
"com.dsasp.server.common.util.UserSession",
|
||||
"com.dsasp.server.common.dataDic.bean.CustomSearchConditional",
|
||||
"com.dsasp.server.dataDic.bean.GeneralPO",
|
||||
"com.dsasp.server.common.workflow.service.ProcessCoreService",
|
||||
"com.dsasp.client.viewframework.template.util.Console",
|
||||
"com.dsasp.server.privilege.service.ServicePrivilege",
|
||||
"com.dsasp.client.viewframework.template.editform.EditFormTemplateComponent",
|
||||
"com.dsasp.client.viewframework.component.MainComponent",
|
||||
"com.dsasp.server.app.convert.PageFieldUtil",
|
||||
"com.dsasp.server.app.model.FormField",
|
||||
"com.dsasp.server.app.model.WfApprovPage",
|
||||
"com.dsasp.client.viewframework.script.ViewScript",
|
||||
"com.dsasp.viewframework.browserframe.ExBrowserFrame"
|
||||
];
|
||||
|
||||
def STARIMPORTSWHITELIST = [
|
||||
"com.dsasp.client.viewframework.util",
|
||||
"com.dsasp.client.viewframework.template.util",
|
||||
"com.dsasp.server.common.core",
|
||||
"com.dsasp.server.common.core.service",
|
||||
"com.dsasp.server.common.dataDic.bean",
|
||||
"com.dsasp.server.common.dataDic.service",
|
||||
"com.dsasp.server.common.email.bean",
|
||||
"com.dsasp.server.common.email.service",
|
||||
"com.dsasp.server.common.exception",
|
||||
"com.dsasp.server.common.file",
|
||||
"com.dsasp.server.common.file.service",
|
||||
"com.dsasp.server.common.form.bean",
|
||||
"com.dsasp.server.common.form.service",
|
||||
"com.dsasp.server.common.function",
|
||||
"com.dsasp.server.common.log.bean",
|
||||
"com.dsasp.server.common.log.service",
|
||||
"com.dsasp.server.common.message.bean",
|
||||
"com.dsasp.server.common.message.service",
|
||||
"com.dsasp.server.common.organization.bean",
|
||||
"com.dsasp.server.common.organization.service",
|
||||
"com.dsasp.server.common.privilege.bean",
|
||||
"com.dsasp.server.common.privilege.service",
|
||||
"com.dsasp.server.common.sms.service",
|
||||
"com.dsasp.server.common.user.bean",
|
||||
"com.dsasp.server.common.user.service",
|
||||
"com.dsasp.server.common.util",
|
||||
"com.dsasp.server.common.viewframework.bean",
|
||||
"com.dsasp.server.common.viewframework.service",
|
||||
"com.dsasp.server.common.workcalendar.service",
|
||||
"com.dsasp.server.common.workflow.bean",
|
||||
"com.dsasp.server.common.workflow.service",
|
||||
"com.vaadin.data",
|
||||
"com.vaadin.ui",
|
||||
"com.vaadin.server",
|
||||
"org.joda.time",
|
||||
"client.groovy",
|
||||
"com.dsasp.viewframework" ,
|
||||
"com.dsasp.pm.process.client",
|
||||
"com.dsasp.client.dataimport.util",
|
||||
"groovy.json"
|
||||
]
|
||||
|
||||
def DEFAULTIMPORTSLIST = [
|
||||
"com.dsasp.server.common.dataDic.bean.GeneralPOJO",
|
||||
"com.dsasp.server.common.dataDic.bean.CustomSearchConditional",
|
||||
"com.dsasp.server.common.dataDic.service.POJOCRUDService",
|
||||
"com.dsasp.server.common.util.StringUtil",
|
||||
"com.dsasp.server.common.function.GetServicesFunction",
|
||||
"com.dsasp.server.common.function.GetDefaultValueFunction",
|
||||
"com.dsasp.server.common.function.GetValueFunction",
|
||||
"com.dsasp.client.viewframework.template.util.Console"
|
||||
// 适配(P1 服务流引擎):移除两条 Vaadin 客户端 UI 默认导入——它们经 imports.addImport
|
||||
// 逐脚本注入,而 client.groovy.TestService / com.dsasp.client.viewframework.component.MainComponent
|
||||
// 属已淘汰的 Vaadin 表现层(eip4-platform 保真层不含),classpath 缺失会使「每一个」服务流脚本
|
||||
// 编译失败(MultipleCompilationErrorsException: unable to resolve class)。两类与服务流
|
||||
// 服务端取数逻辑无关。原版两条登记于此供 diff 溯源:
|
||||
// "client.groovy.TestService", "com.dsasp.client.viewframework.component.MainComponent"
|
||||
// 详见 P1 服务流实测报告「替换类登记」与迁移手册新增坑位。
|
||||
]
|
||||
|
||||
def DEFAULTSTARIMPORTSLIST=[
|
||||
"org.joda.time"
|
||||
]
|
||||
|
||||
GroovyClassLoader loader
|
||||
|
||||
public SecureGroovyScriptEngineFactory(){
|
||||
ImportCustomizer imports = new ImportCustomizer();
|
||||
CompilerConfiguration cc = new CompilerConfiguration();
|
||||
SecureASTCustomizer secure = new SecureASTCustomizer();
|
||||
secure.with{
|
||||
importsWhitelist = IMPORTSWHITELIST + DEFAULTIMPORTSLIST
|
||||
//importsBlacklist = []
|
||||
starImportsWhitelist = STARIMPORTSWHITELIST + DEFAULTSTARIMPORTSLIST
|
||||
//starImportsBlacklist = []
|
||||
|
||||
//staticImportsWhitelist=[
|
||||
//"com.vaadin.data.Property.ValueChangeEvent",
|
||||
//"com.vaadin.ui.Button.ClickEvent"
|
||||
//]
|
||||
}
|
||||
DEFAULTIMPORTSLIST?.each {
|
||||
imports.addImport(it);
|
||||
}
|
||||
DEFAULTSTARIMPORTSLIST?.each {
|
||||
imports.addStarImport(it);
|
||||
}
|
||||
secure.addExpressionCheckers(new MethodCallExpressionChecker());
|
||||
cc.addCompilationCustomizers(imports,secure);
|
||||
loader = new GroovyClassLoader(getParentLoader(), cc);
|
||||
}
|
||||
|
||||
public ScriptEngine getScriptEngine() {
|
||||
GroovyScriptEngineImpl gse = new GroovyScriptEngineImpl(loader);
|
||||
return gse;
|
||||
}
|
||||
|
||||
private ClassLoader getParentLoader() {
|
||||
// check whether thread context loader can "see" Groovy Script class
|
||||
ClassLoader ctxtLoader = Thread.currentThread().getContextClassLoader();
|
||||
try {
|
||||
Class c = ctxtLoader.loadClass(Script.class.getName());
|
||||
if (c == Script.class) {
|
||||
return ctxtLoader;
|
||||
}
|
||||
} catch (ClassNotFoundException cnfe) {
|
||||
/* ignore */
|
||||
}
|
||||
// exception was thrown or we get wrong class
|
||||
return Script.class.getClassLoader();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,27 @@
|
||||
package com.dsasp.server.core.script.secure;
|
||||
|
||||
import org.codehaus.groovy.ast.expr.ClassExpression;
|
||||
import org.codehaus.groovy.ast.expr.Expression;
|
||||
import org.codehaus.groovy.ast.expr.MethodCallExpression;
|
||||
import org.codehaus.groovy.control.customizers.SecureASTCustomizer;
|
||||
|
||||
/**
|
||||
* F2-13: 原样从 .groovy 转写为 Java,消除 gmavenplus 在 JDK26 下的 ASM 兼容性问题。
|
||||
* 语义与原 .groovy 完全一致:禁止脚本调用 System.exit()。
|
||||
*/
|
||||
public class MethodCallExpressionChecker implements SecureASTCustomizer.ExpressionChecker {
|
||||
|
||||
@Override
|
||||
public boolean isAuthorized(Expression expression) {
|
||||
if (expression instanceof MethodCallExpression mce) {
|
||||
if (mce.getObjectExpression() instanceof ClassExpression ce) {
|
||||
if (ce.getType().getName().equals(System.class.getName())) {
|
||||
if ("exit".equals(mce.getMethodAsString())) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,147 @@
|
||||
package com.dsasp.server.core.script.secure;
|
||||
|
||||
import groovy.lang.GroovyClassLoader;
|
||||
import groovy.lang.Script;
|
||||
|
||||
import javax.script.ScriptEngine;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import org.codehaus.groovy.control.CompilerConfiguration;
|
||||
import org.codehaus.groovy.control.customizers.ImportCustomizer;
|
||||
import org.codehaus.groovy.control.customizers.SecureASTCustomizer;
|
||||
import org.codehaus.groovy.jsr223.GroovyScriptEngineFactory;
|
||||
import org.codehaus.groovy.jsr223.GroovyScriptEngineImpl;
|
||||
|
||||
/**
|
||||
* F2-13: 原样从 .groovy 转写为 Java,消除 gmavenplus 在 JDK26 下的 ASM 兼容性问题。
|
||||
* 语义与原 .groovy 完全一致,详见原文件注释(P1 服务流引擎,Vaadin 客户端导入已移除)。
|
||||
*/
|
||||
public class SecureGroovyScriptEngineFactory extends GroovyScriptEngineFactory {
|
||||
|
||||
private static final List<String> IMPORTS_WHITELIST = Arrays.asList(
|
||||
"com.vaadin.data.fieldgroup.FieldGroup",
|
||||
"com.vaadin.shared.ui.datefield.Resolution",
|
||||
"com.dsasp.viewframework.SingleSelectField",
|
||||
"com.dsasp.viewframework.MultiSelectField",
|
||||
"com.dsasp.viewframework.ExComboBox",
|
||||
"com.dsasp.client.viewframework.listener.TableItemSelectedListener",
|
||||
"com.dsasp.client.viewframework.listener.ConfirmDialogListener",
|
||||
"com.dsasp.client.viewframework.template.form.FormEngineUtil",
|
||||
"com.dsasp.server.common.dataDic.bean.Enumerate",
|
||||
"com.dsasp.server.common.exception.ValidationException",
|
||||
"com.dsasp.server.common.util.UserSession",
|
||||
"com.dsasp.server.common.dataDic.bean.CustomSearchConditional",
|
||||
"com.dsasp.server.dataDic.bean.GeneralPO",
|
||||
"com.dsasp.server.common.workflow.service.ProcessCoreService",
|
||||
"com.dsasp.client.viewframework.template.util.Console",
|
||||
"com.dsasp.server.privilege.service.ServicePrivilege",
|
||||
"com.dsasp.client.viewframework.template.editform.EditFormTemplateComponent",
|
||||
"com.dsasp.client.viewframework.component.MainComponent",
|
||||
"com.dsasp.server.app.convert.PageFieldUtil",
|
||||
"com.dsasp.server.app.model.FormField",
|
||||
"com.dsasp.server.app.model.WfApprovPage",
|
||||
"com.dsasp.client.viewframework.script.ViewScript",
|
||||
"com.dsasp.viewframework.browserframe.ExBrowserFrame"
|
||||
);
|
||||
|
||||
private static final List<String> STAR_IMPORTS_WHITELIST = Arrays.asList(
|
||||
"com.dsasp.client.viewframework.util",
|
||||
"com.dsasp.client.viewframework.template.util",
|
||||
"com.dsasp.server.common.core",
|
||||
"com.dsasp.server.common.core.service",
|
||||
"com.dsasp.server.common.dataDic.bean",
|
||||
"com.dsasp.server.common.dataDic.service",
|
||||
"com.dsasp.server.common.email.bean",
|
||||
"com.dsasp.server.common.email.service",
|
||||
"com.dsasp.server.common.exception",
|
||||
"com.dsasp.server.common.file",
|
||||
"com.dsasp.server.common.file.service",
|
||||
"com.dsasp.server.common.form.bean",
|
||||
"com.dsasp.server.common.form.service",
|
||||
"com.dsasp.server.common.function",
|
||||
"com.dsasp.server.common.log.bean",
|
||||
"com.dsasp.server.common.log.service",
|
||||
"com.dsasp.server.common.message.bean",
|
||||
"com.dsasp.server.common.message.service",
|
||||
"com.dsasp.server.common.organization.bean",
|
||||
"com.dsasp.server.common.organization.service",
|
||||
"com.dsasp.server.common.privilege.bean",
|
||||
"com.dsasp.server.common.privilege.service",
|
||||
"com.dsasp.server.common.sms.service",
|
||||
"com.dsasp.server.common.user.bean",
|
||||
"com.dsasp.server.common.user.service",
|
||||
"com.dsasp.server.common.util",
|
||||
"com.dsasp.server.common.viewframework.bean",
|
||||
"com.dsasp.server.common.viewframework.service",
|
||||
"com.dsasp.server.common.workcalendar.service",
|
||||
"com.dsasp.server.common.workflow.bean",
|
||||
"com.dsasp.server.common.workflow.service",
|
||||
"com.vaadin.data",
|
||||
"com.vaadin.ui",
|
||||
"com.vaadin.server",
|
||||
"org.joda.time",
|
||||
"client.groovy",
|
||||
"com.dsasp.viewframework",
|
||||
"com.dsasp.pm.process.client",
|
||||
"com.dsasp.client.dataimport.util",
|
||||
"groovy.json"
|
||||
);
|
||||
|
||||
private static final List<String> DEFAULT_IMPORTS_LIST = Arrays.asList(
|
||||
"com.dsasp.server.common.dataDic.bean.GeneralPOJO",
|
||||
"com.dsasp.server.common.dataDic.bean.CustomSearchConditional",
|
||||
"com.dsasp.server.common.dataDic.service.POJOCRUDService",
|
||||
"com.dsasp.server.common.util.StringUtil",
|
||||
"com.dsasp.server.common.function.GetServicesFunction",
|
||||
"com.dsasp.server.common.function.GetDefaultValueFunction",
|
||||
"com.dsasp.server.common.function.GetValueFunction",
|
||||
"com.dsasp.client.viewframework.template.util.Console"
|
||||
// 适配(P1 服务流引擎): 移除两条 Vaadin 客户端 UI 默认导入(详见原 .groovy 注释)
|
||||
);
|
||||
|
||||
private static final List<String> DEFAULT_STAR_IMPORTS_LIST = Arrays.asList(
|
||||
"org.joda.time"
|
||||
);
|
||||
|
||||
private final GroovyClassLoader loader;
|
||||
|
||||
public SecureGroovyScriptEngineFactory() {
|
||||
ImportCustomizer imports = new ImportCustomizer();
|
||||
CompilerConfiguration cc = new CompilerConfiguration();
|
||||
SecureASTCustomizer secure = new SecureASTCustomizer();
|
||||
|
||||
List<String> combinedImports = new java.util.ArrayList<>(IMPORTS_WHITELIST);
|
||||
combinedImports.addAll(DEFAULT_IMPORTS_LIST);
|
||||
secure.setImportsWhitelist(combinedImports);
|
||||
|
||||
List<String> combinedStarImports = new java.util.ArrayList<>(STAR_IMPORTS_WHITELIST);
|
||||
combinedStarImports.addAll(DEFAULT_STAR_IMPORTS_LIST);
|
||||
secure.setStarImportsWhitelist(combinedStarImports);
|
||||
|
||||
imports.addImports(DEFAULT_IMPORTS_LIST.toArray(new String[0]));
|
||||
imports.addStarImports(DEFAULT_STAR_IMPORTS_LIST.toArray(new String[0]));
|
||||
|
||||
secure.addExpressionCheckers(new MethodCallExpressionChecker());
|
||||
cc.addCompilationCustomizers(imports, secure);
|
||||
loader = new GroovyClassLoader(getParentLoader(), cc);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ScriptEngine getScriptEngine() {
|
||||
return new GroovyScriptEngineImpl(loader);
|
||||
}
|
||||
|
||||
private ClassLoader getParentLoader() {
|
||||
ClassLoader ctxtLoader = Thread.currentThread().getContextClassLoader();
|
||||
try {
|
||||
Class<?> c = ctxtLoader.loadClass(Script.class.getName());
|
||||
if (c == Script.class) {
|
||||
return ctxtLoader;
|
||||
}
|
||||
} catch (ClassNotFoundException cnfe) {
|
||||
// ignore
|
||||
}
|
||||
return Script.class.getClassLoader();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user