Merge branch 'moa2_0_tlenz' of gitlab.iaik.tugraz.at:afitzek/moa-idspss into moa2_0_tlenz_bs_2

2 files changed, 4 insertions, 13 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
index bcd7cdc78..89cc1d25e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/parser/StartAuthentificationParameterParser.java
@@ -166,7 +166,9 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 			allowedbkus.addAll(AuthConfigurationProvider.getInstance().getDefaultBKUURLs());
 		    if (!ParamValidatorUtils.isValidBKUURI(bkuURL, allowedbkus))
 			       throw new WrongParametersException("StartAuthentication", PARAM_BKU, "auth.12");
-					    
+
+		    moasession.setBkuURL(bkuURL);
+		    
 			if (!oaParam.getBusinessService()) {
 				if (isEmpty(target))
 					throw new WrongParametersException("StartAuthentication",
@@ -229,17 +231,6 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{
 				moasession.setSourceID(sourceID);
 		}
 		
-		// BKU URL has not been set yet, even if session already exists
-		if (bkuURL == null) {
-			if (req.getScheme() != null && req.getScheme().equalsIgnoreCase("https")) {
-				bkuURL = DEFAULT_BKU_HTTPS;
-			} else {
-				bkuURL = DEFAULT_BKU;
-			}
-		}
-		moasession.setBkuURL(bkuURL);
-
-		
 	    if (MiscUtil.isEmpty(templateURL)) {
 	    	templateURL = oaParam.getTemplateURL().get(0).getURL();
 	    	Log.info("No SL-Template in request, load SL-Template from OA config (URL: " + templateURL + ")");
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index 6cc17231c..a45eb2b9e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -491,7 +491,7 @@ public class DispatcherServlet extends AuthServlet{
 				}
 
 			} catch (Throwable e) {
-				e.printStackTrace();
+				Logger.info("An authentication error occous: " + e.getMessage());;
 				// Try handle module specific, if not possible rethrow
 				if (!info.generateErrorMessage(e, req, resp, protocolRequest)) {
 					throw e;