merge

1 files changed, 16 insertions, 48 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 659035337..ff481b825 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
@@ -25,7 +25,6 @@
  */

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

 

-import java.io.IOException;

 import java.net.MalformedURLException;

 import java.net.URL;

 import java.util.ArrayList;

@@ -34,15 +33,10 @@ import java.util.List;
 import java.util.Map;

 import java.util.Properties;

 

-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.StorkAttribute;

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

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

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

-import org.xml.sax.SAXException;

-

-import javax.xml.parsers.ParserConfigurationException;

 

 /**

  * Encapsulates several STORK configuration parameters according MOA configuration

@@ -65,60 +59,34 @@ public class STORKConfig {
 		this.props = props;

 

 		//create CPEPS map

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

-        List<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS> cpeps = new ArrayList<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS>();   // TODO Change this

-

+		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) {

+		if (cpeps != null) {

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

 

-			try {

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

+				try {

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

 

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

+					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 (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.");

-			}*/

 		}

 

-        SAMLSigningParameter samlsign = null;

-        try {

-            samlsign = stork.getSAMLSigningParameter();   // TODO Fix nullpointerexception when nothing is configured

-        }

-        catch (Exception ex) {

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

-        }

-

-		if (samlsign == null) {

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

-

 		attr = new ArrayList<StorkAttribute>();

-        try {

-		for(StorkAttribute current : stork.getAttributes()) {

-			attr.add(current);

-		}    } catch (Exception ex) {                                                                  // TODO FIX FIX

-            Logger.warn("Error in MOA-ID Configuration. No STORK->Attributes found.");

-        }

+		if (stork.getAttributes() != null) {

+			for(StorkAttribute current : stork.getAttributes()) {

+				attr.add(current);

+			}

+		}

 

 	}

 

-    }

-

 	public SignatureCreationParameter getSignatureCreationParameter() {

 

 		return new SignatureCreationParameter(props, basedirectory);