You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@grails.apache.org by jd...@apache.org on 2026/07/06 02:10:24 UTC
(grails-core) 03/03: Update Spring Security to Groovy 5
This is an automated email from the ASF dual-hosted git repository.
jdaugherty pushed a commit to branch mail-security-redis-8-merge
in repository https://gitbox.apache.org/repos/asf/grails-core.git
commit 3960ee2830b9a724ca6f1a9928b15852d563576a
Author: James Daugherty <jd...@jdresources.net>
AuthorDate: Sun Jul 5 22:10:07 2026 -0400
Update Spring Security to Groovy 5
---
.../plugin/springsecurity/ReflectionUtils.groovy | 4 ++--
...tContextHolderExceptionTranslationFilter.groovy | 6 +++--
.../springsecurity/ReflectionUtilsSpec.groovy | 26 +++++++++++++++++++---
3 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/grails-spring-security/plugin/src/main/groovy/grails/plugin/springsecurity/ReflectionUtils.groovy b/grails-spring-security/plugin/src/main/groovy/grails/plugin/springsecurity/ReflectionUtils.groovy
index 96abe5f194..ad3838f027 100644
--- a/grails-spring-security/plugin/src/main/groovy/grails/plugin/springsecurity/ReflectionUtils.groovy
+++ b/grails-spring-security/plugin/src/main/groovy/grails/plugin/springsecurity/ReflectionUtils.groovy
@@ -213,7 +213,7 @@ class ReflectionUtils {
static SortedMap<Integer, String> findFilterChainNames(ConfigObject conf) {
SpringSecurityUtils.findFilterChainNames conf.filterChain.filterNames,
- conf.secureChannel.definition as boolean, conf.ipRestrictions as boolean, conf.useX509 as boolean,
- conf.useDigestAuth as boolean, conf.useBasicAuth as boolean, conf.useSwitchUserFilter as boolean
+ conf.secureChannel.definition as Boolean ?: false, conf.ipRestrictions as Boolean ?: false, conf.useX509 as Boolean ?: false,
+ conf.useDigestAuth as Boolean ?: false, conf.useBasicAuth as Boolean ?: false, conf.useSwitchUserFilter as Boolean ?: false
}
}
diff --git a/grails-spring-security/plugin/src/main/groovy/grails/plugin/springsecurity/web/UpdateRequestContextHolderExceptionTranslationFilter.groovy b/grails-spring-security/plugin/src/main/groovy/grails/plugin/springsecurity/web/UpdateRequestContextHolderExceptionTranslationFilter.groovy
index 901cd5ef38..f3060ce5e9 100644
--- a/grails-spring-security/plugin/src/main/groovy/grails/plugin/springsecurity/web/UpdateRequestContextHolderExceptionTranslationFilter.groovy
+++ b/grails-spring-security/plugin/src/main/groovy/grails/plugin/springsecurity/web/UpdateRequestContextHolderExceptionTranslationFilter.groovy
@@ -73,7 +73,8 @@ class UpdateRequestContextHolderExceptionTranslationFilter extends ExceptionTran
@CompileStatic
class DelegatingGrailsWebRequest extends GrailsWebRequest {
- @Delegate
+ // GROOVY-12134 - Groovy 5 workaround not ignoring final methods for the `@Delegate`
+ @Delegate(excludes = ['getRequest', 'getResponse'])
GrailsWebRequest current
DelegatingGrailsWebRequest(HttpServletRequest request, HttpServletResponse response, GrailsWebRequest current) {
@@ -84,7 +85,8 @@ class DelegatingGrailsWebRequest extends GrailsWebRequest {
@CompileStatic
class DelegatingAsyncGrailsWebRequest extends AsyncGrailsWebRequest {
- @Delegate
+ // GROOVY-12134 - Groovy 5 workaround not ignoring final methods for the `@Delegate`
+ @Delegate(excludes = ['getRequest', 'getResponse'])
AsyncGrailsWebRequest current
DelegatingAsyncGrailsWebRequest(HttpServletRequest request, HttpServletResponse response, AsyncGrailsWebRequest current) {
diff --git a/grails-spring-security/plugin/src/test/groovy/grails/plugin/springsecurity/ReflectionUtilsSpec.groovy b/grails-spring-security/plugin/src/test/groovy/grails/plugin/springsecurity/ReflectionUtilsSpec.groovy
index 2674acf8a1..e29045d988 100644
--- a/grails-spring-security/plugin/src/test/groovy/grails/plugin/springsecurity/ReflectionUtilsSpec.groovy
+++ b/grails-spring-security/plugin/src/test/groovy/grails/plugin/springsecurity/ReflectionUtilsSpec.groovy
@@ -152,8 +152,8 @@ class ReflectionUtilsSpec extends AbstractUnitSpec {
ReflectionUtils.getGrailsServerURL() == null
}
- void 'findFilterNames works with multiple boolean representations of settings'() {
- when:
+ void 'findFilterNames coerces boolean settings without throwing (including null values)'() {
+ when: 'settings are supplied as booleans, strings, or null (e.g. a key absent from config)'
ConfigObject config = [
'filterChain.filterNames' : 'dummy',
'secureChannel.definition': secureChannelValue,
@@ -165,7 +165,7 @@ class ReflectionUtilsSpec extends AbstractUnitSpec {
] as ConfigObject
ReflectionUtils.findFilterChainNames(config)
- then:
+ then: 'no exception is thrown - Groovy 5 rejects `null as boolean`, so null must coerce to false'
noExceptionThrown()
where:
@@ -173,6 +173,26 @@ class ReflectionUtilsSpec extends AbstractUnitSpec {
true | false | false | false | true | false
'true' | 'false' | 'false' | 'false' | 'true' | 'false'
true | 'false' | null | null | 'true' | null
+ null | null | null | null | null | null
+ }
+
+ void "findFilterNames includes the x509 filter only when useX509 coerces to true (value=#x509Value)"() {
+ given: 'a config that does not list filter names explicitly, so the boolean flags drive the chain'
+ ConfigObject config = ['useX509': x509Value] as ConfigObject
+
+ when:
+ SortedMap<Integer, String> names = ReflectionUtils.findFilterChainNames(config)
+
+ then: 'x509ProcessingFilter is present only when the flag is truthy; null coerces to false without throwing'
+ names.containsValue('x509ProcessingFilter') == x509Enabled
+
+ where:
+ x509Value || x509Enabled
+ true || true
+ false || false
+ 'true' || true
+ null || false
+ '' || false
}
void 'get intercept url map with empty httpMethod config'() {