fix MOA-ID-Auth problems

1 files changed, 18 insertions, 10 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index 06b55fb66..f3c40707e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -400,18 +400,22 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 		Logger.debug("Build PVP 2.1 authentication request");
  		
 		//get IDP metadata
-		try {
-			OAAuthParameter idp = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(target.getRequestedIDP());
-			OAAuthParameter sp = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(target.getOAURL());
+		
+		OAAuthParameter idp = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(target.getRequestedIDP());
+		OAAuthParameter sp = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(target.getOAURL());
 			
-			if (!idp.isInderfederationIDP() || !idp.isInboundSSOInterfederationAllowed()) {
-				Logger.info("Requested interfederation IDP " + target.getRequestedIDP() + " is not valid for interfederation.");
-				Logger.info("Switch to local authentication on this IDP ... ");
-				perfomLocalAuthentication(request, response, target);
-				return;
+		if (!idp.isInderfederationIDP() || !idp.isInboundSSOInterfederationAllowed()) {
+			Logger.info("Requested interfederation IDP " + target.getRequestedIDP() + " is not valid for interfederation.");
+			Logger.debug("isInderfederationIDP:" + String.valueOf(idp.isInderfederationIDP())
+					+ " isInboundSSOAllowed:" + String.valueOf(idp.isInboundSSOInterfederationAllowed()));
+			Logger.info("Switch to local authentication on this IDP ... ");
+			
+			perfomLocalAuthentication(request, response, target);
+			return;
 				
-			} 
+		}
 			
+		try {	
 			EntityDescriptor idpEntity = MOAMetadataProvider.getInstance().
 					getEntityDescriptor(target.getRequestedIDP());
 			
@@ -556,7 +560,11 @@ public class AuthenticationManager extends MOAIDAuthConstants {
 		
 		if (requiredLocalAuthentication) {
 			Logger.info("Switch to local authentication on this IDP ... ");
-			perfomLocalAuthentication(request, response, target);
+			if (idp.isPerformLocalAuthenticationOnInterfederationError())
+				perfomLocalAuthentication(request, response, target);
+			
+			else
+				throw new AuthenticationException("auth.29", new String[]{target.getRequestedIDP()});
 		}
 	}