From 5392620ce0ca0b11eb3c322706ceaacf00465515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20G=C3=B6bel?= <valentin.goebel@tu-braunschweig.de>
Date: Thu, 15 Mar 2018 15:08:28 +0100
Subject: [PATCH] Migrate DefaultSamlSecurityConfig.groovy to plugin.yml

It is recommended to use plugin.yml in grails 3.3.x plugins. The
majority of crashes were caused by missing default values and do not
appear anymore.
---
 .../conf/DefaultSamlSecurityConfig.groovy     | 39 -------------------
 grails-app/conf/plugin.yml                    | 38 ++++++++++++++++++
 2 files changed, 38 insertions(+), 39 deletions(-)
 delete mode 100644 grails-app/conf/DefaultSamlSecurityConfig.groovy
 create mode 100644 grails-app/conf/plugin.yml

diff --git a/grails-app/conf/DefaultSamlSecurityConfig.groovy b/grails-app/conf/DefaultSamlSecurityConfig.groovy
deleted file mode 100644
index 648b8f9..0000000
--- a/grails-app/conf/DefaultSamlSecurityConfig.groovy
+++ /dev/null
@@ -1,39 +0,0 @@
-security {
-    saml {
-        userAttributeMappings = [:]
-        active = true
-        afterLoginUrl = '/'
-        afterLogoutUrl = '/'
-        userGroupAttribute = "memberOf"
-        responseSkew = 60
-        autoCreate {
-            active =  false
-            key = 'username'
-            assignAuthorities = true
-        }
-        metadata {
-            defaultIdp = 'ping'
-            url = '/saml/metadata'
-            providers = [ ping :'security/idp-local.xml']
-            sp {
-                file = 'security/sp.xml'
-                defaults = [
-                        local: true,
-                        alias: 'test',
-                        securityProfile: 'metaiop',
-                        signingKey: 'ping',
-                        encryptionKey: 'ping',
-                        tlsKey: 'ping',
-                        requireArtifactResolveSigned: false,
-                        requireLogoutRequestSigned: false,
-                        requireLogoutResponseSigned: false ]
-            }
-        }
-        keyManager {
-            storeFile = 'classpath:security/keystore.jks'
-            storePass = 'nalle123'
-            passwords = [ ping: 'ping123' ]
-            defaultKey = 'ping'
-        }
-    }
-}
\ No newline at end of file
diff --git a/grails-app/conf/plugin.yml b/grails-app/conf/plugin.yml
new file mode 100644
index 0000000..5bac87c
--- /dev/null
+++ b/grails-app/conf/plugin.yml
@@ -0,0 +1,38 @@
+grails:
+    plugin:
+        springsecurity:
+            saml:
+                userAttributeMappings: {}
+                active: true
+                afterLoginUrl: '/'
+                afterLogoutUrl: '/'
+                userGroupAttribute: 'memberOf'
+                responseSkew: 60
+                autoCreate:
+                    active: false
+                    key: 'username'
+                    assignAuthorities: true
+                metadata:
+                    timeout: 5000
+                    defaultIdp: 'ping'
+                    url: '/saml/metadata'
+                    providers:
+                        ping: 'security/idp-local.xml'
+                    sp:
+                        file: 'security/sp.xml'
+                        defaults:
+                            local: true
+                            alias: 'test'
+                            securityProfile: 'metaiop'
+                            signingKey: 'ping'
+                            encryptionKey: 'ping'
+                            tlsKey: 'ping'
+                            requireArtifactResolveSigned: false
+                            requireLogoutRequestSigned: false
+                            requireLogoutResponseSigned: false
+                keyManager:
+                    storeFile: 'classpath:security/keystore.jks'
+                    storePass: 'nalle123'
+                    passwords:
+                        ping: 'ping123'
+                    defaultKey: 'ping'