Skip to content
This repository was archived by the owner on Dec 12, 2018. It is now read-only.

Commit 2e48b5a

Browse files
author
Mario
committed
915 - Adding a StormpathWrapperFilter very early to Spring Security;s filter chain in order to be able to have Client and Application in the request
1 parent dea5172 commit 2e48b5a

13 files changed

Lines changed: 1003 additions & 824 deletions

File tree

‎examples/spring-security-spring-boot-webmvc-bare-bones/src/main/resources/static/index.html‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,18 @@
1+
<!--/*
2+
~ Copyright 2016 Stormpath, Inc.
3+
~
4+
~ Licensed under the Apache License, Version 2.0 (the "License");
5+
~ you may not use this file except in compliance with the License.
6+
~ You may obtain a copy of the License at
7+
~
8+
~ http://www.apache.org/licenses/LICENSE-2.0
9+
~
10+
~ Unless required by applicable law or agreed to in writing, software
11+
~ distributed under the License is distributed on an "AS IS" BASIS,
12+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
~ See the License for the specific language governing permissions and
14+
~ limitations under the License.
15+
*/-->
116
<!DOCTYPE html>
217
<html>
318
<head>

‎extensions/spring/boot/stormpath-spring-security-webmvc-spring-boot-starter/src/main/java/com/stormpath/spring/boot/autoconfigure/StormpathWebSecurityAutoConfiguration.java‎

Lines changed: 23 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,16 @@
1818
import com.stormpath.sdk.idsite.IdSiteResultListener;
1919
import com.stormpath.sdk.saml.SamlResultListener;
2020
import com.stormpath.sdk.servlet.csrf.CsrfTokenManager;
21+
import com.stormpath.sdk.servlet.filter.account.AccountResolverFilter;
2122
import com.stormpath.sdk.servlet.mvc.ErrorModelFactory;
2223
import com.stormpath.spring.config.AbstractStormpathWebSecurityConfiguration;
2324
import com.stormpath.spring.config.StormpathWebSecurityConfigurer;
2425
import com.stormpath.spring.filter.ContentNegotiationSpringSecurityAuthenticationFilter;
25-
import com.stormpath.spring.filter.SpringSecurityResolvedAccountFilter;
26+
//import com.stormpath.spring.filter.SpringSecurityResolvedAccountFilter;
2627
import com.stormpath.spring.filter.StormpathSecurityContextPersistenceFilter;
27-
import com.stormpath.spring.oauth.OAuthAuthenticationSpringSecurityProcessingFilter;
28+
//import com.stormpath.spring.oauth.OAuthAuthenticationSpringSecurityProcessingFilter;
29+
//import com.stormpath.spring.filter.StormpathWrapperFilter;
30+
import com.stormpath.spring.filter.StormpathWrapperFilter;
2831
import com.stormpath.spring.security.provider.SocialCallbackSpringSecurityProcessingFilter;
2932
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
3033
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
@@ -116,13 +119,6 @@ public SamlResultListener springSecuritySamlResultListener() {
116119
return super.springSecuritySamlResultListener();
117120
}
118121

119-
@Bean
120-
@ConditionalOnMissingBean(name="oAuthAuthenticationProcessingFilter")
121-
@Override
122-
public OAuthAuthenticationSpringSecurityProcessingFilter oAuthAuthenticationProcessingFilter() {
123-
return super.oAuthAuthenticationProcessingFilter();
124-
}
125-
126122
@Bean
127123
@ConditionalOnMissingBean(name="stormpathSecurityContextPersistenceFilter")
128124
@Override
@@ -147,12 +143,6 @@ public ContentNegotiationSpringSecurityAuthenticationFilter contentNegotiationSp
147143
return super.contentNegotiationSpringSecurityAuthenticationFilter();
148144
}
149145

150-
@Bean
151-
@ConditionalOnMissingBean(name="springSecurityResolvedAccountFilter")
152-
public SpringSecurityResolvedAccountFilter springSecurityResolvedAccountFilter() {
153-
return super.springSecurityResolvedAccountFilter();
154-
}
155-
156146
@Bean
157147
@ConditionalOnMissingBean(name="stormpathAuthenticationEntryPoint")
158148
public AuthenticationEntryPoint stormpathAuthenticationEntryPoint() {
@@ -168,4 +158,22 @@ public CorsConfigurationSource corsConfigurationSource() {
168158
return super.corsConfigurationSource();
169159
}
170160

161+
/**
162+
* @since 1.3.0
163+
*/
164+
@Bean
165+
@ConditionalOnMissingBean
166+
public AccountResolverFilter springSecuritResolvedAccountFilter() {
167+
return super.springSecuritResolvedAccountFilter();
168+
}
169+
170+
/**
171+
* @since 1.3.0
172+
*/
173+
@Bean
174+
@ConditionalOnMissingBean
175+
public StormpathWrapperFilter stormpathWrapperFilter() {
176+
return super.stormpathWrapperFilter();
177+
}
178+
171179
}

0 commit comments

Comments
 (0)