[jboss-cvs] Picketlink SVN: r1058 - federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-07-05 15:23:04 -0400 (Tue, 05 Jul 2011)
New Revision: 1058

Modified:
   federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
Log:
reduce exception catches

Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java
===================================================================
--- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java	2011-07-01 21:44:58 UTC (rev 1057)
+++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java	2011-07-05 19:23:04 UTC (rev 1058)
@@ -70,7 +70,6 @@
 import org.picketlink.identity.federation.core.interfaces.TrustKeyProcessingException;
 import org.picketlink.identity.federation.core.saml.v2.common.SAMLDocumentHolder;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.picketlink.identity.federation.core.saml.v2.exceptions.IssueInstantMissingException;
 import org.picketlink.identity.federation.core.saml.v2.exceptions.IssuerNotTrustedException;
 import org.picketlink.identity.federation.core.saml.v2.factories.SAML2HandlerChainFactory;
 import org.picketlink.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
@@ -453,53 +452,17 @@
 
                requestedPostProfile = saml2HandlerResponse.isPostBindingForResponse();
             }
-            catch (IssuerNotTrustedException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer,
-                     JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get(), this.identityURL, this.signOutgoingMessages);
-            }
-            catch (ParsingException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
-            }
-            catch (ConfigurationException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
-            }
-            catch (IssueInstantMissingException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
-            }
-            catch (GeneralSecurityException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
-            }
             catch (Exception e)
             {
+               String status = JBossSAMLURIConstants.STATUS_AUTHNFAILED.get();
+               if (e instanceof IssuerNotTrustedException)
+               {
+                  status = JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get();
+               }
                if (trace)
                   log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
+               samlResponse = webRequestUtil.getErrorResponse(referer, status, this.identityURL,
+                     this.signOutgoingMessages);
             }
             finally
             {
@@ -619,53 +582,15 @@
                destination = saml2HandlerResponse.getDestination();
                requestedPostProfile = saml2HandlerResponse.isPostBindingForResponse();
             }
-            catch (IssuerNotTrustedException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer,
-                     JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get(), this.identityURL, this.signOutgoingMessages);
-            }
-            catch (ParsingException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
-            }
-            catch (ConfigurationException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
-            }
-            catch (IssueInstantMissingException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
-            }
-            catch (GeneralSecurityException e)
-            {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
-            }
             catch (Exception e)
             {
-               if (trace)
-                  log.trace("Exception in processing request:", e);
-
-               samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(),
-                     this.identityURL, this.signOutgoingMessages);
+               String status = JBossSAMLURIConstants.STATUS_AUTHNFAILED.get();
+               if (e instanceof IssuerNotTrustedException)
+               {
+                  status = JBossSAMLURIConstants.STATUS_REQUEST_DENIED.get();
+               }
+               samlResponse = webRequestUtil.getErrorResponse(referer, status, this.identityURL,
+                     this.signOutgoingMessages);
             }
             finally
             {