github
/
RuoYi
mirror of https://gitee.com/y_project/RuoYi.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !451 from 张宪新/hotfix/fix-scheduleUtils_NPE

pull/451/MERGE
张宪新 2025-02-27 02:57:21 +00:00 committed by Gitee
parent 9f1089ff71 8539c5b40a
commit 31cd77f8d7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-quartz/src/main/java/com/ruoyi/quartz/controller/SysJobController.java
View File

@ -4,6 +4,7 @@ import java.util.List;
import org.apache.shiro.authz.annotation.RequiresPermissions; import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.ModelMap; import org.springframework.ui.ModelMap;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
@ -38,6 +39,9 @@ public class SysJobController extends BaseController
{ {
private String prefix = "monitor/job"; private String prefix = "monitor/job";
@Value("${job.whiteList:}")
private List<String> whiteList;
@Autowired @Autowired
private ISysJobService jobService; private ISysJobService jobService;
@ -154,7 +158,7 @@ public class SysJobController extends BaseController
{ {
return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规"); return error("新增任务'" + job.getJobName() + "'失败，目标字符串存在违规");
} }
else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) else if (!ScheduleUtils.whiteList(job.getInvokeTarget(), whiteList.toArray(new String[whiteList.size()])))
{ {
return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内"); return error("新增任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
} }
@ -202,7 +206,7 @@ public class SysJobController extends BaseController
{ {
return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规"); return error("修改任务'" + job.getJobName() + "'失败，目标字符串存在违规");
} }
else if (!ScheduleUtils.whiteList(job.getInvokeTarget())) else if (!ScheduleUtils.whiteList(job.getInvokeTarget(), whiteList.toArray(new String[whiteList.size()])))
{ {
return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内"); return error("修改任务'" + job.getJobName() + "'失败，目标字符串不在白名单内");
} }

16
ruoyi-quartz/src/main/java/com/ruoyi/quartz/util/ScheduleUtils.java
View File

@ -1,5 +1,6 @@
package com.ruoyi.quartz.util; package com.ruoyi.quartz.util;
import org.apache.commons.lang3.ArrayUtils;
import org.quartz.CronScheduleBuilder; import org.quartz.CronScheduleBuilder;
import org.quartz.CronTrigger; import org.quartz.CronTrigger;
import org.quartz.Job; import org.quartz.Job;
@ -10,6 +11,8 @@ import org.quartz.Scheduler;
import org.quartz.SchedulerException; import org.quartz.SchedulerException;
import org.quartz.TriggerBuilder; import org.quartz.TriggerBuilder;
import org.quartz.TriggerKey; import org.quartz.TriggerKey;
import org.springframework.aop.support.AopUtils;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.constant.ScheduleConstants; import com.ruoyi.common.constant.ScheduleConstants;
import com.ruoyi.common.exception.job.TaskException; import com.ruoyi.common.exception.job.TaskException;
@ -123,19 +126,26 @@ public class ScheduleUtils
* 检查包名是否为白名单配置 * 检查包名是否为白名单配置
* *
* @param invokeTarget 目标字符串 * @param invokeTarget 目标字符串
* @param extendedWhiteList 扩展的名单单
* @return 结果 * @return 结果
*/ */
public static boolean whiteList(String invokeTarget) public static boolean whiteList(String invokeTarget, String... extendedWhiteList)
{ {
String[] whiteList = StringUtils.isEmpty(extendedWhiteList) ? Constants.JOB_WHITELIST_STR
: ArrayUtils.addAll(extendedWhiteList, Constants.JOB_WHITELIST_STR);
String packageName = StringUtils.substringBefore(invokeTarget, "("); String packageName = StringUtils.substringBefore(invokeTarget, "(");
int count = StringUtils.countMatches(packageName, "."); int count = StringUtils.countMatches(packageName, ".");
if (count > 1) if (count > 1)
{ {
return StringUtils.containsAnyIgnoreCase(invokeTarget, Constants.JOB_WHITELIST_STR); return StringUtils.containsAnyIgnoreCase(invokeTarget, whiteList);
} }
Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]); Object obj = SpringUtils.getBean(StringUtils.split(invokeTarget, ".")[0]);
if (AopUtils.isAopProxy(obj)) {
obj = AopUtils.getTargetClass(obj);
}
String beanPackageName = obj.getClass().getPackage().getName(); String beanPackageName = obj.getClass().getPackage().getName();
return StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_WHITELIST_STR) return StringUtils.containsAnyIgnoreCase(beanPackageName, whiteList)
&& !StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_ERROR_STR); && !StringUtils.containsAnyIgnoreCase(beanPackageName, Constants.JOB_ERROR_STR);
} }
} }