MOA-ID 2.x Configuration implemented

  -SSO deaktivated
  -Login with mandate and normal tested

3 files changed, 107 insertions, 93 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 485a44421..4b4364555 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
@@ -3,9 +3,32 @@
  */

 package at.gv.egovernment.moa.id.config.stork;

 

+import iaik.util.logging.Log;

+

+import java.io.IOException;

+import java.net.MalformedURLException;

+import java.net.URL;

+import java.util.ArrayList;

 import java.util.HashMap;

+import java.util.List;

 import java.util.Map;

+import java.util.Properties;

+

+import javax.xml.parsers.ParserConfigurationException;

+

+import org.opensaml.saml2.metadata.RequestedAttribute;

+import org.opensaml.ws.message.encoder.MessageEncodingException;

+import org.w3c.dom.Element;

+import org.xml.sax.SAXException;

+

+import eu.stork.vidp.messages.util.SAMLUtil;

+import eu.stork.vidp.messages.util.XMLUtil;

 

+import at.gv.egovernment.moa.id.commons.db.dao.config.RequestedAttributeType;

+import at.gv.egovernment.moa.id.commons.db.dao.config.SAMLSigningParameter;

+import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;

+import at.gv.egovernment.moa.id.commons.db.dao.config.SignatureVerificationParameterType;

+import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.util.StringUtils;

 

 /**

@@ -17,55 +40,83 @@ import at.gv.egovernment.moa.util.StringUtils;
 public class STORKConfig {

 	

 	/** STORK SAML signature creation parameters */

-	private SignatureCreationParameter signatureCreationParameter;

+	private STORK stork;

+	private Properties props;

+	private Map<String, CPEPS> cpepsMap;

 	

-	/** STORK SAML signature verification parameters */

-	private SignatureVerificationParameter signatureVerificationParameter;

-	

-	/** Map of supported C-PEPSs */

-	private Map<String, CPEPS> cpepsMap = new HashMap<String, CPEPS>();

-	

-	

-	/**

-	 * Constructs a STORK Config object

-	 * @param signatureCreationParameter STORK SAML Signature creation parameters

-	 * @param signatureVerificationParameter STORK SAML Signature verification parameters

-	 * @param cpepsMap Map of supported C-PEPS

-	 */

-	public STORKConfig(SignatureCreationParameter signatureCreationParameter,

-			SignatureVerificationParameter signatureVerificationParameter,

-			Map<String, CPEPS> cpepsMap) {

-		super();

-		this.signatureCreationParameter = signatureCreationParameter;

-		this.signatureVerificationParameter = signatureVerificationParameter;

-		this.cpepsMap = cpepsMap;

+	public STORKConfig(STORK stork, Properties props) {

+		this.stork = stork;

+		this.props = props;

+		

+		//create CPEPS map

+		List<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS> cpeps = stork.getCPEPS();

+		

+		cpepsMap = new HashMap<String, CPEPS>();

+		

+		for(at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS cpep : cpeps) {

+			

+			try {

+				CPEPS moacpep = new CPEPS(cpep.getCountryCode(), new URL(cpep.getURL()));

+				

+				List<String> attr = cpep.getAttributeValue();

+				

+				ArrayList<RequestedAttribute> requestedAttributes = new ArrayList<RequestedAttribute>();

+				

+				for (String e1 : attr) {

+					Element element = XMLUtil.stringToDOM(e1);

+					RequestedAttribute requestedAttribute = (RequestedAttribute) SAMLUtil.unmarshallMessage(element);

+					requestedAttributes.add(requestedAttribute);

+				}

+				moacpep.setCountrySpecificRequestedAttributes(requestedAttributes);

+				

+				cpepsMap.put(cpep.getCountryCode(), moacpep);

+				

+			} catch (MalformedURLException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid URL and is ignored.");

+			} catch (ParserConfigurationException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

+			} catch (SAXException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

+			} catch (IOException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

+			} catch (MessageEncodingException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

+			}

+		}

 	}

 

 	public SignatureCreationParameter getSignatureCreationParameter() {

-		return signatureCreationParameter;

-	}

-

-	public void setSignatureCreationParameter(

-			SignatureCreationParameter signatureCreationParameter) {

-		this.signatureCreationParameter = signatureCreationParameter;

+		

+		return new SignatureCreationParameter(props);

 	}

 

 	public SignatureVerificationParameter getSignatureVerificationParameter() {

-		return signatureVerificationParameter;

-	}

-

-	public void setSignatureVerificationParameter(

-			SignatureVerificationParameter signatureVerificationParameter) {

-		this.signatureVerificationParameter = signatureVerificationParameter;

+		

+		SAMLSigningParameter samlsign = stork.getSAMLSigningParameter();

+		

+		if (samlsign == null) {

+			Log.warn("Error in MOA-ID Configuration. No STORK->SAMLSigningParameter configuration found.");

+			return null;

+		}

+		

+		SignatureVerificationParameterType sigverify = samlsign.getSignatureVerificationParameter();

+		

+		if (sigverify == null) {

+			Log.warn("Error in MOA-ID Configuration. No STORK->SignatureVerificationParameter configuration found.");

+			return null;

+		}

+		

+		return new SignatureVerificationParameter(sigverify.getTrustProfileID());	

 	}

 

 	public Map<String, CPEPS> getCpepsMap() {

 		return cpepsMap;

 	}

-

-	public void setCpepsMap(Map<String, CPEPS> cpepsMap) {

-		this.cpepsMap = cpepsMap;

-	}

 	

 	public boolean isSTORKAuthentication(String ccc) {

 		  

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 1f66b7752..ee4fc1e20 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
@@ -23,6 +23,8 @@
 

 package at.gv.egovernment.moa.id.config.stork;

 

+import java.util.Properties;

+

 /**

  * Encapsulates signature creation parameters according MOA configuration

  * 

@@ -31,32 +33,24 @@ package at.gv.egovernment.moa.id.config.stork;
  */

 public class SignatureCreationParameter {

 	

-	/** KeyStore Path */

-	private String keyStorePath;

+	private static final String PROPS_PREFIX = "stork.samlsigningparameter.signaturecreation.";

+	private static final String PROPS_KEYSTORE_FILE = "keystore.file";

+	private static final String PROPS_KEYSTORE_PASS = "keystore.password";

+	private static final String PROPS_KEYNAME_NAME = "keyname.name";

+	private static final String PROPS_KEYNAME_PASS = "keyname.password";

 	

-	/** KeyStore Password */

-	private String keyStorePassword;

+	private Properties props;

 	

-	/** Signing Key Name */

-	private String keyName;

+	SignatureCreationParameter(Properties props) {

+		this.props = props;

+	}

 	

-	/** Signing Key Password */

-	private String keyPassword;

-

 	/**

 	 * Gets the KeyStore Path

 	 * @return File Path to KeyStore

 	 */

 	public String getKeyStorePath() {

-		return keyStorePath;

-	}

-

-	/**

-	 * Sets the KeyStore Path

-	 * @param keyStorePath Path to KeyStore

-	 */

-	public void setKeyStorePath(String keyStorePath) {

-		this.keyStorePath = keyStorePath;

+		return props.getProperty(PROPS_PREFIX+PROPS_KEYSTORE_FILE);

 	}

 

 	/**

@@ -64,15 +58,7 @@ public class SignatureCreationParameter {
 	 * @return Password to KeyStore

 	 */

 	public String getKeyStorePassword() {

-		return keyStorePassword;

-	}

-

-	/**

-	 * Sets the KeyStore Password

-	 * @param keyStorePassword Password to KeyStore

-	 */

-	public void setKeyStorePassword(String keyStorePassword) {

-		this.keyStorePassword = keyStorePassword;

+		return props.getProperty(PROPS_PREFIX+PROPS_KEYSTORE_PASS);

 	}

 

 	/**

@@ -80,15 +66,7 @@ public class SignatureCreationParameter {
 	 * @return Siging Key Name

 	 */

 	public String getKeyName() {

-		return keyName;

-	}

-

-	/**

-	 * Sets the Signing Key Name

-	 * @param keyName Signing Key Name

-	 */

-	public void setKeyName(String keyName) {

-		this.keyName = keyName;

+		return props.getProperty(PROPS_PREFIX+PROPS_KEYNAME_NAME);

 	}

 

 	/**

@@ -96,17 +74,6 @@ public class SignatureCreationParameter {
 	 * @return Signing Key Password

 	 */

 	public String getKeyPassword() {

-		return keyPassword;

+		return props.getProperty(PROPS_PREFIX+PROPS_KEYNAME_PASS);

 	}

-

-	/**

-	 * Sets the Signing Key Password

-	 * @param keyPassword Signing Key Password

-	 */

-	public void setKeyPassword(String keyPassword) {

-		this.keyPassword = keyPassword;

-	}

-	

-	

-

 }

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureVerificationParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureVerificationParameter.java
index 2d8402e4d..211c7dde4 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureVerificationParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/SignatureVerificationParameter.java
@@ -14,6 +14,10 @@ public class SignatureVerificationParameter {
 	/** ID of the MOA-SP TrustProfile to be used for STORK SAML signature verification */

 	private String trustProfileID;

 

+	public SignatureVerificationParameter(String trustProfileID2) {

+		this.trustProfileID = trustProfileID2;

+	}

+

 	/**

 	 * Gets the MOA-SP TrustProfileID

 	 * @return TrustProfileID of MOA-SP for STORK signature verification

@@ -22,14 +26,6 @@ public class SignatureVerificationParameter {
 		return trustProfileID;

 	}

 

-	/**

-	 * Sets the MOA-SP TrustProfileID

-	 * @param trustProfileID TrustProfileID of MOA-SP for STORK signature verification

-	 */

-	public void setTrustProfileID(String trustProfileID) {

-		this.trustProfileID = trustProfileID;

-	}

-	

 	

 

 }