1 files changed, 31 insertions, 6 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
index ebfffb648..255fba093 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/PVPConfiguration.java
@@ -52,9 +52,11 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.Contact;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.IOAAuthParameters;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 public class PVPConfiguration {
@@ -68,9 +70,11 @@ public class PVPConfiguration {
 		return instance;
 	}
 
-	public static final String PVP2_METADATA = "/pvp2/metadata";
-	public static final String PVP2_REDIRECT = "/pvp2/redirect";
-	public static final String PVP2_POST = "/pvp2/post";
+	public static final String PVP2_METADATA = 	"/pvp2/metadata";
+	public static final String PVP2_REDIRECT = 	"/pvp2/redirect";
+	public static final String PVP2_POST = 		"/pvp2/post";
+	public static final String PVP2_SOAP = 		"/pvp2/soap";
+	public static final String PVP2_ATTRIBUTEQUERY = "/pvp2/attributequery";
 	
 	public static final String PVP_CONFIG_FILE = "pvp2config.properties";
 	
@@ -83,6 +87,9 @@ public class PVPConfiguration {
 	public static final String IDP_KEYALIASASSERTION = "idp.ks.assertion.sign.alias";	
 	public static final String IDP_KEY_PASSASSERTION = "idp.ks.assertion.sign.keypassword";
 
+	public static final String IDP_KEYALIASENCRYTPION = "sp.ks.assertion.encryption.alias";	
+	public static final String IDP_KEY_PASSENCRYTPION = "sp.ks.assertion.encryption.keypassword";
+	
 	public static final String IDP_ISSUER_NAME = "idp.issuer.name";
 
 	public static final String METADATA_FILE = "md.dir";
@@ -112,12 +119,14 @@ public class PVPConfiguration {
 	
 	//PVP2 generalpvpconfigdb;
 	Properties props;
+	String rootDir = null;
 	
 	private PVPConfiguration() {
 		 try {
 			//generalpvpconfigdb = AuthConfigurationProvider.getInstance().getGeneralPVP2DBConfig();
 			props = AuthConfigurationProvider.getInstance().getGeneralPVP2ProperiesConfig();
-						
+			rootDir = AuthConfigurationProvider.getInstance().getRootConfigFileDir();				
+			
 		} catch (ConfigurationException e) {
 			e.printStackTrace();
 		}
@@ -138,6 +147,14 @@ public class PVPConfiguration {
 		return getIDPPublicPath() + PVP2_POST;
 	}
 
+	public String getIDPSSOSOAPService() throws ConfigurationException {
+		return getIDPPublicPath() + PVP2_SOAP;
+	}
+	
+	public String getIDPAttributeQueryService() throws ConfigurationException {
+		return getIDPPublicPath() + PVP2_ATTRIBUTEQUERY;
+	}
+	
 	public String getIDPSSORedirectService() throws ConfigurationException {
 		return getIDPPublicPath() + PVP2_REDIRECT;
 	}
@@ -147,7 +164,7 @@ public class PVPConfiguration {
 	}
 
 	public String getIDPKeyStoreFilename() {
-		return props.getProperty(IDP_JAVAKEYSTORE);
+		return FileUtils.makeAbsoluteURL(props.getProperty(IDP_JAVAKEYSTORE), rootDir);
 	}
 	
 	public String getIDPKeyStorePassword() {
@@ -170,6 +187,14 @@ public class PVPConfiguration {
 		return props.getProperty(IDP_KEY_PASSASSERTION);
 	}
 
+	public String getIDPKeyAliasAssertionEncryption() {
+		return props.getProperty(IDP_KEYALIASASSERTION);
+	}
+
+	public String getIDPKeyPasswordAssertionEncryption() {
+		return props.getProperty(IDP_KEY_PASSASSERTION);
+	}
+	
 	public String getIDPIssuerName() throws ConfigurationException {
 		
 		if (moaIDVersion == null) {
@@ -223,7 +248,7 @@ public class PVPConfiguration {
 	public iaik.x509.X509Certificate getTrustEntityCertificate(String entityID) {
 		
 		try {	
-		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(entityID);
+		IOAAuthParameters oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(entityID);
 		
 		if (oaParam == null) {
 			Logger.warn("Online Application with ID " + entityID + " not found!");