Thanks to visit codestin.com
Credit goes to github.com

Skip to content

解决1.3.8部分bug,并从dev分支同步 #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
matevip merged 3 commits into from
Oct 19, 2020
Merged

解决1.3.8部分bug,并从dev分支同步 #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ae643a
uaa模块增加注解和解决循环引用异常
matevip Oct 19, 2020
9e1923b
修复演示模式下记录日志的异常save->set
matevip Oct 19, 2020
af2ae82
更新sql增加微服务和api管理功能
matevip Oct 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
273 changes: 147 additions & 126 deletions doc/sql/matex_schema.sql
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions ...ecurity/src/main/java/vip/mate/core/security/handle/MateAuthenticationSuccessHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package vip.mate.core.security.handle;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.AllArgsConstructor;
import lombok.NonNull;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
Expand All @@ -14,7 +13,6 @@
import org.springframework.security.oauth2.provider.*;
import org.springframework.security.oauth2.provider.token.AuthorizationServerTokenServices;
import org.springframework.security.web.authentication.AuthenticationSuccessHandler;
import org.springframework.stereotype.Component;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Expand Down
7 changes: 5 additions & 2 deletions mate-platform/mate-system/src/main/java/vip/mate/system/aspect/PreviewAspect.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import org.springframework.beans.factory.annotation.Value;
import org.springframework.http.HttpMethod;
import org.springframework.stereotype.Component;
import org.springframework.util.AntPathMatcher;
import vip.mate.core.common.exception.PreviewException;
import vip.mate.core.common.util.RequestHolder;
import vip.mate.core.common.util.TraceUtil;
Expand All @@ -24,7 +25,9 @@
public class PreviewAspect {

@Value("${mate.preview.enable}")
private boolean isPreview = false;
private final boolean isPreview = false;

private final AntPathMatcher antPathMatcher = new AntPathMatcher();

@Around(
"execution(static vip.mate.core.common.api.Result *(..)) || " +
Expand All @@ -35,7 +38,7 @@ public Object aroundApi(ProceedingJoinPoint point) throws Throwable {
//　获取request
HttpServletRequest request = RequestHolder.getHttpServletRequest();
if (StringUtils.equalsIgnoreCase(request.getMethod(), HttpMethod.POST.name()) && isPreview
&& !(StringUtils.equalsIgnoreCase(request.getRequestURI(), "/provider/log/save"))) {
&& !(antPathMatcher.match(request.getRequestURI(), "/provider/log/set"))) {
log.error("演示环境不能操作！");
throw new PreviewException("演示环境不能操作！");
}
Expand Down
127 changes: 65 additions & 62 deletions mate-uaa/src/main/java/vip/mate/uaa/config/SecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@
import vip.mate.uaa.sms.SmsCodeAuthenticationSecurityConfig;
import vip.mate.uaa.social.SocialAuthenticationSecurityConfig;

import javax.annotation.Resource;

/**
* 安全配置中心
*
Expand All @@ -46,76 +48,77 @@
@EnableWebSecurity
public class SecurityConfig extends WebSecurityConfigurerAdapter {

@Autowired
private IgnoreUrlPropsConfig ignoreUrlPropsConfig;
@Autowired
private IgnoreUrlPropsConfig ignoreUrlPropsConfig;

@Bean
public PasswordEncoder passwordEncoder() {
return PasswordEncoderFactories.createDelegatingPasswordEncoder();
}
@Bean
public PasswordEncoder passwordEncoder() {
return PasswordEncoderFactories.createDelegatingPasswordEncoder();
}

@Autowired
private SmsCodeAuthenticationSecurityConfig smsCodeAuthenticationSecurityConfig;
@Resource
private SmsCodeAuthenticationSecurityConfig smsCodeAuthenticationSecurityConfig;

@Autowired
private SocialAuthenticationSecurityConfig socialAuthenticationSecurityConfig;
@Resource
private SocialAuthenticationSecurityConfig socialAuthenticationSecurityConfig;

/**
* 必须要定义，否则不支持grant_type=password模式
* @return
*/
@Bean
@Override
@SneakyThrows
public AuthenticationManager authenticationManagerBean() {
return super.authenticationManagerBean();
}
/**
* 必须要定义，否则不支持grant_type=password模式
*
* @return AuthenticationManager
*/
@Bean
@Override
@SneakyThrows
public AuthenticationManager authenticationManagerBean() {
return super.authenticationManagerBean();
}

@Bean
public AuthenticationSuccessHandler mateAuthenticationSuccessHandler() {
return new MateAuthenticationSuccessHandler();
}
@Bean
public AuthenticationSuccessHandler mateAuthenticationSuccessHandler() {
return new MateAuthenticationSuccessHandler();
}

@Bean
public AuthenticationFailureHandler mateAuthenticationFailureHandler() {
return new MateAuthenticationFailureHandler();
}
@Bean
public AuthenticationFailureHandler mateAuthenticationFailureHandler() {
return new MateAuthenticationFailureHandler();
}


@Override
@Bean
public UserDetailsService userDetailsService() {
return new UserDetailsServiceImpl();
}
@Override
@Bean
public UserDetailsService userDetailsService() {
return new UserDetailsServiceImpl();
}

@Override
protected void configure(HttpSecurity http) throws Exception {
ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry config
= http.requestMatchers().anyRequest()
.and()
.apply(smsCodeAuthenticationSecurityConfig)
.and()
.apply(socialAuthenticationSecurityConfig)
.and()
.authorizeRequests();
ignoreUrlPropsConfig.getUrls().forEach(e -> {
config.antMatchers(e).permitAll();
});
config
.antMatchers("/auth/**").permitAll()
.antMatchers("/oauth/**").permitAll()
.antMatchers("/actuator/**").permitAll()
.antMatchers("/v2/api-docs").permitAll()
.antMatchers("/v2/api-docs-ext").permitAll()
.anyRequest().authenticated()
.and()
.csrf().disable();
}
@Override
protected void configure(HttpSecurity http) throws Exception {
ExpressionUrlAuthorizationConfigurer<HttpSecurity>.ExpressionInterceptUrlRegistry config
= http.requestMatchers().anyRequest()
.and()
.apply(smsCodeAuthenticationSecurityConfig)
.and()
.apply(socialAuthenticationSecurityConfig)
.and()
.authorizeRequests();
ignoreUrlPropsConfig.getUrls().forEach(e -> {
config.antMatchers(e).permitAll();
});
config
.antMatchers("/auth/**").permitAll()
.antMatchers("/oauth/**").permitAll()
.antMatchers("/actuator/**").permitAll()
.antMatchers("/v2/api-docs").permitAll()
.antMatchers("/v2/api-docs-ext").permitAll()
.anyRequest().authenticated()
.and()
.csrf().disable();
}

@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.
userDetailsService(userDetailsService())
.passwordEncoder(passwordEncoder());
}
@Override
protected void configure(AuthenticationManagerBuilder auth) throws Exception {
auth.
userDetailsService(userDetailsService())
.passwordEncoder(passwordEncoder());
}
}
3 changes: 1 addition & 2 deletions mate-uaa/src/main/java/vip/mate/uaa/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ public Map<String, String> loginType() {
*
* @param oauthType 第三方登录类型
* @param response response
* @throws IOException
* @throws IOException IO异常
*/
@Log(value = "第三方登录", exception = "第三方登录请求异常")
@ApiOperation(value = "第三方登录", notes = "第三方登录")
Expand All @@ -152,7 +152,6 @@ public void login(@PathVariable String oauthType, HttpServletResponse response)
*
* @param oauthType 第三方登录类型
* @param callback 携带返回的信息
* @return 登录成功后的信息
*/
@Log(value = "第三方登录回调", exception = "第三方登录回调请求异常")
@ApiOperation(value = "第三方登录回调", notes = "第三方登录回调")
Expand Down
90 changes: 48 additions & 42 deletions mate-uaa/src/main/java/vip/mate/uaa/sms/SmsCodeAuthenticationFilter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,62 +12,68 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Objects;

/**
* 短信验证码验证过滤器
*
* @author pangu
*/
public class SmsCodeAuthenticationFilter extends AbstractAuthenticationProcessingFilter {

/**
* 请求中的参数
*/
private String mobileParameter = Oauth2Constant.DEFAULT_PARAMETER_NAME_MOBILE;
/**
* 请求中的参数
*/
private String mobileParameter = Oauth2Constant.DEFAULT_PARAMETER_NAME_MOBILE;

private boolean postOnly = true;
private boolean postOnly = true;

public SmsCodeAuthenticationFilter() {
super(new AntPathRequestMatcher(Oauth2Constant.OAUTH_MOBILE, "POST"));
}
public SmsCodeAuthenticationFilter() {
super(new AntPathRequestMatcher(Oauth2Constant.OAUTH_MOBILE, "POST"));
}

public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
if (postOnly && !request.getMethod().equals("POST")) {
throw new AuthenticationServiceException("Authentication method not supported: " + request.getMethod());
}
@Override
public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) throws AuthenticationException {
if (postOnly && !request.getMethod().equals("POST")) {
throw new AuthenticationServiceException("Authentication method not supported: " + request.getMethod());
}

// 获取请求中的参数值
String mobile = obtainMobile(request);
// 获取请求中的参数值
String mobile = obtainMobile(request);

if (Objects.isNull(mobile)) {
mobile = "";
}
if (Objects.isNull(mobile)) {
mobile = "";
}

mobile = mobile.trim();
mobile = mobile.trim();

SmsCodeAuthenticationToken authRequest = new SmsCodeAuthenticationToken(mobile);
SmsCodeAuthenticationToken authRequest = new SmsCodeAuthenticationToken(mobile);

// Allow subclasses to set the "details" property
setDetails(request, authRequest);
// Allow subclasses to set the "details" property
setDetails(request, authRequest);

return this.getAuthenticationManager().authenticate(authRequest);
}
return this.getAuthenticationManager().authenticate(authRequest);
}

/**
* 获取手机号
*/
protected String obtainMobile(HttpServletRequest request) {
return request.getParameter(mobileParameter);
}
/**
* 获取手机号
*/
protected String obtainMobile(HttpServletRequest request) {
return request.getParameter(mobileParameter);
}

protected void setDetails(HttpServletRequest request, SmsCodeAuthenticationToken authRequest) {
authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
}
protected void setDetails(HttpServletRequest request, SmsCodeAuthenticationToken authRequest) {
authRequest.setDetails(authenticationDetailsSource.buildDetails(request));
}

public void setMobileParameter(String mobileParameter) {
Assert.hasText(mobileParameter, "Mobile parameter must not be empty or null");
this.mobileParameter = mobileParameter;
}
public void setMobileParameter(String mobileParameter) {
Assert.hasText(mobileParameter, "Mobile parameter must not be empty or null");
this.mobileParameter = mobileParameter;
}

public void setPostOnly(boolean postOnly) {
this.postOnly = postOnly;
}
public void setPostOnly(boolean postOnly) {
this.postOnly = postOnly;
}

public final String getMobileParameter() {
return mobileParameter;
}
public final String getMobileParameter() {
return mobileParameter;
}
}
43 changes: 24 additions & 19 deletions mate-uaa/src/main/java/vip/mate/uaa/sms/SmsCodeAuthenticationProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,34 +11,39 @@

import java.util.Objects;

/**
* 短信验证码验证提供者
*
* @author pangu
*/
@AllArgsConstructor
public class SmsCodeAuthenticationProvider implements AuthenticationProvider {

private final MateUserDetailsService userDetailsService;
private final MateUserDetailsService userDetailsService;

@Override
public Authentication authenticate(Authentication authentication) throws AuthenticationException {
SmsCodeAuthenticationToken authenticationToken = (SmsCodeAuthenticationToken) authentication;
@Override
public Authentication authenticate(Authentication authentication) throws AuthenticationException {
SmsCodeAuthenticationToken authenticationToken = (SmsCodeAuthenticationToken) authentication;

/**
* 调用 {@link UserDetailsService}
*/
UserDetails user = userDetailsService.loadUserByMobile((String)authenticationToken.getPrincipal());
/**
* 调用 {@link UserDetailsService}
*/
UserDetails user = userDetailsService.loadUserByMobile((String) authenticationToken.getPrincipal());

if (Objects.isNull(user)) {
throw new InternalAuthenticationServiceException("手机号或验证码错误");
}
if (Objects.isNull(user)) {
throw new InternalAuthenticationServiceException("手机号或验证码错误");
}

SmsCodeAuthenticationToken authenticationResult = new SmsCodeAuthenticationToken(user, user.getAuthorities());
SmsCodeAuthenticationToken authenticationResult = new SmsCodeAuthenticationToken(user, user.getAuthorities());

authenticationResult.setDetails(authenticationToken.getDetails());
authenticationResult.setDetails(authenticationToken.getDetails());

return authenticationResult;
return authenticationResult;

}
}

@Override
public boolean supports(Class<?> authentication) {
return SmsCodeAuthenticationToken.class.isAssignableFrom(authentication);
}
@Override
public boolean supports(Class<?> authentication) {
return SmsCodeAuthenticationToken.class.isAssignableFrom(authentication);
}
}
Loading