Merge branch 'current_development' into development_preview

# Conflicts:
#	id/history.txt
#	id/server/modules/moa-id-modul-citizencard_authentication/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
#	pom.xml

9 files changed, 95 insertions, 95 deletions

diff --git a/id/server/moa-id-commons/pom.xml b/id/server/moa-id-commons/pom.xml
index 7ec1ddf73..dfcad9bc7 100644
--- a/id/server/moa-id-commons/pom.xml
+++ b/id/server/moa-id-commons/pom.xml
@@ -4,12 +4,11 @@
     <parent>
         <groupId>MOA.id</groupId>
         <artifactId>moa-id</artifactId>
-        <version>3.x</version>
+        <version>4.1.0</version>
     </parent>
     <artifactId>moa-id-commons</artifactId>
     <name>moa-id-commons</name>
     <groupId>MOA.id.server</groupId>
-    <version>${moa-id-version}</version>
 
     <profiles>
         <profile>
@@ -19,15 +18,15 @@
             </activation>
             <repositories>
                 <repository>
-                    <id>local</id>
+                    <id>moaid_local</id>
                     <name>local</name>
                     <url>file:${basedir}/../../../repository</url>
                 </repository>
                	<repository>
-										<id>shibboleth.internet2.edu</id>
-										<name>Internet2</name>
-										<url>https://build.shibboleth.net/nexus/content/groups/public/</url>
-								</repository>
+					<id>shibboleth.internet2.edu</id>
+					<name>Internet2</name>
+					<url>https://apps.egiz.gv.at/shibboleth_nexus/</url>
+				</repository>
                 <repository>
                     <id>hyberjaxb</id>
                     <url>http://repository.highsource.org/maven2/releases/</url>
@@ -44,7 +43,7 @@
                 </repository>
                 <repository>
                     <id>egiz-commons</id>
-                    <url>https://demo.egiz.gv.at/int-repo/</url>
+                    <url>https://apps.egiz.gv.at/maven/</url>
                     <releases>
                         <enabled>true</enabled>
                     </releases>
@@ -57,6 +56,10 @@
     <dependencies>
     		<dependency>
     			<groupId>at.gv.egiz.eaaf</groupId>
+  				<artifactId>eaaf_core_api</artifactId>
+    		</dependency>
+    		<dependency>
+    			<groupId>at.gv.egiz.eaaf</groupId>
 	  			<artifactId>eaaf-core</artifactId>
     		</dependency>    
     		<dependency>
@@ -65,25 +68,35 @@
     		</dependency>
     		<dependency>
     			 <groupId>at.gv.util</groupId>
-           <artifactId>egovutils</artifactId>
-           <exclusions>
-           		<exclusion>
-           			<groupId>*</groupId>
-           			<artifactId>*</artifactId>
-           		</exclusion>
-           </exclusions>
+          		 <artifactId>egovutils</artifactId>
+           		<exclusions>
+           			<exclusion>
+           				<groupId>*</groupId>
+           				<artifactId>*</artifactId>
+           			</exclusion>
+           		</exclusions>
     		</dependency>
     
-       	<dependency>
-    			 <groupId>org.opensaml</groupId>
-  				 <artifactId>opensaml</artifactId>
-           <exclusions>
-           		<exclusion>
-           			<groupId>*</groupId>
-           			<artifactId>*</artifactId>
-           		</exclusion>
-           </exclusions>
+       		<dependency>
+    			<groupId>org.opensaml</groupId>
+  				<artifactId>opensaml</artifactId>
+           		<exclusions>
+           			<exclusion>
+           				<groupId>*</groupId>
+           				<artifactId>*</artifactId>
+           			</exclusion>
+           		</exclusions>
     		</dependency>
+    		<dependency> 
+				<groupId>org.opensaml</groupId>
+				<artifactId>openws</artifactId>
+				<exclusions>
+					<exclusion>
+						<groupId>*</groupId>
+           				<artifactId>*</artifactId>
+					</exclusion>
+				</exclusions>
+			</dependency>
     
     		<dependency>
     			<groupId>org.apache.httpcomponents</groupId>
@@ -224,7 +237,7 @@
 				<dependency>
 					<groupId>com.sun.xml.bind</groupId>
 					<artifactId>jaxb-xjc</artifactId>
-					<version>2.3.0</version>
+					<version>2.3.2</version>
 				</dependency>
 
 				<dependency>
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java
index 12b9517a6..2873b17ef 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/ConfigurationProvider.java
@@ -22,14 +22,14 @@
  */
 package at.gv.egovernment.moa.id.commons.api;
 
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
 import at.gv.egovernment.moa.id.commons.api.exceptions.ConfigurationException;
 
 /**
  * @author tlenz
  *
  */
-public interface ConfigurationProvider extends IConfiguration{
+public interface ConfigurationProvider extends IConfigurationWithSP{
 
 	  /** 
 	   * The name of the system property which contains the file name of the 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/data/IVerifiyXMLSignatureResponse.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/data/IVerifiyXMLSignatureResponse.java
index 08dfcae71..b08a49895 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/data/IVerifiyXMLSignatureResponse.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/api/data/IVerifiyXMLSignatureResponse.java
@@ -156,6 +156,5 @@ public interface IVerifiyXMLSignatureResponse {
 
 	Date getSigningDateTime();
 
-	void setSigningDateTime(Date signingDateTime);
 
 }
\ No newline at end of file
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index 4adff7f19..62a19b399 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -154,6 +154,7 @@ public class ConfigurationMigrationUtils {
 			if (MiscUtil.isNotEmpty(target_full)) {
 				if (TargetValidator.isValidTarget(target_full)) {
 					result.put(MOAIDConfigurationConstants.SERVICE_AUTH_TARGET_PUBLIC_TARGET, target_full);
+					result.put(MOAIDConfigurationConstants.SERVICE_AUTH_TARGET_PUBLIC_USE_SUB, Boolean.FALSE.toString());
 					
 				} else {
 					String[] target_split = target_full.split("-");
@@ -198,8 +199,13 @@ public class ConfigurationMigrationUtils {
 			//convert selected SZR-GW service
 			if (MiscUtil.isNotEmpty(oa.getSelectedSZRGWServiceURL()))
 				result.put(MOAIDConfigurationConstants.SERVICE_EXTERNAL_CENTRAL_EIDASNODE_SERVICE_URL, oa.getSelectedSZRGWServiceURL());
+
+			//convert selected E-ID service
+			if (MiscUtil.isNotEmpty(oa.getSelectedEIDServiceURL()))
+				result.put(MOAIDConfigurationConstants.SERVICE_EXTERNAL_EID_SYSTEM_SERVICE_URL, oa.getSelectedEIDServiceURL());
+
 			
-	        AuthComponentOA oaauth = oa.getAuthComponentOA();
+			AuthComponentOA oaauth = oa.getAuthComponentOA();
 			if (oaauth != null) {
 				
 				//convert SL20 infos
@@ -815,7 +821,9 @@ public class ConfigurationMigrationUtils {
 	        
 	        
 	        dbOA.setSelectedSZRGWServiceURL(oa.get(MOAIDConfigurationConstants.SERVICE_EXTERNAL_CENTRAL_EIDASNODE_SERVICE_URL));
-
+	        dbOA.setSelectedEIDServiceURL(oa.get(MOAIDConfigurationConstants.SERVICE_EXTERNAL_EID_SYSTEM_SERVICE_URL));
+	        
+	        
 	        dbOA.setMandateServiceSelectionTemplateURL(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_ELGAMANDATESERVICESELECTION_URL));
 	        dbOA.setSaml2PostBindingTemplateURL(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_TEMPLATES_SAML2POSTBINDING_URL));
 	        
@@ -1267,6 +1275,9 @@ public class ConfigurationMigrationUtils {
 				result.put(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL, 
 						config.getElgaMandateServiceURLs());
 					
+			if (MiscUtil.isNotEmpty(config.getEidSystemServiceURLs()))
+				result.put(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_EID_SYSTEM_SERVICE_URL, 
+						config.getEidSystemServiceURLs());
 			
 			
 			AuthComponentGeneral auth = config.getAuthComponentGeneral();
@@ -1590,8 +1601,10 @@ public class ConfigurationMigrationUtils {
         
 		MOAIDConfiguration dbconfig = new MOAIDConfiguration();
 		
-		dbconfig.setElgaMandateServiceURLs(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL));
+		dbconfig.setElgaMandateServiceURLs(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL));		
+		dbconfig.setEidSystemServiceURLs(moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_SERVICES_EID_SYSTEM_SERVICE_URL));
 		
+			
 		AuthComponentGeneral dbauth = dbconfig.getAuthComponentGeneral();
 		if (dbauth == null) {
 			dbauth = new AuthComponentGeneral();
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
index 1be97c49d..91d738989 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/MOAIDConfigurationConstants.java
@@ -52,6 +52,7 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	private static final String TEMPLATES = "templates";	
 	private static final String INTERFEDERATION = "interfederation";
 	private static final String ELGA_MANDATE_SERVICE_URL = "modules.elga_mandate.service.entityID";
+	private static final String EID_SYSTEM_SERVICE_URL = "modules.eid_system.service.entityID";
 	
 	private static final String PROTOCOLS = "protocols";
 	private static final String SAML1 = "saml1";
@@ -195,9 +196,11 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	public static final String SERVICE_REVERSION_LOGS_ENABLED = SERVICE_REVERSION + ".log.enabled";
 	public static final String SERVICE_REVERSION_LOGS_EVENTCODES = SERVICE_REVERSION + ".log.eventcodes";
 	
-	public static final String SERVICE_EXTERNAL_ELGA_MANDATE_SERVICE_URL = ELGA_MANDATE_SERVICE_URL;
+	public static final String SERVICE_EXTERNAL_ELGA_MANDATE_SERVICE_URL = ELGA_MANDATE_SERVICE_URL;	
+		
 	public static final String SERVICE_EXTERNAL_MIS_SERVICE_URL = "modules.mis.service.url";
 	public static final String SERVICE_EXTERNAL_CENTRAL_EIDASNODE_SERVICE_URL = "modules.szrgw.service.url";
+	public static final String SERVICE_EXTERNAL_EID_SYSTEM_SERVICE_URL = "modules.eidsystem.service.url";
 	
 	//Namespaces for general MOA-ID config
 	public static final String GENERAL_PUBLICURLPREFIX = PREFIX_MOAID_GENERAL + ".publicURLPrefix";
@@ -235,6 +238,8 @@ public final class MOAIDConfigurationConstants extends MOAIDConstants {
 	public static final String GENERAL_AUTH_SERVICES_HVB_URL = GENERAL_AUTH + ".services.hvb.url";
 	
 	public static final String GENERAL_AUTH_SERVICES_ELGA_MANDATE_SERVICE_URL = PREFIX_MOAID_GENERAL + "." + ELGA_MANDATE_SERVICE_URL;
+	public static final String GENERAL_AUTH_SERVICES_EID_SYSTEM_SERVICE_URL = PREFIX_MOAID_GENERAL + "." + EID_SYSTEM_SERVICE_URL;
+	
 	
 	public static final String GENERAL_AUTH_SSO_SERVICENAME = GENERAL_AUTH + "." + SSO + ".servicename";
 	public static final String GENERAL_AUTH_SSO_TARGET = GENERAL_AUTH + "." + SSO + ".target";
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
index c251c7abb..1cb2f3fa0 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/MOAIDConfiguration.java
@@ -187,6 +187,10 @@ public class MOAIDConfiguration
     @XmlTransient
     protected String elgaMandateServiceURLs = null;
     
+    @XmlTransient
+    protected String eidSystemServiceURLs = null;
+    
+    
     
     /**
 	 * @return the eventCodes
@@ -503,6 +507,16 @@ public class MOAIDConfiguration
 		this.elgaMandateServiceURLs = elgaMandateServiceURLs;
 	}
 
+	
+	
+	public String getEidSystemServiceURLs() {
+		return eidSystemServiceURLs;
+	}
+
+	public void setEidSystemServiceURLs(String eidSystemServiceURLs) {
+		this.eidSystemServiceURLs = eidSystemServiceURLs;
+	}
+
 	/**
      * Sets the value of the hjid property.
      * 
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java
index 510fd0581..74a79912e 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/db/dao/config/deprecated/OnlineApplication.java
@@ -108,6 +108,9 @@ public class OnlineApplication
     
     @XmlTransient
     protected String selectedSZRGWServiceURL = null;
+        
+    @XmlTransient
+    protected String selectedEIDServiceURL = null;
     
     @XmlTransient
     protected String saml2PostBindingTemplateURL = null;
@@ -123,7 +126,7 @@ public class OnlineApplication
 
     @XmlTransient
     protected Boolean iseIDDemoModeActive = false;
-    
+	
     
     public String getForeignbPKTargetList() {
 		return foreignbPKTargetList;
@@ -194,6 +197,15 @@ public class OnlineApplication
 		this.selectedSZRGWServiceURL = selectedSZRGWServiceURL;
 	}
 
+	
+	public String getSelectedEIDServiceURL() {
+		return this.selectedEIDServiceURL;
+	}
+	
+	public void setSelectedEIDServiceURL(String selectedEIDServiceURL) {
+		this.selectedEIDServiceURL = selectedEIDServiceURL;
+	}
+	
 	/**
 	 * @return the isRevisionsLogActive
 	 */
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAIDMessageProvider.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAIDMessageProvider.java
index f4143e434..f9b43c193 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAIDMessageProvider.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/MOAIDMessageProvider.java
@@ -146,4 +146,10 @@ public String mapInternalErrorToExternalError(String intErrorCode) {
 	return extErrorCode;
 }
 
+@Override
+public String getMessageWithoutDefault(String messageId, Object[] parameters) {
+  return getMessage(messageId, parameters);
+  
+}
+
 }
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/X509Utils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/X509Utils.java
deleted file mode 100644
index 026b1a5fb..000000000
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/utils/X509Utils.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package at.gv.egovernment.moa.id.commons.utils;
-
-import java.security.cert.X509Certificate;
-import java.util.List;
-
-import javax.security.auth.x500.X500Principal;
-
-public class X509Utils {
-
-	  /**
-	   * Sorts the Certificate Chain by IssuerDN and SubjectDN. The [0]-Element should be the Hostname,
-	   * the last Element should be the Root Certificate.
-	   * 
-	   * @param certs
-	   *          The first element must be the correct one.
-	   * @return sorted Certificate Chain
-	   */
-	  public static List<X509Certificate> sortCertificates(
-		      List<X509Certificate> certs)
-		  {
-		    int length = certs.size();
-		    if (certs.size() <= 1)
-		    {
-		      return certs;
-		    }
-
-		    for (X509Certificate cert : certs)
-		    {
-		      if (cert == null)
-		      {
-		        throw new NullPointerException();
-		      }
-		    }
-
-		    for (int i = 0; i < length; i++)
-		    {
-		      boolean found = false;
-		      X500Principal issuer = certs.get(i).getIssuerX500Principal();
-		      for (int j = i + 1; j < length; j++)
-		      {
-		        X500Principal subject = certs.get(j).getSubjectX500Principal();
-		        if (issuer.equals(subject))
-		        {
-		          // sorting necessary?
-		          if (i + 1 != j)
-		          {
-		            X509Certificate tmp = certs.get(i + 1);
-		            certs.set(i + 1, certs.get(j));
-		            certs.set(j, tmp);
-		          }
-		          found = true;
-		        }
-		      }
-		      if (!found)
-		      {
-		        break;
-		      }
-		    }
-
-		    return certs;
-		}
-}