Author: anil.saldhana(a)jboss.com Date: 2009-10-22 13:18:41 -0400 (Thu, 22 Oct 2009) New Revision: 870 Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java Log: add info to the log out request Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java 2009-10-22 04:52:54 UTC (rev 869) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java 2009-10-22 17:18:41 UTC (rev 870) @@ -204,6 +204,7 @@ LogoutRequestType lor = (LogoutRequestType) saml2Request.getRequestType(stream); assertEquals("Match Employee URL", employee, destination); + assertEquals("Destination exists", employee, lor.getDestination()); //Let us feed the LogOutRequest to the SPFilter MockCatalinaContextClassLoader mclSPEmp = setupTCL(profile + "/sp/employee"); Modified: identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java 2009-10-22 04:52:54 UTC (rev 869) +++ identity-federation/trunk/jboss-identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/SAML2Request.java 2009-10-22 17:18:41 UTC (rev 870) @@ -37,6 +37,7 @@ import org.jboss.identity.federation.core.constants.JBossIdentityFederationConstants; import org.jboss.identity.federation.core.exceptions.ConfigurationException; import org.jboss.identity.federation.core.exceptions.ParsingException; +import org.jboss.identity.federation.core.saml.v2.common.IDGenerator; import org.jboss.identity.federation.core.saml.v2.common.SAMLDocumentHolder; import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLAuthnRequestFactory; import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory; @@ -240,6 +241,7 @@ org.jboss.identity.federation.saml.v2.protocol.ObjectFactory of = new org.jboss.identity.federation.saml.v2.protocol.ObjectFactory(); LogoutRequestType lrt = of.createLogoutRequestType(); + lrt.setID(IDGenerator.create("ID_")); lrt.setIssueInstant(XMLTimeUtil.getIssueInstant()); //Create an issuer 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-22 04:52:54 UTC (rev 869) +++ identity-federation/trunk/jboss-identity-web/src/main/java/org/jboss/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2009-10-22 17:18:41 UTC (rev 870) @@ -266,6 +266,12 @@ LogoutRequestType lort = saml2Request.createLogoutRequest(request.getIssuer().getValue()); + + long assertionValidity = (Long) request.getOptions().get(GeneralConstants.ASSERTIONS_VALIDITY); + + lort.setNotOnOrAfter(XMLTimeUtil.add(lort.getIssueInstant(), assertionValidity)); + lort.setDestination(participant); + response.setResultingDocument(saml2Request.convert(lort)); response.setSendRequest(true); } @@ -368,6 +374,7 @@ { LogoutRequestType lot = samlRequest.createLogoutRequest(request.getIssuer().getValue()); + response.setResultingDocument(samlRequest.convert(lot)); response.setSendRequest(true); }