From 0857da5a22a2f0cf941a34fc2fa2e46505765442 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Fri, 26 Jun 2020 18:48:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20OAuth2=20=E5=88=A0?= =?UTF-8?q?=E9=99=A4=E4=BB=A4=E7=89=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OAuth2AuthorizationServerConfig.java | 11 +++++++- .../config/SecurityConfig.java | 16 ++++++++++++ .../controller/TokenDemoController.java | 25 +++++++++++++++++++ 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java index 3247ef64..43bf324c 100644 --- a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/OAuth2AuthorizationServerConfig.java @@ -3,6 +3,7 @@ package cn.iocoder.springboot.lab68.authorizationserverdemo.config; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.oauth2.config.annotation.configurers.ClientDetailsServiceConfigurer; import org.springframework.security.oauth2.config.annotation.web.configuration.AuthorizationServerConfigurerAdapter; import org.springframework.security.oauth2.config.annotation.web.configuration.EnableAuthorizationServer; @@ -22,9 +23,17 @@ public class OAuth2AuthorizationServerConfig extends AuthorizationServerConfigur @Autowired private AuthenticationManager authenticationManager; + /** + * 用户详情 Service + */ + @Autowired + private UserDetailsService userDetailsService; + @Override public void configure(AuthorizationServerEndpointsConfigurer endpoints) throws Exception { - endpoints.authenticationManager(authenticationManager); + endpoints.authenticationManager(authenticationManager) + .userDetailsService(userDetailsService) + ; } @Override diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java index 9da10ba5..1af00d68 100644 --- a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/config/SecurityConfig.java @@ -5,8 +5,10 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.BeanIds; import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter; +import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.crypto.password.NoOpPasswordEncoder; @Configuration @@ -19,6 +21,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { return super.authenticationManagerBean(); } + @Override + @Bean(name = BeanIds.USER_DETAILS_SERVICE) + public UserDetailsService userDetailsServiceBean() throws Exception { + return super.userDetailsServiceBean(); + } + @Bean public static NoOpPasswordEncoder passwordEncoder() { return (NoOpPasswordEncoder) NoOpPasswordEncoder.getInstance(); @@ -35,4 +43,12 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter { .withUser("yunai").password("1024").roles("USER"); } + @Override + protected void configure(HttpSecurity http) throws Exception { + http.csrf().disable() + .authorizeRequests() + .mvcMatchers("/token/demo/revoke").permitAll() + .anyRequest().authenticated(); + } + } diff --git a/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java new file mode 100644 index 00000000..8bf981db --- /dev/null +++ b/lab-68/lab-68-demo03-authorization-server-with-resource-owner-password-credentials/src/main/java/cn/iocoder/springboot/lab68/authorizationserverdemo/controller/TokenDemoController.java @@ -0,0 +1,25 @@ +package cn.iocoder.springboot.lab68.authorizationserverdemo.controller; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.oauth2.provider.token.ConsumerTokenServices; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +/** + * Token 示例 Controller + */ +@RestController +@RequestMapping("/token/demo") +public class TokenDemoController { + + @Autowired + private ConsumerTokenServices tokenServices; + + @PostMapping(value = "/revoke") + public boolean revokeToken(@RequestParam("token") String token) { + return tokenServices.revokeToken(token); + } + +}