- SSO finalized

- SSO Session is not closed if a new single authentication operation is started
- PVP2 Configuration from Database (but without Metadata) --> TODO: change MetaDataProvider
- Add additional UserFrame in case of SSO
- MOASession encryption

TODO: MetaDataProvider, IdentityLink resign, SSO with Mandates, Legacy Template generation

2 files changed, 8 insertions, 4 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
index 4b4364555..82c9a92da 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
@@ -43,9 +43,11 @@ public class STORKConfig {
 	private STORK stork;

 	private Properties props;

 	private Map<String, CPEPS> cpepsMap;

+	private String basedirectory;

 	

-	public STORKConfig(STORK stork, Properties props) {

+	public STORKConfig(STORK stork, Properties props, String basedirectory) {

 		this.stork = stork;

+		this.basedirectory = basedirectory;

 		this.props = props;

 		

 		//create CPEPS map

@@ -92,7 +94,7 @@ public class STORKConfig {
 

 	public SignatureCreationParameter getSignatureCreationParameter() {

 		

-		return new SignatureCreationParameter(props);

+		return new SignatureCreationParameter(props, basedirectory);

 	}

 

 	public SignatureVerificationParameter getSignatureVerificationParameter() {

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureCreationParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureCreationParameter.java
index ee4fc1e20..4010ab491 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureCreationParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureCreationParameter.java
@@ -40,9 +40,11 @@ public class SignatureCreationParameter {
 	private static final String PROPS_KEYNAME_PASS = "keyname.password";

 	

 	private Properties props;

+	private String basedirectory;

 	

-	SignatureCreationParameter(Properties props) {

+	SignatureCreationParameter(Properties props, String basedirectory) {

 		this.props = props;

+		this.basedirectory = basedirectory;

 	}

 	

 	/**

@@ -50,7 +52,7 @@ public class SignatureCreationParameter {
 	 * @return File Path to KeyStore

 	 */

 	public String getKeyStorePath() {

-		return props.getProperty(PROPS_PREFIX+PROPS_KEYSTORE_FILE);

+		return basedirectory + props.getProperty(PROPS_PREFIX+PROPS_KEYSTORE_FILE);

 	}

 

 	/**