From 87bdc263803ca58bf72259ea98c94ac190699610 Mon Sep 17 00:00:00 2001
From: Robert von Burg <eitch@eitchnet.ch>
Date: Fri, 5 Jun 2020 15:42:47 +0200
Subject: [PATCH] [Project] Added <allowSessionRefresh> to PrivilegeConfig.xml

---
 .../runtime/config/PrivilegeConfig.xml        | 73 ++++++++++---------
 .../config/PrivilegeConfig.xml                | 68 ++++++++---------
 .../runtime/config/PrivilegeConfig.xml        | 72 +++++++++---------
 .../config/PrivilegeConfig.xml                | 69 +++++++++---------
 4 files changed, 144 insertions(+), 138 deletions(-)

diff --git a/li.strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml b/li.strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
index 0d627fd8f..c0e3aba5d 100644
--- a/li.strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
+++ b/li.strolch.mvn.archetype.main/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
@@ -1,47 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
 
-	<Container>
+    <Container>
 
-		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="CHANGE-ME-1"/>
-			<Parameter name="secretSalt" value="CHANGE-ME-2"/>
-			<Parameter name="persistSessions" value="true"/>
-			<Parameter name="autoPersistOnUserChangesData" value="false"/>
-			<Parameter name="privilegeConflictResolution" value="MERGE"/>
-		</Parameters>
+        <Parameters>
+            <!-- parameters for the container itself -->
+            <Parameter name="secretKey" value="CHANGE-ME-1"/>
+            <Parameter name="secretSalt" value="CHANGE-ME-2"/>
+            <Parameter name="persistSessions" value="true"/>
+            <Parameter name="autoPersistOnUserChangesData" value="true"/>
+            <Parameter name="privilegeConflictResolution" value="MERGE"/>
+            <Parameter name="allowSessionRefresh" value="true"/>
+        </Parameters>
 
-		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
-			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
-				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
-				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
-				<Parameter name="hashKeyLength" value="256" />
-			</Parameters>
-		</EncryptionHandler>
+        <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
+            <Parameters>
+                <!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
+                <!-- default algorithm is: PBKDF2WithHmacSHA512 -->
+                <Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512"/>
+                <!-- default iterations: 200000 -->
+                <Parameter name="hashIterations" value="10000"/>
+                <!-- default key length: 256 -->
+                <Parameter name="hashKeyLength" value="256"/>
+            </Parameters>
+        </EncryptionHandler>
 
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
+        <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
+            <Parameters>
+                <Parameter name="usersXmlFile" value="PrivilegeUsers.xml"/>
+                <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml"/>
+            </Parameters>
+        </PersistenceHandler>
 
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
+        <UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
+        </UserChallengeHandler>
 
-	</Container>
+    </Container>
 
-	<Policies>
-		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege"/>
-		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
-		<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege"/>
-		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege"/>
-		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
-	</Policies>
+    <Policies>
+        <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege"/>
+        <Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege"/>
+        <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege"/>
+        <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege"/>
+        <Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
+    </Policies>
 
 </Privilege>
\ No newline at end of file
diff --git a/li.strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml b/li.strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
index 2e6f6ef5c..be4bbfc8e 100644
--- a/li.strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
+++ b/li.strolch.mvn.archetype.main/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
@@ -1,45 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
 
-	<Container>
+    <Container>
 
-		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="test-secret"/>
-			<Parameter name="secretSalt" value="test-secret"/>
-			<Parameter name="autoPersistOnUserChangesData" value="true" />
-		</Parameters>
+        <Parameters>
+            <!-- parameters for the container itself -->
+            <Parameter name="secretKey" value="CHANGE-ME-1"/>
+            <Parameter name="secretSalt" value="CHANGE-ME-2"/>
+            <Parameter name="persistSessions" value="true"/>
+            <Parameter name="autoPersistOnUserChangesData" value="true"/>
+            <Parameter name="privilegeConflictResolution" value="MERGE"/>
+        </Parameters>
 
-		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
-			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
-				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
-				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
-				<Parameter name="hashKeyLength" value="256" />
-			</Parameters>
-		</EncryptionHandler>
+        <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
+            <Parameters>
+                <!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
+                <!-- default algorithm is: PBKDF2WithHmacSHA512 -->
+                <Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512"/>
+                <!-- default iterations: 200000 -->
+                <Parameter name="hashIterations" value="10000"/>
+                <!-- default key length: 256 -->
+                <Parameter name="hashKeyLength" value="256"/>
+            </Parameters>
+        </EncryptionHandler>
 
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
+        <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
+            <Parameters>
+                <Parameter name="usersXmlFile" value="PrivilegeUsers.xml"/>
+                <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml"/>
+            </Parameters>
+        </PersistenceHandler>
 
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
+        <UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
+        </UserChallengeHandler>
 
-	</Container>
+    </Container>
 
-	<Policies>
-		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
-		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
-		<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
-		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
+    <Policies>
+        <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege"/>
+        <Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege"/>
+        <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege"/>
+        <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege"/>
         <Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
-	</Policies>
+    </Policies>
 
 </Privilege>
\ No newline at end of file
diff --git a/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml b/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
index c4f084ae8..7071dddd7 100644
--- a/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
+++ b/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/runtime/config/PrivilegeConfig.xml
@@ -1,48 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
 
-	<Container>
+    <Container>
 
-		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="CHANGE-ME-1"/>
-			<Parameter name="secretSalt" value="CHANGE-ME-2"/>
-			<Parameter name="persistSessions" value="true"/>
+        <Parameters>
+            <!-- parameters for the container itself -->
+            <Parameter name="secretKey" value="CHANGE-ME-1"/>
+            <Parameter name="secretSalt" value="CHANGE-ME-2"/>
+            <Parameter name="persistSessions" value="true"/>
 			<Parameter name="autoPersistOnUserChangesData" value="false"/>
-			<Parameter name="privilegeConflictResolution" value="MERGE"/>
-			<Parameter name="allowSessionRefresh" value="true"/>
-		</Parameters>
+            <Parameter name="privilegeConflictResolution" value="MERGE"/>
+            <Parameter name="allowSessionRefresh" value="true"/>
+        </Parameters>
 
-		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
-			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
-				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
-				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
-				<Parameter name="hashKeyLength" value="256" />
-			</Parameters>
-		</EncryptionHandler>
+        <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
+            <Parameters>
+                <!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
+                <!-- default algorithm is: PBKDF2WithHmacSHA512 -->
+                <Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512"/>
+                <!-- default iterations: 200000 -->
+                <Parameter name="hashIterations" value="10000"/>
+                <!-- default key length: 256 -->
+                <Parameter name="hashKeyLength" value="256"/>
+            </Parameters>
+        </EncryptionHandler>
 
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
+        <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
+            <Parameters>
+                <Parameter name="usersXmlFile" value="PrivilegeUsers.xml"/>
+                <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml"/>
+            </Parameters>
+        </PersistenceHandler>
 
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
+        <UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
+        </UserChallengeHandler>
 
-	</Container>
+    </Container>
 
-	<Policies>
-		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege"/>
-		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
-		<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege"/>
-		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege"/>
-		<Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
-	</Policies>
+    <Policies>
+        <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege"/>
+        <Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege"/>
+        <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege"/>
+        <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege"/>
+        <Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
+    </Policies>
 
 </Privilege>
\ No newline at end of file
diff --git a/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml b/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
index 2e6f6ef5c..c0e3aba5d 100644
--- a/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
+++ b/li.strolch.mvn.archetype.webapp/src/main/resources/archetype-resources/src/test/resources/runtime-SimpleTest/config/PrivilegeConfig.xml
@@ -1,45 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Privilege>
 
-	<Container>
+    <Container>
 
-		<Parameters>
-			<!-- parameters for the container itself -->
-			<Parameter name="secretKey" value="test-secret"/>
-			<Parameter name="secretSalt" value="test-secret"/>
-			<Parameter name="autoPersistOnUserChangesData" value="true" />
-		</Parameters>
+        <Parameters>
+            <!-- parameters for the container itself -->
+            <Parameter name="secretKey" value="CHANGE-ME-1"/>
+            <Parameter name="secretSalt" value="CHANGE-ME-2"/>
+            <Parameter name="persistSessions" value="true"/>
+            <Parameter name="autoPersistOnUserChangesData" value="true"/>
+            <Parameter name="privilegeConflictResolution" value="MERGE"/>
+            <Parameter name="allowSessionRefresh" value="true"/>
+        </Parameters>
 
-		<EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
-			<Parameters>
-				<!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
-				<!-- default algorithm is: PBKDF2WithHmacSHA512 -->
-				<Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512" />
-				<!-- default iterations: 200000 -->
-				<Parameter name="hashIterations" value="10000" />
-				<!-- default key length: 256 -->
-				<Parameter name="hashKeyLength" value="256" />
-			</Parameters>
-		</EncryptionHandler>
+        <EncryptionHandler class="li.strolch.privilege.handler.DefaultEncryptionHandler">
+            <Parameters>
+                <!-- WARNING: If you change iterations or keyLength, then all passwords are invalid -->
+                <!-- default algorithm is: PBKDF2WithHmacSHA512 -->
+                <Parameter name="hashAlgorithm" value="PBKDF2WithHmacSHA512"/>
+                <!-- default iterations: 200000 -->
+                <Parameter name="hashIterations" value="10000"/>
+                <!-- default key length: 256 -->
+                <Parameter name="hashKeyLength" value="256"/>
+            </Parameters>
+        </EncryptionHandler>
 
-		<PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
-			<Parameters>
-				<Parameter name="usersXmlFile" value="PrivilegeUsers.xml" />
-				<Parameter name="rolesXmlFile" value="PrivilegeRoles.xml" />
-			</Parameters>
-		</PersistenceHandler>
+        <PersistenceHandler class="li.strolch.privilege.handler.XmlPersistenceHandler">
+            <Parameters>
+                <Parameter name="usersXmlFile" value="PrivilegeUsers.xml"/>
+                <Parameter name="rolesXmlFile" value="PrivilegeRoles.xml"/>
+            </Parameters>
+        </PersistenceHandler>
 
-		<UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
-		</UserChallengeHandler>
+        <UserChallengeHandler class="li.strolch.privilege.handler.ConsoleUserChallengeHandler">
+        </UserChallengeHandler>
 
-	</Container>
+    </Container>
 
-	<Policies>
-		<Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege" />
-		<Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege" />
-		<Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege" />
-		<Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege" />
+    <Policies>
+        <Policy name="DefaultPrivilege" class="li.strolch.privilege.policy.DefaultPrivilege"/>
+        <Policy name="ModelPrivilege" class="li.strolch.runtime.privilege.ModelPrivilege"/>
+        <Policy name="RoleAccessPrivilege" class="li.strolch.privilege.policy.RoleAccessPrivilege"/>
+        <Policy name="UserAccessPrivilege" class="li.strolch.privilege.policy.UserAccessPrivilege"/>
         <Policy name="UserSessionAccessPrivilege" class="li.strolch.privilege.policy.UsernameFromCertificatePrivilege"/>
-	</Policies>
+    </Policies>
 
 </Privilege>
\ No newline at end of file