Author: anil.saldhana(a)jboss.com Date: 2009-10-21 17:00:58 -0400 (Wed, 21 Oct 2009) New Revision: 866 Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java Log: minor Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-10-21 16:57:31 UTC (rev 865) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2009-10-21 21:00:58 UTC (rev 866) @@ -345,11 +345,11 @@ } catch (ParsingException e) { - if(trace) log.trace(e); + if(trace) log.trace("Parsing exception:", e); } catch (GeneralSecurityException e) { - if(trace) log.trace(e); + if(trace) log.trace("Security Exception:",e); } } return; Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-10-21 16:57:31 UTC (rev 865) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2009-10-21 21:00:58 UTC (rev 866) @@ -97,6 +97,7 @@ } } + //Mock test purpose public void testStart() throws LifecycleException { InputStream is = context.getServletContext().getResourceAsStream(configFile); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-21 16:57:31 UTC (rev 865) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/servlets/IDPServlet.java 2009-10-21 21:00:58 UTC (rev 866) @@ -419,46 +419,11 @@ relayState = saml2HandlerResponse.getRelayState(); destination = saml2HandlerResponse.getDestination(); - - - //requestAbstractType = webRequestUtil.getSAMLRequest(samlMessage); - - - /*//RequestAbstractType - if(requestAbstractType != null) - { - List<String> roles = (List<String>) session.getAttribute(ROLES_ID); - if(roles == null) - { - roles = rg.generateRoles(userPrincipal); - session.setAttribute(ROLES_ID, roles); - } - - if(trace) - log.trace("Roles have been determined:Creating response"); - - if(requestAbstractType instanceof LogoutRequestType) - { - LogoutRequestType lot = (LogoutRequestType) requestAbstractType; - - } - - AuthnRequestType art = (AuthnRequestType) requestAbstractType; - destination = art.getAssertionConsumerServiceURL(); - - samlResponse = - webRequestUtil.getResponse(destination, - userPrincipal, roles, - this.identityURL, this.assertionValidity, this.signOutgoingMessages); - } - else - { - //status response type - }*/ + } catch (IssuerNotTrustedException e) { - if(trace) log.trace(e); + if(trace) log.trace("Exception:",e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -467,7 +432,7 @@ } catch (ParsingException e) { - if(trace) log.trace(e); + if(trace) log.trace("Exception:",e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -476,7 +441,7 @@ } catch (ConfigurationException e) { - if(trace) log.trace(e); + if(trace) log.trace("Exception:",e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -485,7 +450,7 @@ } catch (IssueInstantMissingException e) { - if(trace) log.trace(e); + if(trace) log.trace("Exception:",e); samlResponse = webRequestUtil.getErrorResponse(referer, @@ -494,13 +459,22 @@ } catch(GeneralSecurityException e) { - if(trace) log.trace(e); + if(trace) log.trace("Security Exception:",e); samlResponse = webRequestUtil.getErrorResponse(referer, JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(), this.identityURL, this.signOutgoingMessages); } + catch(Exception e) + { + if(trace) log.trace("Exception:",e); + + samlResponse = + webRequestUtil.getErrorResponse(referer, + JBossSAMLURIConstants.STATUS_AUTHNFAILED.get(), + this.identityURL, this.signOutgoingMessages); + } } else