1 files changed, 28 insertions, 71 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 76cd8f994..463930fd7 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
@@ -21,11 +21,10 @@
  * that you distribute must include a readable copy of the "NOTICE" text file.
  *******************************************************************************/
 /**
- * 
+ *
  */
 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,133 +33,91 @@ 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.id.commons.db.dao.config.StorkAttribute;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.StringUtils;
 
 /**
  * Encapsulates several STORK configuration parameters according MOA configuration
- * 
+ *
  * @author bzwattendorfer
  *
  */
 public class STORKConfig {
-	
+
 	/** STORK SAML signature creation parameters */
 	private Properties props = null;
 	private Map<String, CPEPS> cpepsMap  = null;
 	private String basedirectory = null;
 	private SignatureVerificationParameter sigverifyparam = null;
-	
-	
+	private List<StorkAttribute> attr = null;
+
+
 	public STORKConfig(STORK stork, Properties props, String basedirectory) {
 		this.basedirectory = basedirectory;
 		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 " 
+				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 = stork.getSAMLSigningParameter();
-		
-		if (samlsign == null) {
-			Logger.warn("Error in MOA-ID Configuration. No STORK->SAMLSigningParameter configuration found.");
 
-		} else {
-			SignatureVerificationParameterType sigverify = samlsign.getSignatureVerificationParameter();
-		
-			if (sigverify == null) {
-				Logger.warn("Error in MOA-ID Configuration. No STORK->SignatureVerificationParameter configuration found.");
-				
-			} else {
-				sigverifyparam = new SignatureVerificationParameter(sigverify.getTrustProfileID());
-			}
+		attr = new ArrayList<StorkAttribute>();
+		for(StorkAttribute current : stork.getAttributes()) {
+			attr.add(current);
 		}
-		
+
 	}
 
 	public SignatureCreationParameter getSignatureCreationParameter() {
-		
+
 		return new SignatureCreationParameter(props, basedirectory);
 	}
 
 	public SignatureVerificationParameter getSignatureVerificationParameter() {
-	
-		return sigverifyparam; 	
+
+		return sigverifyparam;
 	}
 
 	public Map<String, CPEPS> getCpepsMap() {
 		return cpepsMap;
 	}
-	
+
 	public boolean isSTORKAuthentication(String ccc) {
-		  
+
 		  if (StringUtils.isEmpty(ccc) || this.cpepsMap.isEmpty())
 			  return false;
-		   		 
+
 		  if (this.cpepsMap.containsKey(ccc.toUpperCase()))
 			  return true;
 		  else
 			  return false;
-			  
+
 	}
-	
+
 	public CPEPS getCPEPS(String ccc) {
 		if (isSTORKAuthentication(ccc))
 			return this.cpepsMap.get(ccc);
 		else
 			return null;
 	}
-	
 
+	public List<StorkAttribute> getStorkAttributes() {
+		return attr;
+	}
 }