Author: anil.saldhana(a)jboss.com Date: 2010-10-14 12:46:50 -0400 (Thu, 14 Oct 2010) New Revision: 471 Added: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTCancelTargetParser.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustCancelTargetSamlTestCase.java Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java Log: PLFED-109: PLFED-110: Added: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTCancelTargetParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTCancelTargetParser.java (rev 0) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTCancelTargetParser.java 2010-10-14 16:46:50 UTC (rev 471) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.core.parsers.wst; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.StartElement; + +import org.picketlink.identity.federation.core.exceptions.ParsingException; +import org.picketlink.identity.federation.core.parsers.ParserNamespaceSupport; +import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; +import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil; +import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants; +import org.picketlink.identity.federation.core.wstrust.WSTrustConstants; +import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.ws.trust.CancelTargetType; + +/** + * Stax parser for the wst:CancelTarget element + * @author Anil.Saldhana(a)redhat.com + * @since Oct 13, 2010 + */ +public class WSTCancelTargetParser implements ParserNamespaceSupport +{ + /** + * @see {@link ParserNamespaceSupport#parse(XMLEventReader)} + */ + public Object parse(XMLEventReader xmlEventReader) throws ParsingException + { + CancelTargetType cancelTarget = new CancelTargetType(); + + StartElement startElement = StaxParserUtil.peekNextStartElement( xmlEventReader ); + String tag = StaxParserUtil.getStartElementName( startElement ); + + if( tag.equals( JBossSAMLConstants.ASSERTION.get() ) ) + { + SAMLParser assertionParser = new SAMLParser(); + AssertionType assertion = (AssertionType) assertionParser.parse( xmlEventReader ); + cancelTarget.setAny( assertion ); + } + + return cancelTarget; + } + + /** + * @see {@link ParserNamespaceSupport#supports(QName)} + */ + public boolean supports(QName qname) + { + String nsURI = qname.getNamespaceURI(); + String localPart = qname.getLocalPart(); + + return WSTrustConstants.BASE_NAMESPACE.equals( nsURI ) + && WSTrustConstants.CANCEL_TARGET.equals( localPart ); + } +} \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenParser.java 2010-10-14 16:21:26 UTC (rev 470) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRequestSecurityTokenParser.java 2010-10-14 16:46:50 UTC (rev 471) @@ -36,6 +36,7 @@ import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil; import org.picketlink.identity.federation.core.wstrust.WSTrustConstants; import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken; +import org.picketlink.identity.federation.ws.trust.CancelTargetType; import org.picketlink.identity.federation.ws.trust.ValidateTargetType; /** @@ -90,6 +91,14 @@ String value = StaxParserUtil.getElementText(xmlEventReader); requestToken.setTokenType( new URI( value )); } + else if( tag.equals( WSTrustConstants.CANCEL_TARGET )) + { + WSTCancelTargetParser wstCancelTargetParser = new WSTCancelTargetParser(); + CancelTargetType cancelTarget = (CancelTargetType) wstCancelTargetParser.parse( xmlEventReader ); + requestToken.setCancelTarget( cancelTarget ); + EndElement cancelTargetEndElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate( cancelTargetEndElement, WSTrustConstants.CANCEL_TARGET ) ; + } else if( tag.equals( WSTrustConstants.VALIDATE_TARGET )) { WSTValidateTargetParser wstValidateTargetParser = new WSTValidateTargetParser(); Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java 2010-10-14 16:21:26 UTC (rev 470) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java 2010-10-14 16:46:50 UTC (rev 471) @@ -37,11 +37,14 @@ AC_IP("urn:oasis:names:tc:SAML:2.0:ac:classes:InternetProtocol"), + BEARER( "urn:oasis:names:tc:SAML:2.0:cm:bearer" ), ASSERTION_NSURI("urn:oasis:names:tc:SAML:2.0:assertion"), ATTRIBUTE_FORMAT_BASIC("urn:oasis:names:tc:SAML:2.0:attrname-format:basic"), ATTRIBUTE_FORMAT_URI("urn:oasis:names:tc:SAML:2.0:attrname-format:uri"), + HOLDER_OF_KEY( "urn:oasis:names:tc:SAML:2.0:cm:holder-of-key" ), + METADATA_HTTP_REDIRECT_BINDING("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect"), NAMEID_FORMAT_TRANSIENT("urn:oasis:names:tc:SAML:2.0:nameid-format:transient"), Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2010-10-14 16:21:26 UTC (rev 470) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustConstants.java 2010-10-14 16:46:50 UTC (rev 471) @@ -29,6 +29,7 @@ * </p> * * @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a> + * @author <a href="mailto:asaldhan@redhat.com">Anil Saldhana</a> */ public class WSTrustConstants { @@ -84,6 +85,7 @@ public static final String RST_COLLECTION = "RequestSecurityTokenCollection"; public static final String REQUEST_TYPE = "RequestType"; public static final String TOKEN_TYPE = "TokenType"; + public static final String CANCEL_TARGET = "CancelTarget"; public static final String VALIDATE_TARGET = "ValidateTarget"; //Attribute Names Added: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustCancelTargetSamlTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustCancelTargetSamlTestCase.java (rev 0) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustCancelTargetSamlTestCase.java 2010-10-14 16:46:50 UTC (rev 471) @@ -0,0 +1,110 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.test.identity.federation.core.parser.wst; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; + +import java.io.InputStream; +import java.util.List; + +import javax.xml.bind.JAXBElement; +import javax.xml.datatype.DatatypeFactory; + +import org.junit.Test; +import org.picketlink.identity.federation.core.parsers.wst.WSTrustParser; +import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; +import org.picketlink.identity.federation.core.wstrust.WSTrustConstants; +import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken; +import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; +import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType; +import org.picketlink.identity.federation.saml.v2.assertion.SubjectType; +import org.picketlink.identity.federation.ws.trust.CancelTargetType; + +/** + * @author Anil.Saldhana(a)redhat.com + * @since Oct 14, 2010 + */ +public class WSTrustCancelTargetSamlTestCase +{ + @Test + public void testWST_CancelTargetSaml() throws Exception + { + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); + InputStream configStream = tcl.getResourceAsStream( "parser/wst/wst-cancel-saml.xml" ); + + WSTrustParser parser = new WSTrustParser(); + RequestSecurityToken rst1 = (RequestSecurityToken) parser.parse( configStream ); + assertEquals( "cancelcontext", rst1.getContext() ); + assertEquals( WSTrustConstants.CANCEL_REQUEST, rst1.getRequestType().toASCIIString() ); + + CancelTargetType cancelTarget = rst1.getCancelTarget(); + + AssertionType assertion = (AssertionType) cancelTarget.getAny(); + validateAssertion( assertion ); + } + + private void validateAssertion( AssertionType assertion ) throws Exception + { + DatatypeFactory dtf = DatatypeFactory.newInstance(); + + assertNotNull( assertion ); + + assertEquals( "ID_cb1eadf5-50a6-4fdf-96bc-412514f52882", assertion.getID() ); + assertEquals( dtf.newXMLGregorianCalendar( "2010-09-30T19:13:37.603Z" ), assertion.getIssueInstant() ); + //Issuer + assertEquals( "Test STS", assertion.getIssuer().getValue() ); + + //Subject + SubjectType subject = assertion.getSubject(); + List<JAXBElement<?>> content = subject.getContent(); + + int size = content.size(); + + assertEquals( 2, size ); + + for( int i = 0 ; i < size; i++ ) + { + JAXBElement<?> node = content.get(i); + if( node.getDeclaredType().equals( NameIDType.class )) + { + NameIDType subjectNameID = (NameIDType) node.getValue(); + + assertEquals( "jduke", subjectNameID.getValue() ); + assertEquals( "urn:picketlink:identity-federation", subjectNameID.getNameQualifier() ); + } + + if( node.getDeclaredType().equals( SubjectConfirmationType.class )) + { + SubjectConfirmationType subjectConfirmationType = (SubjectConfirmationType) node.getValue(); + assertEquals( JBossSAMLURIConstants.BEARER.get(), subjectConfirmationType.getMethod() ); + } + } + + //Conditions + ConditionsType conditions = assertion.getConditions(); + assertEquals( dtf.newXMLGregorianCalendar( "2010-09-30T19:13:37.603Z" ) , conditions.getNotBefore() ); + assertEquals( dtf.newXMLGregorianCalendar( "2010-09-30T21:13:37.603Z" ) , conditions.getNotOnOrAfter() ); + } +} \ No newline at end of file