diff options
Diffstat (limited to 'id')
4 files changed, 46 insertions, 10 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java index 1bb829bab..1b120c7c1 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java @@ -258,6 +258,7 @@ public class AuthenticationServer implements MOAIDAuthConstants { } if (session.isSsoRequested()) { + Log.info("SSO Login requested"); //load identityLink with SSO Target boolean isbuisness = false; @@ -275,16 +276,17 @@ public class AuthenticationServer implements MOAIDAuthConstants { isbuisness, domainIdentifier); } else { - - if (oaParam.getStorkService()) + Log.info("Non-SSO Login requested"); + if (oaParam.getStorkService()) { // build stork request infoboxReadRequest = new InfoboxReadRequestBuilder().buildStorkReadRequest( oaParam.getIdentityLinkDomainIdentifier()); - else + } else { //build ReadInfobox request infoboxReadRequest = new InfoboxReadRequestBuilder().build( oaParam.getBusinessService(), oaParam .getIdentityLinkDomainIdentifier()); + } } @@ -1895,6 +1897,7 @@ public class AuthenticationServer implements MOAIDAuthConstants { authnRequest.setSpSector(spSector); authnRequest.setPersonalAttributeList(attributeList); + //TODO change authnRequest.setEIDCrossBorderShare(true); authnRequest.setEIDCrossSectorShare(true); authnRequest.setEIDSectorShare(true); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java index 13cebdbff..4bae0300b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java @@ -119,7 +119,12 @@ public class AuthenticationSession implements Serializable { * Indicates whether the corresponding online application is a business service or not */ private boolean businessService; - + + /** + * Indicates whether the corresponding online application is a stork service or not + */ + private boolean storkService; + // Store Mandate /** * Use mandate @@ -584,7 +589,28 @@ public class AuthenticationSession implements Serializable { public void setBusinessService(boolean businessService) { this.businessService = businessService; } - + + + /** + * Returns the storkService. + * + * @return <code>true</code> if the corresponding online application is a stork application, + * otherwise <code>false</code> + */ + public boolean getStorkService() { + return storkService; + } + + /** + * Sets the storkService variable. + * + * @param storkService + * the value for setting the storkService variable. + */ + public void setStorkService(boolean storkService) { + this.storkService = storkService; + } + /** * @return template URL */ 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 71d2aae37..b7afe4f8a 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 @@ -111,6 +111,7 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{ //load OnlineApplication configuration OAAuthParameter oaParam; if (moasession.getPublicOAURLPrefix() != null) { + Logger.debug("Loading OA parameters for PublicURLPrefix: " + moasession.getPublicOAURLPrefix()); oaParam = AuthConfigurationProvider.getInstance() .getOnlineApplicationParameter( moasession.getPublicOAURLPrefix()); @@ -136,8 +137,10 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{ // no target attribut is given in OA config // target is used from request // check parameter - if (!ParamValidatorUtils.isValidTarget(target)) + if (!ParamValidatorUtils.isValidTarget(target)) { + Logger.error("Selected target is invalid. Using target: " + target); throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.12"); + } } else { // use target from config @@ -171,14 +174,14 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{ moasession.setBkuURL(bkuURL); - if (!oaParam.getBusinessService()) { + if ((!oaParam.getBusinessService())&&(!oaParam.getStorkService())) { if (isEmpty(target)) throw new WrongParametersException("StartAuthentication", PARAM_TARGET, "auth.05"); } else { if (useMandateBoolean) { - Logger.error("Online-Mandate Mode for bussines application not supported."); + Logger.error("Online-Mandate Mode for business application not supported."); throw new AuthenticationException("auth.17", null); } target = null; @@ -189,7 +192,9 @@ public class StartAuthentificationParameterParser implements MOAIDAuthConstants{ moasession.setTarget(target); moasession.setBusinessService(oaParam.getBusinessService()); - moasession.setTargetFriendlyName(targetFriendlyName); + moasession.setStorkService(oaParam.getStorkService()); + Logger.debug("Business: " + moasession.getBusinessService() + " stork: " + moasession.getStorkService()); + moasession.setTargetFriendlyName(targetFriendlyName); moasession.setDomainIdentifier(oaParam.getIdentityLinkDomainIdentifier()); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java index 6f30e98df..2ef8ab5ec 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GenerateIFrameTemplateServlet.java @@ -118,7 +118,9 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { //load Parameters from config String target = oaParam.getTarget(); - + + + String bkuURL = oaParam.getBKUURL(bkuid); if (MiscUtil.isEmpty(bkuURL)) { Logger.info("No OA specific BKU defined. Use BKU from default configuration"); |