Skip to content

Commit 4aea262

Browse files
committed
Register Spring Security as an ERROR dispatcher by using new property.
@see spring-boot GH #2774 @see spring-boot GH #4505 This reverts commit bb0f95a Addressed to #289 No functional changes.
1 parent f57ba08 commit 4aea262

File tree

2 files changed

+2
-20
lines changed

2 files changed

+2
-20
lines changed

src/main/java/ru/mystamps/web/support/spring/boot/ApplicationBootstrap.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,11 @@
1717
*/
1818
package ru.mystamps.web.support.spring.boot;
1919

20-
import java.util.EnumSet;
21-
22-
import javax.servlet.DispatcherType;
23-
import javax.servlet.Filter;
24-
25-
import org.springframework.beans.factory.annotation.Qualifier;
2620
import org.springframework.context.ConfigurableApplicationContext;
27-
import org.springframework.context.annotation.Bean;
2821
import org.springframework.context.annotation.Import;
2922

3023
import org.springframework.boot.SpringApplication;
3124
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
32-
import org.springframework.boot.context.embedded.FilterRegistrationBean;
3325

3426
import org.togglz.core.context.StaticFeatureManagerProvider;
3527
import org.togglz.core.manager.FeatureManager;
@@ -58,16 +50,4 @@ public static void main(String... args) {
5850
StaticFeatureManagerProvider.setFeatureManager(featureManager);
5951
}
6052

61-
// TODO: remove @Qualifier and inject by type
62-
// See for details: https://github.com/spring-projects/spring-boot/issues/2774
63-
@Bean
64-
public FilterRegistrationBean getSpringSecurityFilterChainBindedToError(
65-
@Qualifier("springSecurityFilterChain") Filter springSecurityFilterChain) {
66-
67-
FilterRegistrationBean registration = new FilterRegistrationBean();
68-
registration.setFilter(springSecurityFilterChain);
69-
registration.setDispatcherTypes(EnumSet.allOf(DispatcherType.class));
70-
return registration;
71-
}
72-
7353
}

src/main/resources/application.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ server.compression.mime-types[2]: text/css
2929
server.compression.mime-types[3]: application/javascript
3030
server.compression.mime-types[4]: application/xml
3131

32+
security.filter-dispatcher-types: REQUEST, ERROR
33+
3234
app.mail.admin.email: slava.semushin@gmail.com
3335
app.mail.admin.lang: ru
3436
app.mail.robot.email: dont-reply@my-stamps.ru

0 commit comments

Comments
 (0)