From 03010d8f9f2ec41d27da2606bdc063aa25820f7d Mon Sep 17 00:00:00 2001 From: eugenp Date: Tue, 1 Mar 2016 21:44:20 +0200 Subject: [PATCH] new demo configs --- .../config/OAuth2ResourceServerConfig1.java | 31 +++++++++++ ....java => OAuth2ResourceServerConfig2.java} | 2 +- .../OAuth2AuthorizationServerConfig1.java | 51 +++++++++++++++++++ ... => OAuth2AuthorizationServerConfig2.java} | 2 +- 4 files changed, 84 insertions(+), 2 deletions(-) create mode 100644 spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig1.java rename spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/{OAuth2ResourceServerConfigDemo.java => OAuth2ResourceServerConfig2.java} (92%) create mode 100644 spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig1.java rename spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/{OAuth2AuthorizationServerConfigDemo.java => OAuth2AuthorizationServerConfig2.java} (95%) diff --git a/spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig1.java b/spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig1.java new file mode 100644 index 0000000000..d7e1a3e310 --- /dev/null +++ b/spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig1.java @@ -0,0 +1,31 @@ +package org.baeldung.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.oauth2.config.annotation.web.configuration.ResourceServerConfigurerAdapter; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore; + +//@Configuration +//@EnableResourceServer +public class OAuth2ResourceServerConfig1 extends ResourceServerConfigurerAdapter { + + // + + @Override + public void configure(final HttpSecurity http) throws Exception { + // @formatter:off + http + .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED) + .and().authorizeRequests().anyRequest().authenticated(); + ; + // @formatter:on + } + + @Bean + public TokenStore tokenStore() { + return new InMemoryTokenStore(); + } + +} diff --git a/spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigDemo.java b/spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig2.java similarity index 92% rename from spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigDemo.java rename to spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig2.java index 35478add71..d69f3366a8 100644 --- a/spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfigDemo.java +++ b/spring-security-oauth/spring-security-oauth-resource-demo/src/main/java/org/baeldung/config/OAuth2ResourceServerConfig2.java @@ -11,7 +11,7 @@ import org.springframework.security.oauth2.provider.token.store.InMemoryTokenSto @Configuration @EnableResourceServer -public class OAuth2ResourceServerConfigDemo extends ResourceServerConfigurerAdapter { +public class OAuth2ResourceServerConfig2 extends ResourceServerConfigurerAdapter { // diff --git a/spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig1.java b/spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig1.java new file mode 100644 index 0000000000..b0f5872430 --- /dev/null +++ b/spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig1.java @@ -0,0 +1,51 @@ +package org.baeldung.config; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.context.annotation.Bean; +import org.springframework.security.authentication.AuthenticationManager; +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.configurers.AuthorizationServerEndpointsConfigurer; +import org.springframework.security.oauth2.config.annotation.web.configurers.AuthorizationServerSecurityConfigurer; +import org.springframework.security.oauth2.provider.token.TokenStore; +import org.springframework.security.oauth2.provider.token.store.InMemoryTokenStore; + +//@Configuration +//@EnableAuthorizationServer +public class OAuth2AuthorizationServerConfig1 extends AuthorizationServerConfigurerAdapter { + + @Autowired + @Qualifier("authenticationManagerBean") + private AuthenticationManager authenticationManager; + + // + + @Override + public void configure(final AuthorizationServerSecurityConfigurer oauthServer) throws Exception { + oauthServer.tokenKeyAccess("permitAll()").checkTokenAccess("isAuthenticated()"); + } + + @Override + public void configure(final ClientDetailsServiceConfigurer clients) throws Exception { // @formatter:off + clients.inMemory() + .withClient("fooClientIdPassword") + .secret("secret") + .authorizedGrantTypes("password", "authorization_code", "refresh_token") + .scopes("foo", "read", "write") + .accessTokenValiditySeconds(3600) // 1 hour + .refreshTokenValiditySeconds(2592000) // 30 days + ; + } // @formatter:on + + @Override + public void configure(final AuthorizationServerEndpointsConfigurer endpoints) throws Exception { + endpoints.tokenStore(tokenStore()).authenticationManager(authenticationManager); + } + + @Bean + public TokenStore tokenStore() { + return new InMemoryTokenStore(); + } + +} diff --git a/spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfigDemo.java b/spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig2.java similarity index 95% rename from spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfigDemo.java rename to spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig2.java index c7af72b5ef..3bbda6e3fa 100644 --- a/spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfigDemo.java +++ b/spring-security-oauth/spring-security-oauth-server-demo/src/main/java/org/baeldung/config/OAuth2AuthorizationServerConfig2.java @@ -15,7 +15,7 @@ import org.springframework.security.oauth2.provider.token.store.InMemoryTokenSto @Configuration @EnableAuthorizationServer -public class OAuth2AuthorizationServerConfigDemo extends AuthorizationServerConfigurerAdapter { +public class OAuth2AuthorizationServerConfig2 extends AuthorizationServerConfigurerAdapter { @Autowired @Qualifier("authenticationManagerBean")