diff --git a/approve/src/main/resources/application-dev.yml b/approve/src/main/resources/application-dev.yml index 793a1266..5381207d 100644 --- a/approve/src/main/resources/application-dev.yml +++ b/approve/src/main/resources/application-dev.yml @@ -98,5 +98,10 @@ lombok: file: rootPath: /data/home/sdm +security: + whitelist: + paths: + - /aa/bb + #logging: # config: ./config/logback.xml \ No newline at end of file diff --git a/capability/src/main/resources/application-dev.yml b/capability/src/main/resources/application-dev.yml index a897eec5..495cb312 100644 --- a/capability/src/main/resources/application-dev.yml +++ b/capability/src/main/resources/application-dev.yml @@ -104,5 +104,10 @@ lombok: file: rootPath: /data/home/sdm +security: + whitelist: + paths: + - /pbs/jobFileCallback + #logging: # config: ./config/logback.xml \ No newline at end of file diff --git a/data/src/main/java/com/sdm/data/config/WhitelistProperties.java b/common/src/main/java/com/sdm/common/config/WhitelistProperties.java similarity index 92% rename from data/src/main/java/com/sdm/data/config/WhitelistProperties.java rename to common/src/main/java/com/sdm/common/config/WhitelistProperties.java index 26affc4e..510775cc 100644 --- a/data/src/main/java/com/sdm/data/config/WhitelistProperties.java +++ b/common/src/main/java/com/sdm/common/config/WhitelistProperties.java @@ -1,4 +1,4 @@ -package com.sdm.data.config; +package com.sdm.common.config; import lombok.Data; import org.springframework.boot.context.properties.ConfigurationProperties; diff --git a/data/src/main/java/com/sdm/data/filter/AuthFilter.java b/data/src/main/java/com/sdm/data/filter/AuthFilter.java index 45d0c897..56147bc3 100644 --- a/data/src/main/java/com/sdm/data/filter/AuthFilter.java +++ b/data/src/main/java/com/sdm/data/filter/AuthFilter.java @@ -1,7 +1,7 @@ package com.sdm.data.filter; import com.sdm.common.common.ThreadLocalContext; -import com.sdm.data.config.WhitelistProperties; +import com.sdm.common.config.WhitelistProperties; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; diff --git a/flowable/src/main/resources/application-dev.yml b/flowable/src/main/resources/application-dev.yml index 1adaa795..e9c5a86b 100644 --- a/flowable/src/main/resources/application-dev.yml +++ b/flowable/src/main/resources/application-dev.yml @@ -33,4 +33,7 @@ mybatis-plus: global-config: db-config: id-type: auto - +security: + whitelist: + paths: + - /pbs/jobFileCallback diff --git a/gateway2/src/main/resources/application-dev.yml b/gateway2/src/main/resources/application-dev.yml index 4b3b1b5e..ecff6ed7 100644 --- a/gateway2/src/main/resources/application-dev.yml +++ b/gateway2/src/main/resources/application-dev.yml @@ -115,4 +115,9 @@ logging: # 0单机处理,1负载均衡轮询 serverType: 0 serverIp: 192.168.65.161 -#serverIp: 192.168.65.73 \ No newline at end of file +#serverIp: 192.168.65.73 + +security: + whitelist: + paths: + - aa \ No newline at end of file diff --git a/pbs/src/main/java/com/sdm/pbs/filter/AuthFilter.java b/pbs/src/main/java/com/sdm/pbs/filter/AuthFilter.java index 7de70294..a5e871a2 100644 --- a/pbs/src/main/java/com/sdm/pbs/filter/AuthFilter.java +++ b/pbs/src/main/java/com/sdm/pbs/filter/AuthFilter.java @@ -1,24 +1,30 @@ package com.sdm.pbs.filter; import com.sdm.common.common.ThreadLocalContext; -//import com.sdm.pbs.service.UserService; +import com.sdm.common.config.WhitelistProperties; import jakarta.servlet.*; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.util.AntPathMatcher; -import javax.annotation.Resource; import java.io.IOException; +import java.util.List; @Slf4j public class AuthFilter implements Filter { -// @Resource -// private UserService userService; + + @Autowired + private WhitelistProperties whitelistProperties; + private List excludedPaths; + private final AntPathMatcher pathMatcher = new AntPathMatcher(); @Override public void init(FilterConfig filterConfig) throws ServletException { Filter.super.init(filterConfig); + // 从初始化参数中读取白名单 + excludedPaths = whitelistProperties.getPaths(); log.info("----------- AuthFilter init ----------"); } @@ -26,6 +32,14 @@ public class AuthFilter implements Filter { public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { if (servletRequest instanceof HttpServletRequest) { HttpServletRequest req = (HttpServletRequest) servletRequest; + String path = req.getRequestURI().substring(req.getContextPath().length()); + // 检查当前请求是否在白名单中 + for (String excludedPath : excludedPaths) { + if (pathMatcher.match(excludedPath, path)) { + filterChain.doFilter(servletRequest, servletResponse); + return; + } + } if(!ThreadLocalContext.verifyRequest(req)) { HttpServletResponse response = (HttpServletResponse) servletResponse; diff --git a/pbs/src/main/resources/application-dev.yml b/pbs/src/main/resources/application-dev.yml index cb617d40..8456fdfb 100644 --- a/pbs/src/main/resources/application-dev.yml +++ b/pbs/src/main/resources/application-dev.yml @@ -131,4 +131,9 @@ pbs: task: hpc: hpc qusb: qusb - impl: hpc \ No newline at end of file + impl: hpc + +security: + whitelist: + paths: + - /pbs/jobFileCallback \ No newline at end of file diff --git a/performance/src/main/resources/application-dev.yml b/performance/src/main/resources/application-dev.yml index 83d6f06c..e63c90bb 100644 --- a/performance/src/main/resources/application-dev.yml +++ b/performance/src/main/resources/application-dev.yml @@ -98,5 +98,10 @@ lombok: file: rootPath: /data/home/sdm +security: + whitelist: + paths: + - aa + #logging: # config: ./config/logback.xml \ No newline at end of file diff --git a/project/src/main/resources/application-dev.yml b/project/src/main/resources/application-dev.yml index e3b64de8..e3cc24de 100644 --- a/project/src/main/resources/application-dev.yml +++ b/project/src/main/resources/application-dev.yml @@ -116,5 +116,9 @@ lombok: file: rootPath: /data/home/sdm +security: + whitelist: + paths: + - aa #logging: # config: ./config/logback.xml \ No newline at end of file diff --git a/system/src/main/resources/application-dev.yml b/system/src/main/resources/application-dev.yml index 7dc4b95b..96219d46 100644 --- a/system/src/main/resources/application-dev.yml +++ b/system/src/main/resources/application-dev.yml @@ -170,4 +170,9 @@ cid: msg: sendMessage: /spdm-msg/sendMessage log: - saveLog: /spdm-log/saveLog \ No newline at end of file + saveLog: /spdm-log/saveLog + +security: + whitelist: + paths: + - aa \ No newline at end of file diff --git a/task/src/main/resources/application-dev.yml b/task/src/main/resources/application-dev.yml index 05c609d9..435e8784 100644 --- a/task/src/main/resources/application-dev.yml +++ b/task/src/main/resources/application-dev.yml @@ -121,4 +121,9 @@ file: approve: replyUrl: http:192.168.65.161:7102/simulation/task/taskpool/approveHandleNotice #logging: -# config: ./config/logback.xml \ No newline at end of file +# config: ./config/logback.xml + +security: + whitelist: + paths: + - aa \ No newline at end of file