From 1dcf1c30e542cc4aa7791e7e429700bef207a565 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 31 Mar 2014 10:52:58 +0200 Subject: Add additional error handling and logging --- .../moa/id/auth/servlet/GenerateIFrameTemplateServlet.java | 6 +++++- .../egovernment/moa/id/auth/servlet/GetForeignIDServlet.java | 11 ++++++----- .../moa/id/auth/servlet/GetMISSessionIDServlet.java | 11 +++++++++-- .../egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java | 7 ++++++- .../moa/id/auth/servlet/SSOSendAssertionServlet.java | 8 +++++++- .../moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java | 9 ++++++++- .../moa/id/auth/servlet/VerifyCertificateServlet.java | 5 ++++- .../moa/id/auth/servlet/VerifyIdentityLinkServlet.java | 10 ++++++---- 8 files changed, 51 insertions(+), 16 deletions(-) (limited to 'id/server/idserverlib/src/main/java') 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 0a0355bd7..6f30e98df 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 @@ -187,8 +187,12 @@ public class GenerateIFrameTemplateServlet extends AuthServlet { catch (MOAIDException ex) { handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("BKUSelectionServlet has an interal Error.", e); + } - + finally { ConfigurationDBUtils.closeSession(); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java index e9afb2e68..17dd9e343 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java @@ -260,11 +260,12 @@ public class GetForeignIDServlet extends AuthServlet { } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); - } catch (Exception e1) { - // TODO Auto-generated catch block - e1.printStackTrace(); - } + handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("GetForeignIDServlet has an interal Error.", e); + + } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java index 5733cee85..a776bbe9a 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java @@ -246,16 +246,23 @@ public class GetMISSessionIDServlet extends AuthServlet { } catch (MOAIDException ex) { handleError(null, ex, req, resp, pendingRequestID); + } catch (GeneralSecurityException ex) { handleError(null, ex, req, resp, pendingRequestID); + } catch (PKIException e) { handleError(null, e, req, resp, pendingRequestID); + } catch (SAXException e) { handleError(null, e, req, resp, pendingRequestID); + } catch (ParserConfigurationException e) { handleError(null, e, req, resp, pendingRequestID); - } - + + } catch (Exception e) { + Logger.error("MISMandateValidation has an interal Error.", e); + + } finally { ConfigurationDBUtils.closeSession(); } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java index 328a441cd..d6db64a85 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java @@ -384,9 +384,14 @@ public class PEPSConnectorServlet extends AuthServlet { } catch (AuthenticationException e) { handleError(null, e, request, response, pendingRequestID); + } catch (MOAIDException e) { handleError(null, e, request, response, pendingRequestID); - } + + } catch (Exception e) { + Logger.error("PEPSConnector has an interal Error.", e); + } + finally { ConfigurationDBUtils.closeSession(); 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 6fa7b56c6..997241822 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 @@ -150,11 +150,17 @@ public class SSOSendAssertionServlet extends AuthServlet{ } catch (MOADatabaseException e) { handleError("SSO Session is not found", e, req, resp, id); + } catch (WrongParametersException e) { handleError("Parameter is not valid", e, req, resp, id); + } catch (AuthenticationException e) { handleError(e.getMessage(), e, req, resp, id); - } + + } catch (Exception e) { + Logger.error("SSOSendAssertion has an interal Error.", e); + } + } } diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java index 2b46c8ff2..787dc6f10 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java @@ -303,13 +303,20 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet { catch (MOAIDException ex) { handleError(null, ex, req, resp, pendingRequestID); + } catch (GeneralSecurityException e) { handleError(null, e, req, resp, pendingRequestID); + } catch (PKIException e) { handleError(null, e, req, resp, pendingRequestID); + } catch (TransformerException e) { handleError(null, e, req, resp, pendingRequestID); - } + + } catch (Exception e) { + Logger.error("AuthBlockValidation has an interal Error.", e); + } + finally { ConfigurationDBUtils.closeSession(); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java index fddd0d6b9..a3397f561 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java @@ -215,9 +215,12 @@ public class VerifyCertificateServlet extends AuthServlet { } } catch (MOAIDException ex) { - handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("CertificateValidation has an interal Error.", e); } + finally { ConfigurationDBUtils.closeSession(); diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java index 407e33978..3b503f07b 100644 --- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java +++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java @@ -260,12 +260,14 @@ public class VerifyIdentityLinkServlet extends AuthServlet { } catch (ParseException ex) { handleError(null, ex, req, resp, pendingRequestID); - } - - catch (MOAIDException ex) { + + } catch (MOAIDException ex) { handleError(null, ex, req, resp, pendingRequestID); + + } catch (Exception e) { + Logger.error("IdentityLinkValidation has an interal Error.", e); } - + finally { ConfigurationDBUtils.closeSession(); } -- cgit v1.2.3