Skip to content

Commit c7e7725

Browse files
committed
Set filterChain position to match default position used by Spring Security. Fixes #1033
1 parent 5b20efd commit c7e7725

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

plugin/src/main/groovy/grails/plugin/springsecurity/SpringSecurityCoreGrailsPlugin.groovy

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ import grails.plugins.Plugin
5757
import grails.util.Metadata
5858
import groovy.util.logging.Slf4j
5959
import org.grails.web.mime.HttpServletResponseExtension
60+
import org.springframework.boot.autoconfigure.security.SecurityProperties
6061
import org.springframework.boot.web.servlet.FilterRegistrationBean
6162
import org.springframework.boot.web.servlet.ServletListenerRegistrationBean
6263
import org.springframework.cache.jcache.JCacheCacheManager
@@ -221,17 +222,7 @@ class SpringSecurityCoreGrailsPlugin extends Plugin {
221222
filter = ref('springSecurityFilterChain')
222223
urlPatterns = ['/*']
223224
dispatcherTypes = EnumSet.of(DispatcherType.ERROR, DispatcherType.REQUEST)
224-
225-
// The filter chain has to be after grailsWebRequestFilter, but its order changed
226-
// in 3.1 (from Ordered.HIGHEST_PRECEDENCE + 30 (-2147483618) to
227-
// FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 30 (30))
228-
String grailsVersion = Metadata.current.getGrailsVersion()
229-
if (grailsVersion.startsWith('3.0')) {
230-
order = Ordered.HIGHEST_PRECEDENCE + 100
231-
}
232-
else {
233-
order = 100 // FilterRegistrationBean.REQUEST_WRAPPER_FILTER_MAX_ORDER + 100
234-
}
225+
order = SecurityProperties.DEFAULT_FILTER_ORDER
235226
}
236227

237228
if (conf.useHttpSessionEventPublisher) {

0 commit comments

Comments
 (0)