Merge remote-tracking branch 'remotes/origin/vidp' into moa2_0_tlenz

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditGeneralConfigAction.java
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/struts/action/EditOAAction.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
	id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
	id/server/moa-id-commons/pom.xml
	id/server/stork2-saml-engine/pom.xml
	pom.xml
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.jar
	repository/iaik/iaik_tsl/1.0/iaik_tsl-1.0.pom

4 files changed, 73 insertions, 28 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
index 7e21c6667..2d0a0e367 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
@@ -55,7 +55,12 @@ public class OAParameter {
 			this.businessService = true;
 		else
 			this.businessService = false;
-		
+
+        if (this.oaType.equals("storkService"))
+            this.storkService = true;
+        else
+            this.storkService = false;
+
 		this.publicURLPrefix = oa.getPublicURLPrefix();
 		
 		this.friendlyName = oa.getFriendlyName();
@@ -81,8 +86,15 @@ public class OAParameter {
 	 * if value of {@link #oaType} is "businessService"
 	 */
 	private boolean businessService;
-	
-	/**
+
+    /**
+     * specifies whether the online application is a stork application or not (<code>true</code>
+     * if value of {@link #oaType} is "storkService"
+     */
+    private boolean storkService;
+
+
+    /**
 	 * public URL prefix of the online application
 	 */
 	private String publicURLPrefix;
@@ -139,5 +151,7 @@ public class OAParameter {
 	public OAOAUTH20 getoAuth20Config() {
 		return oAuth20Config;
 	}
+
+    public boolean getStorkService() { return storkService; }
 	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index 8b5c8d796..ba2c08bb5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -398,11 +398,11 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 			
 			MOAIDConfiguration moaconfig = BuildFromLegacyConfig.build(new File(legacyconfig), rootConfigFileDir, null);
 			
-			List<OnlineApplication> oas = moaconfig.getOnlineApplication();
+			List<OnlineApplication> oas = moaconfig.getOnlineApplications();
 			for (OnlineApplication oa : oas)
 				ConfigurationDBUtils.save(oa);
 
-			moaconfig.setOnlineApplication(null);	
+			moaconfig.setOnlineApplications(null);	
 			ConfigurationDBUtils.save(moaconfig);
 			
 			Logger.info("Legacy Configuration load is completed.");
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index 50b870c98..d16e85084 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -51,6 +51,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUSelectionCustomizationType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
@@ -368,6 +369,13 @@ public List<OAStorkAttribute> getRequestedAttributes() {
 	return oa_auth.getOASTORK().getOAAttributes();
 }
 
+public boolean isRequireConsentForStorkAttributes() {
+	return oa_auth.getOASTORK().isRequireConsent();
+}
+
+public List<AttributeProviderPlugin> getStorkAPs() {
+	return oa_auth.getOASTORK().getAttributeProviders();
+}
 
 public byte[] getBKUSelectionTemplate() {
 	
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 b3a4cca78..4dec2c32e 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,6 +25,7 @@
  */

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

 

+import java.io.IOException;

 import java.net.MalformedURLException;

 import java.net.URL;

 import java.util.ArrayList;

@@ -33,10 +34,15 @@ 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

@@ -58,33 +64,50 @@ public class STORKConfig {
 		this.basedirectory = basedirectory;

 		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

+

+        try {

+            cpeps = stork.getCPEPS();

+        }   catch (NullPointerException ex) {

+            Logger.error("CPEPS not configured!");

+        }

+

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

-		attr = new ArrayList<StorkAttribute>();

-		

-		if (stork != null) {

-			//create CPEPS map

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

-		

-			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()));

-

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

-					}	

-				}

-			}

 

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

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

-					attr.add(current);

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

+

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

+			}*/

+		}

+		attr = new ArrayList<StorkAttribute>();

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

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

+				attr.add(current);

+			}

 		}

 

 	}