Author: anil.saldhana(a)jboss.com Date: 2009-10-14 00:50:17 -0400 (Wed, 14 Oct 2009) New Revision: 860 Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerResponse.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/core/IdentityServer.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/mock/MockHttpSession.java identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2PostWorkflowUnitTestCase.java Log: JBID:40: saml logout Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerResponse.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerResponse.java 2009-10-14 04:37:39 UTC (rev 859) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/interfaces/SAML2HandlerResponse.java 2009-10-14 04:50:17 UTC (rev 860) @@ -109,7 +109,15 @@ */ String getErrorMessage(); + /** + * Will the resulting document be a SAMLRequest? + * @param request + */ void setSendRequest(boolean request); + /** + * @see #setSendRequest(boolean) + * @return + */ boolean getSendRequest(); } \ No newline at end of file Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/core/IdentityServer.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/core/IdentityServer.java 2009-10-14 04:37:39 UTC (rev 859) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/core/IdentityServer.java 2009-10-14 04:50:17 UTC (rev 860) @@ -201,7 +201,10 @@ IdentityServer idserver = (IdentityServer) servletContext.getAttribute(GeneralConstants.IDENTITY_SERVER); if(idserver == null) + { + idserver = this; servletContext.setAttribute(GeneralConstants.IDENTITY_SERVER, this); + } if(idserver != this) throw new IllegalStateException("Identity Server mismatch"); Modified: identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2009-10-14 04:37:39 UTC (rev 859) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2009-10-14 04:50:17 UTC (rev 860) @@ -190,7 +190,7 @@ throw new ProcessingException(e); } - httpSession.invalidate(); + httpSession.invalidate(); //We are done with the logout interaction } else { Modified: identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/mock/MockHttpSession.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/mock/MockHttpSession.java 2009-10-14 04:37:39 UTC (rev 859) +++ identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/mock/MockHttpSession.java 2009-10-14 04:50:17 UTC (rev 860) @@ -44,6 +44,8 @@ private Map<String,Object> attribs = new HashMap<String,Object>(); private String id = UUID.randomUUID().toString(); + + private ServletContext context; public boolean isInvalidated() { @@ -94,9 +96,14 @@ return 0; } + public void setServletContext(ServletContext servletContext) + { + this.context = servletContext; + } + public ServletContext getServletContext() { - throw new RuntimeException("NYI"); + return this.context; } public HttpSessionContext getSessionContext() Modified: identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java 2009-10-14 04:37:39 UTC (rev 859) +++ identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java 2009-10-14 04:50:17 UTC (rev 860) @@ -92,6 +92,7 @@ ServletContext servletContext = new MockServletContext(); + session.setServletContext(servletContext); //Let us feed the LogOutRequest to the SPFilter MockContextClassLoader mclSPEmp = setupTCL(profile + "/sp/employee"); @@ -134,6 +135,8 @@ Thread.currentThread().setContextClassLoader(mclIDP); ServletContext servletContext = new MockServletContext(); + session.setServletContext(servletContext); + IdentityServer server = this.getIdentityServer(session); servletContext.setAttribute("IDENTITY_SERVER", server); MockServletConfig servletConfig = new MockServletConfig(servletContext); Modified: identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2PostWorkflowUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2PostWorkflowUnitTestCase.java 2009-10-14 04:37:39 UTC (rev 859) +++ identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/workflow/saml2/SAML2PostWorkflowUnitTestCase.java 2009-10-14 04:50:17 UTC (rev 860) @@ -110,6 +110,7 @@ MockHttpSession session = new MockHttpSession(); servletContext = new MockServletContext(); + session.setServletContext(servletContext); IdentityServer server = this.getIdentityServer(session); servletContext.setAttribute("IDENTITY_SERVER", server); MockServletConfig servletConfig = new MockServletConfig(servletContext);