Grails 4/Spring Security 5 Support - fix password matching for security questions

Author: rvanderwerf

examples/extended/build.gradle

@@ -24,6 +24,7 @@ apply plugin:"org.grails.grails-gsp"
 
 repositories {
     mavenLocal()
+    mavenCentral()
     maven { url "https://repo.grails.org/grails/core" }
 }
 
@@ -46,14 +47,14 @@ dependencies {
     compile "org.grails.plugins:scaffolding"
     compile "org.grails.plugins:events"
     compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:5.1.5.Final"
+    compile "org.hibernate:hibernate-core:$hibernateCoreVersion"
     compile "org.grails.plugins:gsp"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
     runtime "org.glassfish.web:el-impl:2.1.2-b03"
     runtime "com.h2database:h2"
     runtime "org.apache.tomcat:tomcat-jdbc"
-    testCompile "org.grails:grails-test-mixins:3.3.0"
+    //testCompile "org.grails:grails-test-mixins:3.3.0"
     runtime "com.bertramlabs.plugins:asset-pipeline-grails:$assetPipelineVersion"
     testCompile "org.grails:grails-gorm-testing-support"
     testCompile "org.grails:grails-web-testing-support"
@@ -64,16 +65,27 @@ dependencies {
     testCompile "org.seleniumhq.selenium:selenium-chrome-driver:3.6.0"
     testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.6.0"
     testCompile "org.seleniumhq.selenium:selenium-api:3.6.0"
+    // https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-support
+    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.6.0'
+
     testCompile("io.github.bonigarcia:webdrivermanager:2.2.4") {
         exclude group: 'org.seleniumhq.selenium'
     }
 
     compile 'dumbster:dumbster:1.6', { transitive = false }
     compile "org.grails.plugins:mail:$mailVesion"
 
-    compile("org.grails.plugins:spring-security-acl:$springSecurityAclVersion") {
+
+    compile("org.grails.plugins:spring-security-acl:4.0.0.BUILD-SNAPSHOT") {
+        exclude group: 'org.grails.plugins', module: 'spring-security-core'
+    }
+
+/*
+    compile("org.grails.plugins:spring-security-acl:3.1.2") {
         exclude group: 'org.grails.plugins', module: 'spring-security-core'
     }
+*/
+
     compile project(":spring-security-ui")
 }
 
@@ -84,7 +96,7 @@ webdriverBinaries {
 
 bootRun {
     jvmArgs('-Dspring.output.ansi.enabled=always')
-    addResources = true
+    sourceResources sourceSets.main
 }
 
 assets {

examples/extended/gradle.properties

@@ -1,5 +1,7 @@
-grailsVersion=3.3.1
-gormVersion=6.1.7.RELEASE
-gradleWrapperVersion=3.5
+grailsVersion=4.0.0.M2
+gormVersion=7.0.0.BUILD-SNAPSHOT
+gradleWrapperVersion=4.9
 mailVesion=2.0.0.RC6
-springSecurityAclVersion=3.1.1
+hibernateCoreVresion=
+springSecurityAclVersion=5.1.2.RELEASE
+hibernateCoreVersion=5.3.7.Final

examples/extended/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip

examples/extended/grails-app/conf/application.groovy

@@ -4,6 +4,8 @@
 grails.plugin.springsecurity.userLookup.userDomainClassName = 'test.User'
 grails.plugin.springsecurity.userLookup.authorityJoinClassName = 'test.UserRole'
 grails.plugin.springsecurity.authority.className = 'test.Role'
+grails.plugin.springsecurity.password.algorithm = 'bcrypt'
+grails.plugin.springsecurity.password.hash.iterations = 1
 grails.plugin.springsecurity.controllerAnnotations.staticRules = [
 	[pattern: '/',               access: ['permitAll']],
 	[pattern: '/error',          access: ['permitAll']],

examples/extended/grails-app/conf/application.yml

@@ -114,7 +114,7 @@ environments:
             url: jdbc:h2:mem:devDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     test:
         dataSource:
-            dbCreate: update
+            dbCreate: create-drop
             url: jdbc:h2:mem:testDb;MVCC=TRUE;LOCK_TIMEOUT=10000;DB_CLOSE_ON_EXIT=FALSE
     production:
         dataSource:

examples/extended/src/integration-test/groovy/test/ProfileServiceSpec.groovy

@@ -1,7 +1,10 @@
 package test
 
-import grails.test.mixin.integration.Integration
+
 import grails.gorm.transactions.Rollback
+import grails.testing.mixin.integration.Integration
+import grails.testing.services.ServiceUnitTest
+import org.spockframework.runtime.model.SpecInfo
 import spock.lang.Specification
 import org.hibernate.SessionFactory
 

examples/simple/build.gradle

@@ -46,7 +46,7 @@ dependencies {
     compile "org.grails.plugins:scaffolding"
     compile "org.grails.plugins:events"
     compile "org.grails.plugins:hibernate5"
-    compile "org.hibernate:hibernate-core:5.1.5.Final"
+    compile "org.hibernate:hibernate-core:$hibernateCoreVersion"
     compile "org.grails.plugins:gsp"
     console "org.grails:grails-console"
     profile "org.grails.profiles:web"
@@ -68,6 +68,9 @@ dependencies {
     testCompile "org.seleniumhq.selenium:selenium-chrome-driver:3.6.0"
     testCompile "org.seleniumhq.selenium:selenium-remote-driver:3.6.0"
     testCompile "org.seleniumhq.selenium:selenium-api:3.6.0"
+    // https://mvnrepository.com/artifact/org.seleniumhq.selenium/selenium-support
+    testCompile group: 'org.seleniumhq.selenium', name: 'selenium-support', version: '3.6.0'
+
 
     compile 'dumbster:dumbster:1.6', { transitive = false }
     compile "org.grails.plugins:mail:$mailVesion"
@@ -82,7 +85,7 @@ webdriverBinaries {
 
 bootRun {
     jvmArgs('-Dspring.output.ansi.enabled=always')
-    addResources = true
+    sourceResources sourceSets.main
 }
 
 

examples/simple/gradle.properties

@@ -1,5 +1,6 @@
-grailsVersion=3.3.1
-gormVersion=6.1.7.RELEASE
-gradleWrapperVersion=3.5
+grailsVersion=4.0.0.M2
+gormVersion=7.0.0.BUILD-SNAPSHOT
+gradleWrapperVersion=4.9
 mailVesion=2.0.0.RC6
-springSecurityAclVersion=3.1.1
+springSecurityAclVersion=5.1.2.RELEASE
+hibernateCoreVersion=5.3.7.Final

examples/simple/gradle/wrapper/gradle-wrapper.jar

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-all.zip