fangqiao/qiaoba-boot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add

Browse Source
This commit is contained in:
ailanyin
2023-07-06 16:16:51 +08:00
parent 7e10a7877f
commit 96699e55c3
9 changed files with 106 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
qiaoba-auth/src/main/java/com/qiaoba/auth/config/SpringSecurityConfig.java
View File

@ -1,7 +1,7 @@
package com.qiaoba.auth.config;
import com.qiaoba.api.auth.constants.SecurityConstant;
import com.qiaoba.auth.filters.AuthenticationCoreFilter;
import com.qiaoba.auth.filters.SecurityContextHolderFilter;
import com.qiaoba.auth.handler.AccessDeniedHandler;
import com.qiaoba.auth.handler.LogoutHandler;
import com.qiaoba.auth.properties.AuthConfigProperties;
@ -36,7 +36,7 @@ public class SpringSecurityConfig {
private final AuthConfigProperties authConfigProperties;
private final AccessDeniedHandler accessDeniedHandler;
private final AuthenticationCoreFilter authenticationCoreFilter;
private final SecurityContextHolderFilter securityContextHolderFilter;
private final LogoutHandler logoutHandler;
@ -72,8 +72,8 @@ public class SpringSecurityConfig {
// 退出处理
httpSecurity.logout().logoutUrl(SecurityConstant.LOGOUT_URI).logoutSuccessHandler(logoutHandler);
// 添加JWT filter
httpSecurity.addFilterBefore(authenticationCoreFilter, UsernamePasswordAuthenticationFilter.class);
httpSecurity.addFilterBefore(authenticationCoreFilter, LogoutFilter.class);
httpSecurity.addFilterBefore(securityContextHolderFilter, UsernamePasswordAuthenticationFilter.class);
httpSecurity.addFilterBefore(securityContextHolderFilter, LogoutFilter.class);
return httpSecurity.build();
}
}

36
qiaoba-auth/src/main/java/com/qiaoba/auth/filters/AuthenticationCoreFilter.java → qiaoba-auth/src/main/java/com/qiaoba/auth/filters/OnlineUserFilter.java
View File

@ -1,21 +1,20 @@
package com.qiaoba.auth.filters;
import com.qiaoba.api.auth.service.AuthConfigApiService;
import com.qiaoba.api.auth.constants.SecurityConstant;
import com.qiaoba.api.auth.entity.dto.OnlineUserDto;
import com.qiaoba.auth.properties.AuthConfigProperties;
import com.qiaoba.api.auth.service.AuthConfigApiService;
import com.qiaoba.api.auth.service.OnlineUserService;
import com.qiaoba.api.auth.utils.TokenUtil;
import com.qiaoba.auth.properties.AuthConfigProperties;
import com.qiaoba.common.base.order.FilterOrder;
import com.qiaoba.common.redis.service.RedisService;
import com.qiaoba.common.web.utils.ResponseUtil;
import com.qiaoba.common.web.utils.UriUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.core.annotation.Order;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.web.filter.OncePerRequestFilter;
import javax.servlet.FilterChain;
@ -26,28 +25,26 @@ import java.io.IOException;
import java.util.Objects;
/**
* 鉴权核心过滤器
* 在线用户过滤器
*
* @author ailanyin
* @version 1.0
* @since 2023-05-28 15:31:55
* @since 2023/7/6 9:14
*/
@RequiredArgsConstructor
@Slf4j
public class AuthenticationCoreFilter extends OncePerRequestFilter {
@Order(FilterOrder.ONLINE_USER_FILTER_ORDER)
public class OnlineUserFilter extends OncePerRequestFilter {
private final RedisService redisService;
private final UserDetailsService userDetailsService;
private final OnlineUserService onlineUserService;
private final AuthConfigProperties authConfigProperties;
private final AuthConfigApiService authConfigApiService;
private final RedisService redisService;
private final OnlineUserService onlineUserService;
private final UserDetailsService userDetailsService;
@Override
protected void doFilterInternal(HttpServletRequest request,
HttpServletResponse response,
FilterChain chain) throws ServletException, IOException {
log.debug("Start run AuthenticationCoreFilter, Uri: {}", request.getRequestURI());
protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain chain) throws ServletException, IOException {
log.debug("Start run OnlineUserFilter, Uri: {}", request.getRequestURI());
// 白名单 放行
for (String uri : authConfigProperties.getWhitelist()) {
if (UriUtil.match(uri, request.getRequestURI())) {
@ -84,13 +81,6 @@ public class AuthenticationCoreFilter extends OncePerRequestFilter {
}
}
// 更新 SecurityContextHolder Authentication, 为了保证 SecurityContext 上下文中 userDetails 是最新的
if (Objects.nonNull(userDetails) && Objects.isNull(SecurityContextHolder.getContext().getAuthentication())) {
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
SecurityContextHolder.getContext().setAuthentication(authentication);
}
chain.doFilter(request, response);
}
}

55
qiaoba-auth/src/main/java/com/qiaoba/auth/filters/SecurityContextHolderFilter.java Normal file
View File

@ -0,0 +1,55 @@
package com.qiaoba.auth.filters;
import cn.hutool.core.util.StrUtil;
import com.qiaoba.api.auth.utils.TokenUtil;
import com.qiaoba.auth.properties.AuthConfigProperties;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.userdetails.UserDetails;
import org.springframework.security.core.userdetails.UserDetailsService;
import org.springframework.security.web.authentication.WebAuthenticationDetailsSource;
import org.springframework.web.filter.OncePerRequestFilter;
import javax.servlet.FilterChain;
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.util.Objects;
/**
* 鉴权核心过滤器
*
* @author ailanyin
* @version 1.0
* @since 2023-05-28 15:31:55
*/
@RequiredArgsConstructor
@Slf4j
public class SecurityContextHolderFilter extends OncePerRequestFilter {
private final UserDetailsService userDetailsService;
@Override
protected void doFilterInternal(HttpServletRequest request,
HttpServletResponse response,
FilterChain chain) throws ServletException, IOException {
log.debug("Start run SecurityContextHolderFilter, Uri: {}", request.getRequestURI());
String username = TokenUtil.analyzeUsername(request);
if (StrUtil.isNotBlank(username)) {
UserDetails userDetails = userDetailsService.loadUserByUsername(username);
// 更新 SecurityContextHolder Authentication, 为了保证 SecurityContext 上下文中 userDetails 是最新的
if (Objects.nonNull(userDetails) && Objects.isNull(SecurityContextHolder.getContext().getAuthentication())) {
UsernamePasswordAuthenticationToken authentication = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
authentication.setDetails(new WebAuthenticationDetailsSource().buildDetails(request));
SecurityContextHolder.getContext().setAuthentication(authentication);
}
}
chain.doFilter(request, response);
}
}

7
qiaoba-auth/src/main/java/com/qiaoba/auth/handler/LogoutHandler.java
View File

@ -1,5 +1,6 @@
package com.qiaoba.auth.handler;
import cn.hutool.core.util.ObjectUtil;
import com.qiaoba.api.auth.entity.LoginUser;
import com.qiaoba.api.auth.service.OnlineUserService;
import lombok.RequiredArgsConstructor;
@ -28,7 +29,9 @@ public class LogoutHandler implements LogoutSuccessHandler {
@Override
public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
// 删除缓存中的用户信息
LoginUser user = (LoginUser) authentication.getPrincipal();
onlineUserService.deleteOne(user.getUsername(), user.getDeviceSn(), true);
if (ObjectUtil.isNotEmpty(authentication) && ObjectUtil.isNotEmpty(authentication.getPrincipal())) {
LoginUser user = (LoginUser) authentication.getPrincipal();
onlineUserService.deleteOne(user.getUsername(), user.getDeviceSn(), true);
}
}
}

3
qiaoba-auth/src/main/resources/META-INF/spring.factories
View File

@ -2,7 +2,8 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
com.qiaoba.auth.properties.AuthConfigProperties,\
com.qiaoba.auth.handler.AccessDeniedHandler,\
com.qiaoba.auth.handler.LogoutHandler,\
com.qiaoba.auth.filters.AuthenticationCoreFilter,\
com.qiaoba.auth.filters.OnlineUserFilter,\
com.qiaoba.auth.filters.SecurityContextHolderFilter,\
com.qiaoba.auth.advice.SecurityExceptionAdvice,\
com.qiaoba.auth.aspectj.DataScopeAspect,\
com.qiaoba.auth.service.impl.OnlineUserServiceImpl,\