Skip to content

Commit d56fc4e

Browse files
authored
Merge pull request #1205 from pig-mesh/auto-format-1073
Auto-format: Fix code formatting issues
2 parents 7d6d813 + 2644134 commit d56fc4e

File tree

3 files changed

+7
-13
lines changed

3 files changed

+7
-13
lines changed

pig-visual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/controller/SysJobController.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,11 @@ public R saveJob(@RequestBody SysJob sysJob) {
115115

116116
// 安全验证:对于Java类类型的任务,验证类名和方法名
117117
if ("1".equals(sysJob.getJobType())) {
118-
if (!com.pig4cloud.pig.daemon.quartz.util.ClassNameValidator
119-
.isValidClassName(sysJob.getClassName())) {
118+
if (!com.pig4cloud.pig.daemon.quartz.util.ClassNameValidator.isValidClassName(sysJob.getClassName())) {
120119
log.warn("新增定时任务失败,类名验证不通过:{}", sysJob.getClassName());
121120
return R.failed("类名验证失败,该类在黑名单中或包含危险特征,拒绝创建");
122121
}
123-
if (!com.pig4cloud.pig.daemon.quartz.util.ClassNameValidator
124-
.isValidMethodName(sysJob.getMethodName())) {
122+
if (!com.pig4cloud.pig.daemon.quartz.util.ClassNameValidator.isValidMethodName(sysJob.getMethodName())) {
125123
log.warn("新增定时任务失败,方法名验证不通过:{}", sysJob.getMethodName());
126124
return R.failed("方法名验证失败,该方法在黑名单中或包含危险特征,拒绝创建");
127125
}
@@ -144,13 +142,11 @@ public R saveJob(@RequestBody SysJob sysJob) {
144142
public R updateJob(@RequestBody SysJob sysJob) {
145143
// 安全验证:对于Java类类型的任务,验证类名和方法名
146144
if ("1".equals(sysJob.getJobType())) {
147-
if (!com.pig4cloud.pig.daemon.quartz.util.ClassNameValidator
148-
.isValidClassName(sysJob.getClassName())) {
145+
if (!com.pig4cloud.pig.daemon.quartz.util.ClassNameValidator.isValidClassName(sysJob.getClassName())) {
149146
log.warn("修改定时任务失败,类名验证不通过:{}", sysJob.getClassName());
150147
return R.failed("类名验证失败,该类在黑名单中或包含危险特征,拒绝修改");
151148
}
152-
if (!com.pig4cloud.pig.daemon.quartz.util.ClassNameValidator
153-
.isValidMethodName(sysJob.getMethodName())) {
149+
if (!com.pig4cloud.pig.daemon.quartz.util.ClassNameValidator.isValidMethodName(sysJob.getMethodName())) {
154150
log.warn("修改定时任务失败,方法名验证不通过:{}", sysJob.getMethodName());
155151
return R.failed("方法名验证失败,该方法在黑名单中或包含危险特征,拒绝修改");
156152
}

pig-visual/pig-quartz/src/main/java/com/pig4cloud/pig/daemon/quartz/util/ClassNameValidator.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,8 @@ public static boolean isValidMethodName(String methodName) {
110110
}
111111

112112
// 检查方法名是否包含危险特征
113-
Set<String> dangerousMethods = new HashSet<>(
114-
Arrays.asList("exec", "eval", "execute", "invoke", "newInstance", "forName", "getRuntime",
115-
"loadClass", "defineClass", "getMethod", "getDeclaredMethod"));
113+
Set<String> dangerousMethods = new HashSet<>(Arrays.asList("exec", "eval", "execute", "invoke", "newInstance",
114+
"forName", "getRuntime", "loadClass", "defineClass", "getMethod", "getDeclaredMethod"));
116115

117116
if (dangerousMethods.contains(methodName)) {
118117
log.warn("方法名 [{}] 在危险方法黑名单中,拒绝执行", methodName);

pig-visual/pig-quartz/src/test/java/com/pig4cloud/pig/daemon/quartz/util/JavaClassTaskInvokSecurityTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@
2424
import static org.junit.jupiter.api.Assertions.*;
2525

2626
/**
27-
* JavaClassTaskInvok 安全测试类
28-
* 验证RCE漏洞已被修复
27+
* JavaClassTaskInvok 安全测试类 验证RCE漏洞已被修复
2928
*
3029
* @author lengleng
3130
* @date 2025/10/22

0 commit comments

Comments
 (0)