hhyykk/ipms-sjy
1
1
Fork 0
mirror of https://gitee.com/hhyykk/ipms-sjy.git synced 2025-02-01 19:24:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

【修复】全局：@PermitAll 未处理 RequestMappingInfo.getPatternsCondition 的问题

Browse Source
This commit is contained in:
YunaiV 2024-05-18 21:02:26 +08:00
parent f3dbcf46bb
commit 423f6cc9da
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
yudao-framework/yudao-spring-boot-starter-security/src/main/java/cn/iocoder/yudao/framework/security/config/YudaoWebSecurityConfigurerAdapter.java
View File

@ -28,11 +28,15 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.method.HandlerMethod; import org.springframework.web.method.HandlerMethod;
import org.springframework.web.servlet.mvc.method.RequestMappingInfo; import org.springframework.web.servlet.mvc.method.RequestMappingInfo;
import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping; import org.springframework.web.servlet.mvc.method.annotation.RequestMappingHandlerMapping;
import org.springframework.web.util.pattern.PathPattern;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.convertList;
/** /**
* 自定义的 Spring Security 配置适配器实现 * 自定义的 Spring Security 配置适配器实现
* *
@ -163,13 +167,20 @@ public class YudaoWebSecurityConfigurerAdapter {
if (!handlerMethod.hasMethodAnnotation(PermitAll.class)) { if (!handlerMethod.hasMethodAnnotation(PermitAll.class)) {
continue; continue;
} }
if (entry.getKey().getPatternsCondition() == null) { Set<String> urls = new HashSet<>();
if (entry.getKey().getPatternsCondition() != null) {
urls.addAll(entry.getKey().getPatternsCondition().getPatterns());
}
if (entry.getKey().getPathPatternsCondition() != null) {
urls.addAll(convertList(entry.getKey().getPathPatternsCondition().getPatterns(), PathPattern::getPatternString));
}
if (urls.isEmpty()) {
continue; continue;
} }
Set<String> urls = entry.getKey().getPatternsCondition().getPatterns();
// 特殊：使用 @RequestMapping 注解，并且未写 method 属性，此时认为都需要免登录 // 特殊：使用 @RequestMapping 注解，并且未写 method 属性，此时认为都需要免登录
Set<RequestMethod> methods = entry.getKey().getMethodsCondition().getMethods(); Set<RequestMethod> methods = entry.getKey().getMethodsCondition().getMethods();
if (CollUtil.isEmpty(methods)) { // if (CollUtil.isEmpty(methods)) {
result.putAll(HttpMethod.GET, urls); result.putAll(HttpMethod.GET, urls);
result.putAll(HttpMethod.POST, urls); result.putAll(HttpMethod.POST, urls);
result.putAll(HttpMethod.PUT, urls); result.putAll(HttpMethod.PUT, urls);