wsr/orange-admin
1
0
Fork 0
mirror of https://gitee.com/orangeform/orange-admin.git synced 2026-01-17 18:46:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

commit：同步2.2版本

Browse Source
This commit is contained in:
Jerry
2022-01-23 21:00:54 +08:00
parent ff7e52eedb
commit 35ac62e4d2
1201 changed files with 16301 additions and 161770 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/gateway/src/main/java/com/orangeforms/gateway/config/SwaggerResourceConfig.java
View File

@@ -32,7 +32,11 @@ public class SwaggerResourceConfig implements SwaggerResourcesProvider {
public List<SwaggerResource> get() {
List<SwaggerResource> resources = new ArrayList<>();
List<String> routes = new ArrayList<>();
routeLocator.getRoutes().subscribe(route -> routes.add(route.getId()));
routeLocator.getRoutes().subscribe(route -> {
if (!"upms-captcha".equals(route.getId())) {
routes.add(route.getId());
}
});
gatewayProperties.getRoutes().stream().filter(routeDefinition -> routes.contains(routeDefinition.getId()))
.forEach(route -> route.getPredicates().stream()
.filter(predicateDefinition -> ("Path").equalsIgnoreCase(predicateDefinition.getName()))

20
orange-demo-multi-uaa/orange-demo-multi-service-uaa/application/gateway/src/main/java/com/orangeforms/gateway/filter/AuthenticationPreFilter.java
View File

@@ -56,11 +56,18 @@ public class AuthenticationPreFilter implements GlobalFilter, Ordered {
ServerHttpRequest request = exchange.getRequest();
ServerHttpResponse response = exchange.getResponse();
String url = request.getURI().getPath();
// 判断是否为白名单请求，以及一些内置不需要验证的请求。(登录请求也包含其中)。
if (this.shouldNotFilter(url)) {
return chain.filter(exchange);
}
String token = this.getTokenFromRequest(request);
boolean noLoginUrl = false;
// 判断是否为白名单请求，以及一些内置不需要验证的请求。(登录请求也包含其中)。
// 如果当前请求中包含token令牌不为空的时候，也会继续验证Token的合法性，这样就能保证
// Token中的用户信息被业务接口正常访问到了。而如果当token为空的时候，白名单的接口可以
// 被网关直接转发，无需登录验证。当然被转发的接口，也无法获取到用户的token身份数据了。
if (this.shouldNotFilter(url)) {
noLoginUrl = true;
if (StringUtils.isBlank(token)) {
return chain.filter(exchange);
}
}
Claims c = JwtUtil.parseToken(token, appConfig.getTokenSigningKey());
if (JwtUtil.isNullOrExpired(c)) {
log.warn("EXPIRED request [{}] from REMOTE-IP [{}].", url, IpUtil.getRemoteIpAddress(request));
@@ -111,7 +118,7 @@ public class AuthenticationPreFilter implements GlobalFilter, Ordered {
log.error("Failed to call AuthenticationPreFilter.filter.", e);
}
boolean isAdmin = tokenData.getBoolean("isAdmin");
if (Boolean.FALSE.equals(isAdmin) && !this.hasPermission(redissonClient, sessionId, url)) {
if (!noLoginUrl && Boolean.FALSE.equals(isAdmin) && !this.hasPermission(redissonClient, sessionId, url)) {
log.warn("FORBIDDEN request [{}] from REMOTE-IP [{}] for USER [{} -- {}] no perm!",
url, IpUtil.getRemoteIpAddress(request), userId, showName);
response.setStatusCode(HttpStatus.FORBIDDEN);
@@ -168,7 +175,8 @@ public class AuthenticationPreFilter implements GlobalFilter, Ordered {
}
if (url.equals(GatewayConstant.ADMIN_LOGIN_BY_UAA_URL)
|| url.equals(GatewayConstant.GET_UAA_LOGIN_URL)
|| url.equals(GatewayConstant.ADMIN_LOGIN_URL)) {
|| url.equals(GatewayConstant.ADMIN_LOGIN_URL)
|| url.startsWith("/captcha")) {
return true;
}
// 先过滤直接匹配的白名单url。