1 files changed, 44 insertions, 13 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 0786f896a..f6832c161 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
@@ -1,15 +1,34 @@
+/*******************************************************************************
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.pvp2x.config;
 
 import iaik.x509.X509Certificate;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.security.cert.CertificateException;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
-import java.util.Set;
 
 import org.opensaml.saml2.metadata.Company;
 import org.opensaml.saml2.metadata.ContactPerson;
@@ -28,10 +47,8 @@ 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.commons.db.dao.config.PVP2;
 import at.gv.egovernment.moa.id.config.ConfigurationException;
-import at.gv.egovernment.moa.id.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
-import at.gv.egovernment.moa.id.protocols.pvp2x.utils.Digester;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
 import at.gv.egovernment.moa.logging.Logger;
 
@@ -51,10 +68,15 @@ public class PVPConfiguration {
 	public static final String PVP2_POST = "/pvp2/post";
 	
 	public static final String PVP_CONFIG_FILE = "pvp2config.properties";
+	
 	public static final String IDP_JAVAKEYSTORE = "idp.ks.file";
-	public static final String IDP_KEYALIAS = "idp.ks.alias";
 	public static final String IDP_KS_PASS = "idp.ks.kspassword";
-	public static final String IDP_KEY_PASS = "idp.ks.keypassword";
+	
+	public static final String IDP_KEYALIASMETADATA = "idp.ks.metadata.alias";	
+	public static final String IDP_KEY_PASSMETADATA = "idp.ks.metadata.keypassword";
+
+	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_ISSUER_NAME = "idp.issuer.name";
 
@@ -98,7 +120,8 @@ public class PVPConfiguration {
 		String publicPath = generalpvpconfigdb.getPublicURLPrefix();
 		if(publicPath != null) {
 			if(publicPath.endsWith("/")) {
-				publicPath = publicPath.substring(0, publicPath.length()-2);
+				int length = publicPath.length();
+				publicPath = publicPath.substring(0, length-1);
 			}
 		}
 		return publicPath;
@@ -119,17 +142,25 @@ public class PVPConfiguration {
 	public String getIDPKeyStoreFilename() {
 		return props.getProperty(IDP_JAVAKEYSTORE);
 	}
-
+	
 	public String getIDPKeyStorePassword() {
 		return props.getProperty(IDP_KS_PASS);
 	}
 
-	public String getIDPKeyAlias() {
-		return props.getProperty(IDP_KEYALIAS);
+	public String getIDPKeyAliasMetadata() {
+		return props.getProperty(IDP_KEYALIASMETADATA);
+	}
+
+	public String getIDPKeyPasswordMetadata() {
+		return props.getProperty(IDP_KEY_PASSMETADATA);
+	}
+	
+	public String getIDPKeyAliasAssertionSign() {
+		return props.getProperty(IDP_KEYALIASASSERTION);
 	}
 
-	public String getIDPKeyPassword() {
-		return props.getProperty(IDP_KEY_PASS);
+	public String getIDPKeyPasswordAssertionSign() {
+		return props.getProperty(IDP_KEY_PASSASSERTION);
 	}
 
 	public String getIDPIssuerName() {