Merge branch 'ISA-1.18-action' into during_authsource_refactoring

Conflicts:
	id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
	id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/verification/SAMLVerificationEngine.java
	pom.xml

4 files changed, 10 insertions, 7 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
index 957479b29..e6000319e 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/config/ConfigurationProvider.java
@@ -437,23 +437,23 @@ public class ConfigurationProvider {
 		return parseVersionFromManifest();
 	}
 	
-	public String getCertStoreDirectory() throws CertificateException {
+	public String getCertStoreDirectory() throws ConfigurationException {
 		String dir = props.getProperty("general.ssl.certstore");
 		if (MiscUtil.isNotEmpty(dir))
 				return FileUtils.makeAbsoluteURL(dir, configRootDir);
 		
 		else
-			throw new CertificateException("No SSLCertStore configured use default JAVA TrustStore.");
+			throw new ConfigurationException("No SSLCertStore configured use default JAVA TrustStore.");
 		
 	}
 	
-	public String getTrustStoreDirectory() throws CertificateException {
+	public String getTrustStoreDirectory() throws ConfigurationException {
 		String dir = props.getProperty("general.ssl.truststore");
 		if (MiscUtil.isNotEmpty(dir))
 				return FileUtils.makeAbsoluteURL(dir, configRootDir);
 		
 		else
-			throw new CertificateException("No SSLTrustStore configured use default JAVA TrustStore.");
+			throw new ConfigurationException("No SSLTrustStore configured use default JAVA TrustStore.");
 		
 	}
 	
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
index 150cd959e..bb7bac4f8 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/oa/OATargetConfiguration.java
@@ -82,7 +82,7 @@ public class OATargetConfiguration implements IOnlineApplicationData {
 	 */
 	@Override
 	public List<String> parse(OnlineApplication dbOA,
-			AuthenticatedUser authUser, HttpServletRequest request) {		
+			AuthenticatedUser authUser, HttpServletRequest request) {
 		String target_full = dbOA.getTarget();
 		if (MiscUtil.isNotEmpty(target_full)) {
 			if (TargetValidator.isValidTarget(target_full)) {
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java
index 8ed1f3a88..e5ee5ac09 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/helper/FormDataHelper.java
@@ -60,7 +60,8 @@ public class FormDataHelper {
 
 		for (OnlineApplication dboa : dbOAs) {
 			
-			if ( !((dboa.isIsInterfederationIDP() != null && dboa.isIsInterfederationIDP()) || 
+			if ( !((dboa.isIsInterfederationIDP() != null && dboa.isIsInterfederationIDP()) ||
+					(dboa.isIsInterfederationGateway() != null && dboa.isIsInterfederationGateway()) ||
 					(dboa.getAuthComponentOA().getOASTORK() != null 
 						&& dboa.getAuthComponentOA().getOASTORK().isVidpEnabled() != null
 						&& dboa.getAuthComponentOA().getOASTORK().isVidpEnabled()) || 
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
index a64a0eaf1..8e1dd6e64 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/oa/OAPVP2ConfigValidation.java
@@ -129,7 +129,7 @@ public class OAPVP2ConfigValidation {
 							} catch (ConfigurationException e) {
 								log.info("No MOA specific SSL-TrustStore configured. Use default Java TrustStore.", e);
 								
-							}
+							} 
 
 						List<MetadataFilter> filterList = new ArrayList<MetadataFilter>();
 						filterList.add(new MetaDataVerificationFilter(credential));
@@ -172,6 +172,8 @@ public class OAPVP2ConfigValidation {
 			
 		} catch (MetadataProviderException e) {
 			
+			
+			//TODO: check exception handling
 			if (e.getCause() != null && e.getCause().getCause() instanceof SSLHandshakeException) {
 				log.info("SSL Server certificate not trusted.", e);
 				errors.add(LanguageHelper.getErrorString("validation.pvp2.metadata.ssl", request));