From 02be9260fa6b3c84a9cbd7df2c53c7a4ec9e1dd6 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Thu, 23 Jul 2015 14:53:03 +0200 Subject: update log messages with loglevel INFO --- .../moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java | 4 ++-- .../java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java | 4 ++-- .../auth/modules/internal/tasks/FinalizeAuthenticationTask.java | 5 ++--- .../modules/internal/tasks/PrepareAuthBlockSignatureTask.java | 4 ---- .../moa/id/auth/servlet/GenerateIFrameTemplateServlet.java | 4 +++- .../moa/id/auth/servlet/ProcessEngineSignalServlet.java | 2 +- .../egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java | 2 +- .../at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java | 7 +++---- .../at/gv/egovernment/moa/id/moduls/AuthenticationManager.java | 2 +- .../src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java | 2 +- .../moa/id/process/dao/ProcessInstanceStoreDAOImpl.java | 2 +- .../moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java | 6 ++++-- .../moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java | 3 +++ .../java/at/gv/egovernment/moa/id/storage/AssertionStorage.java | 7 +++---- .../egovernment/moa/id/storage/AuthenticationSessionStoreage.java | 8 ++++---- 15 files changed, 31 insertions(+), 31 deletions(-) (limited to 'id/server') diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java index 81699bcdf..760d28d5b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationBlockAssertionBuilder.java @@ -267,7 +267,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion try { OAAuthParameter oaparam = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(session.getPublicOAURLPrefix()); if (MiscUtil.isNotEmpty(oaparam.getAditionalAuthBlockText())) { - Logger.info("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix()); + Logger.debug("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix()); text = oaparam.getAditionalAuthBlockText(); } @@ -422,7 +422,7 @@ public class AuthenticationBlockAssertionBuilder extends AuthenticationAssertion try { OAAuthParameter oaparam = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter(session.getPublicOAURLPrefix()); if (MiscUtil.isNotEmpty(oaparam.getAditionalAuthBlockText())) { - Logger.info("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix()); + Logger.debug("Use addional AuthBlock Text from OA=" + oaparam.getPublicURLPrefix()); text = oaparam.getAditionalAuthBlockText(); } } catch (ConfigurationException e) { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java index 063d7d8e4..1cf6929e6 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java @@ -245,7 +245,7 @@ public class BPKBuilder { identificationValue = calculateStorkeIdentifierBase(baseID, sourceCountry, destinationCountry); } else { // if not, sector identification value is already calculated by BKU - Logger.info("STORK eIdentifier already provided by BKU"); + Logger.debug("STORK eIdentifier already provided by BKU"); identificationValue = baseID; } @@ -267,7 +267,7 @@ public class BPKBuilder { private String calculateStorkeIdentifierBase(String baseID, String sourceCountry, String destinationCountry) throws BuildException { String basisbegriff = baseID + "+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry; - Logger.info("Building STORK identification from: [identValue]+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry); + Logger.debug("Building STORK identification from: [identValue]+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry); return calculatebPKwbPK(basisbegriff); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java index 45b5e3a7e..28bed7713 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/FinalizeAuthenticationTask.java @@ -93,10 +93,9 @@ public class FinalizeAuthenticationTask extends AbstractAuthServletTask { //Session is implicte stored in changeSessionID!!! String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session); - - Logger.info("Changed MOASession " + oldsessionID + " to Session " + newMOASessionID); - Logger.info("Daten angelegt zu MOASession " + newMOASessionID); + Logger.info("AuthProcess finished. Redirect to Protocol Dispatcher."); + String redirectURL = new DataURLBuilder().buildDataURL(session.getAuthURL(), ModulUtils.buildAuthURL(session.getModul(), session.getAction(), pendingReq.getRequestID()), newMOASessionID); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java index c172fc6f3..4dcd48f57 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/modules/internal/tasks/PrepareAuthBlockSignatureTask.java @@ -72,10 +72,6 @@ public class PrepareAuthBlockSignatureTask extends AbstractAuthServletTask { // change MOASessionID sessionID = AuthenticationSessionStoreage.changeSessionID(session); - Logger.info("Normal"); - - // TODO[branch]: Default behaviour; respond with CXSR for authblock signature, dataURL "/VerifyAuthBlock" - OAAuthParameter oaParam = AuthConfigurationProviderFactory.getInstance().getOnlineApplicationParameter( session.getPublicOAURLPrefix()); AuthConfiguration authConf = AuthConfigurationProviderFactory.getInstance(); 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 b7b2ea95f..c33cb3d81 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 @@ -63,7 +63,7 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { - Logger.info("Receive " + GenerateIFrameTemplateServlet.class + " Request"); + Logger.debug("Receive " + GenerateIFrameTemplateServlet.class + " Request"); String pendingRequestID = null; @@ -194,6 +194,8 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { throw new MOAIDException("init.04", new Object[] { moasession.getSessionID() }); } + Logger.info("BKU is selected -> Start BKU communication ..."); + // start process getProcessEngine().start(processInstanceId); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java index 0f9eed8ec..ee995e16b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/ProcessEngineSignalServlet.java @@ -100,7 +100,7 @@ public class ProcessEngineSignalServlet extends AuthServlet { handleError(null, ex, req, resp, pendingRequestID); } finally { - MOASessionDBUtils.closeSession(); + //MOASessionDBUtils.closeSession(); TransactionIDUtils.removeTransactionId(); TransactionIDUtils.removeSessionId(); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java index d116f473c..600ef2c76 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/SSOSendAssertionServlet.java @@ -59,7 +59,7 @@ public class SSOSendAssertionServlet extends AuthServlet{ throws ServletException, IOException { String id = null; - Logger.info("Receive " + SSOSendAssertionServlet.class + " Request"); + Logger.debug("Receive " + SSOSendAssertionServlet.class + " Request"); try { Object idObject = req.getParameter(ID); 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 217efe927..a60443bc8 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 @@ -102,8 +102,8 @@ public class DispatcherServlet extends AuthServlet{ String protocolRequestID = null; try { - Logger.info("REQUEST: " + req.getRequestURI()); - Logger.info("QUERY : " + req.getQueryString()); + Logger.debug("REQUEST: " + req.getRequestURI()); + Logger.debug("QUERY : " + req.getQueryString()); // *** start of error handling *** @@ -589,8 +589,7 @@ public class DispatcherServlet extends AuthServlet{ TransactionIDUtils.removeSessionId(); } - Logger.info("Clossing Dispatcher processing loop"); - Logger.info("Http response prepared sent: " + resp.toString()); + Logger.debug("Clossing Dispatcher processing loop"); } @Override 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 afc0d8451..f54cffc54 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 @@ -137,7 +137,7 @@ public class AuthenticationManager extends MOAIDAuthConstants { String sessionID = (String) request.getParameter(PARAM_SESSIONID); if (sessionID != null) { - Logger.info("got MOASession: " + sessionID); + Logger.debug("Find MOASession: " + sessionID); AuthenticationSession authSession; try { authSession = AuthenticationSessionStoreage.getSession(sessionID); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java index 34b44e991..2a618272f 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java @@ -85,7 +85,7 @@ public class SSOManager { String interIDP = httpReq.getParameter(MOAIDAuthConstants.INTERFEDERATION_IDP); if (MiscUtil.isNotEmpty(protocolRequest.getRequestedIDP())) { - Logger.info("Protocolspecific preprocessing already set interfederation IDP " + protocolRequest.getRequestedIDP()); + Logger.debug("Protocolspecific preprocessing already set interfederation IDP " + protocolRequest.getRequestedIDP()); return; } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java index 012dfe90b..a75a5de8c 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/process/dao/ProcessInstanceStoreDAOImpl.java @@ -61,7 +61,7 @@ public class ProcessInstanceStoreDAOImpl implements ProcessInstanceStoreDAO { } throw e; } finally { - MOASessionDBUtils.closeSession(); + //MOASessionDBUtils.closeSession(); } } if (result != null) { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java index b5baa6a05..3bef7844c 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20AuthRequest.java @@ -176,8 +176,10 @@ public class OAuth20AuthRequest extends OAuth20BaseRequest { || !this.getRedirectUri().equals(oAuthConfig.getConfigurationValue(MOAIDConfigurationConstants.SERVICE_PROTOCOLS_OPENID_REDIRECTURL))) { throw new OAuth20AccessDeniedException(); } - } - catch (ConfigurationException e) { + + Logger.info("Dispatch OpenIDConnect AuthRequest: ClientID=" + this.clientID); + + } catch (ConfigurationException e) { throw new OAuth20WrongParameterException(OAuth20Constants.PARAM_CLIENT_ID); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java index 1b6d93fdd..9d611b2f1 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/protocol/OAuth20TokenRequest.java @@ -37,6 +37,7 @@ import at.gv.egovernment.moa.id.protocols.oauth20.exceptions.OAuth20AccessDenied import at.gv.egovernment.moa.id.protocols.oauth20.exceptions.OAuth20Exception; import at.gv.egovernment.moa.id.protocols.oauth20.exceptions.OAuth20InvalidGrantException; import at.gv.egovernment.moa.id.protocols.oauth20.exceptions.OAuth20WrongParameterException; +import at.gv.egovernment.moa.logging.Logger; class OAuth20TokenRequest extends OAuth20BaseRequest { @@ -137,6 +138,8 @@ class OAuth20TokenRequest extends OAuth20BaseRequest { throw new OAuth20WrongParameterException(OAuth20Constants.PARAM_CLIENT_ID); } + Logger.info("Dispatch OpenIDConnect TokenRequest: ClientID=" + this.clientID); + //add valid parameters this.allowedParameters.add(OAuth20Constants.PARAM_SCOPE); this.allowedParameters.add(OAuth20Constants.PARAM_REDIRECT_URI); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java index 2dbcc912b..704adc80d 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java @@ -75,8 +75,7 @@ public class AssertionStorage { //store AssertionStore element to Database try { MOASessionDBUtils.saveOrUpdate(element); - Logger.info("Sessioninformation with ID=" + artifact + " is stored in Database"); - + Logger.info(assertion.getClass().getName() + " with ID: " + artifact + " is stored in Database"); } catch (MOADatabaseException e) { Logger.warn("Sessioninformation could not be stored."); throw new MOADatabaseException(e); @@ -152,7 +151,7 @@ public class AssertionStorage { for(AssertionStore result : results) { try { cleanDelete(result); - Logger.info("Remove sessioninformation with ID=" + result.getArtifact() + Logger.info("Remove stored information with ID: " + result.getArtifact() + " after timeout."); } catch (HibernateException e){ @@ -169,7 +168,7 @@ public class AssertionStorage { try { AssertionStore element = searchInDatabase(artifact); cleanDelete(element); - Logger.info("Remove sessioninformation with ID" + artifact); + Logger.info("Remove stored information with ID: " + artifact); } catch (MOADatabaseException e) { diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java index 30b6caef8..4b4b5ddc5 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AuthenticationSessionStoreage.java @@ -103,7 +103,7 @@ public class AuthenticationSessionStoreage { //store AssertionStore element to Database MOASessionDBUtils.saveOrUpdate(dbsession); - Logger.info("MOASession with sessionID=" + id + " is stored in Database"); + Logger.info("Create MOASession with sessionID: " + id); return session; @@ -441,10 +441,10 @@ public class AuthenticationSessionStoreage { tx.commit(); if (SLOInfo != null) - Logger.debug("Add SSO-Session login information for OA: " + OAUrl + Logger.info("Add SSO-Session login information for OA: " + OAUrl + " and AssertionID: " + SLOInfo.getSessionIndex()); else - Logger.debug("Add SSO-Session login information for OA: " + OAUrl); + Logger.info("Add SSO-Session login information for OA: " + OAUrl); } @@ -831,7 +831,7 @@ public class AuthenticationSessionStoreage { //store AssertionStore element to Database try { MOASessionDBUtils.saveOrUpdate(dbsession); - Logger.info("MOASession with sessionID=" + id + " is stored in Database"); + Logger.debug("MOASession with sessionID=" + id + " is stored in Database"); } catch (MOADatabaseException e) { Logger.warn("MOASession could not be created."); -- cgit v1.2.3