January 2011 - picketlink-commits

Picketlink SVN: r692 - picketlink-seam/trunk/picketlink-seam.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 18:11:17 -0500 (Mon, 31 Jan 2011) New Revision: 692 Modified: picketlink-seam/trunk/picketlink-seam/pom.xml Log: add exclusion Modified: picketlink-seam/trunk/picketlink-seam/pom.xml =================================================================== --- picketlink-seam/trunk/picketlink-seam/pom.xml 2011-01-31 23:10:53 UTC (rev 691) +++ picketlink-seam/trunk/picketlink-seam/pom.xml 2011-01-31 23:11:17 UTC (rev 692) @@ -166,6 +166,10 @@ <artifactId>log4j</artifactId> <groupId>log4j</groupId> </exclusion> + <exclusion> + <artifactId>xml-security</artifactId> + <groupId>xmlsec</groupId> + </exclusion> </exclusions> </dependency> <dependency>

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r691 - picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 18:10:53 -0500 (Mon, 31 Jan 2011) New Revision: 691 Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java Log: use the saml parsers Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java 2011-01-31 23:10:21 UTC (rev 690) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java 2011-01-31 23:10:53 UTC (rev 691) @@ -37,17 +37,13 @@ import java.util.List; import java.util.Map; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Unmarshaller; - +import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.RoleDescriptorType; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.RoleDescriptorType; import org.picketlink.identity.seam.federation.jaxb.config.SamlConfigType; import org.picketlink.identity.seam.federation.jaxb.config.SamlIdentityProviderType; @@ -138,13 +134,21 @@ { try { - JAXBContext jaxbContext = JAXBContext.newInstance("org.picketlink.identity.federation.saml.v2.metadata"); + InputStream samlEntitiesStream = getClass().getResourceAsStream( SAML_ENTITIES_FILE ); + if( samlEntitiesStream == null ) + throw new RuntimeException( "SAML Entities File is missing" ); + + SAMLParser samlParser = new SAMLParser(); + EntitiesDescriptorType entitiesDescriptor = (EntitiesDescriptorType) samlParser.parse( samlEntitiesStream ); + + /*JAXBContext jaxbContext = JAXBContext.newInstance("org.picketlink.identity.federation.saml.v2.metadata"); Unmarshaller unmarshaller = jaxbContext.createUnmarshaller(); JAXBElement<?> o = (JAXBElement<?>) unmarshaller.unmarshal(getClass().getResource(SAML_ENTITIES_FILE)); EntitiesDescriptorType entitiesDescriptor = (EntitiesDescriptorType) o.getValue(); + */ readEntitiesDescriptor(entitiesDescriptor); } - catch (JAXBException e) + catch ( Exception e) { throw new RuntimeException(e); }

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r690 - picketlink-seam/trunk/seam-sp/src/main/resources.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 18:10:21 -0500 (Mon, 31 Jan 2011) New Revision: 690 Modified: picketlink-seam/trunk/seam-sp/src/main/resources/saml-entities.xml Log: reformat the ds:x509cert Modified: picketlink-seam/trunk/seam-sp/src/main/resources/saml-entities.xml =================================================================== --- picketlink-seam/trunk/seam-sp/src/main/resources/saml-entities.xml 2011-01-31 23:09:57 UTC (rev 689) +++ picketlink-seam/trunk/seam-sp/src/main/resources/saml-entities.xml 2011-01-31 23:10:21 UTC (rev 690) @@ -9,17 +9,18 @@ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> <ds:X509Certificate> - MIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh - bGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09w - ZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQsw - CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAK - BgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0B - AQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+ - RkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNY - Js0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/U - QzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDA - cGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC - /FfwWigmrW0Y0Q==</ds:X509Certificate> +MIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh +bGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09w +ZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAK +BgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0B +AQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+ +RkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNY +Js0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/U +QzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDA +cGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC +/FfwWigmrW0Y0Q== + </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </KeyDescriptor> @@ -151,4 +152,4 @@ </IDPSSODescriptor> </EntityDescriptor> -</EntitiesDescriptor> \ No newline at end of file +</EntitiesDescriptor>

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r689 - picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 18:09:57 -0500 (Mon, 31 Jan 2011) New Revision: 689 Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java Log: use metadata extractor Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java 2011-01-31 23:05:50 UTC (rev 688) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java 2011-01-31 23:09:57 UTC (rev 689) @@ -22,19 +22,15 @@ package org.picketlink.identity.seam.federation.configuration; import java.security.PublicKey; +import java.security.cert.X509Certificate; import java.util.HashMap; import java.util.Map; -import javax.security.cert.X509Certificate; - -import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; +import org.picketlink.identity.federation.api.saml.v2.metadata.MetaDataExtractor; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyTypes; import org.picketlink.identity.seam.federation.SamlProfile; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; /** * @author Marcel Kolsteren @@ -69,46 +65,11 @@ { if (keyDescriptor.getUse().equals(KeyTypes.SIGNING)) { - Element elem = keyDescriptor.getKeyInfo(); - if( elem != null ) + X509Certificate cert = MetaDataExtractor.getCertificate(keyDescriptor); + if( cert != null ) { - NodeList x509DataNodes = elem.getElementsByTagName( "X509Data" ); - if( x509DataNodes != null && x509DataNodes.getLength() > 0 ) - { - //Choose the first one - Node x509DataNode = x509DataNodes.item(0); - NodeList children = x509DataNode.getChildNodes(); - int len = children != null ? children.getLength() : 0 ; - for( int i = 0 ; i < len ; i++ ) - { - Node nl = children.item(i); - if( nl.getNodeName().contains( "X509Certificate" ) ) - { - byte[] certificate = null ; - try - { - certificate = DocumentUtil.getNodeAsString(nl).getBytes(); - } - catch ( Exception e ) - { - throw new RuntimeException( e ); - } - try - { - X509Certificate cert = X509Certificate.getInstance(certificate); - publicKey = cert.getPublicKey(); - } - catch (javax.security.cert.CertificateException e) - { - throw new RuntimeException(e); - } - break; - } - - } - - } - } + publicKey = cert.getPublicKey(); + } /*for (Object content : keyDescriptor.getKeyInfo() ) {

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r688 - in federation/trunk: picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata and 4 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 18:05:50 -0500 (Mon, 31 Jan 2011) New Revision: 688 Added: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SAMLMetadataUtil.java Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataExtractor.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java federation/trunk/picketlink-fed-core/src/test/resources/saml2/metadata/seam-entities.xml Log: deal with obtaining the X509certificate from ds:keyinfo Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataExtractor.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataExtractor.java 2011-01-31 21:18:12 UTC (rev 687) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataExtractor.java 2011-01-31 23:05:50 UTC (rev 688) @@ -22,17 +22,20 @@ package org.picketlink.identity.federation.api.saml.v2.metadata; import java.io.StringWriter; +import java.security.cert.X509Certificate; import java.util.List; - + import javax.xml.stream.XMLStreamWriter; import org.picketlink.identity.federation.core.exceptions.ProcessingException; +import org.picketlink.identity.federation.core.saml.v2.util.SAMLMetadataUtil; import org.picketlink.identity.federation.core.saml.v2.writers.SAMLMetadataWriter; import org.picketlink.identity.federation.core.util.StaxUtil; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EndpointType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IndexedEndpointType; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SPSSODescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SSODescriptorType; @@ -48,6 +51,23 @@ "\n"); /** + * Get the {@link X509Certificate} from the KeyInfo + * @param keyDescriptor + * @return + */ + public static X509Certificate getCertificate( KeyDescriptorType keyDescriptor ) + { + try + { + return SAMLMetadataUtil.getCertificate(keyDescriptor); + } + catch ( Exception e) + { + throw new RuntimeException( e ); + } + } + + /** * Generate a string from the information in the metadata * @param edt * @return Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java 2011-01-31 21:18:12 UTC (rev 687) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java 2011-01-31 23:05:50 UTC (rev 688) @@ -241,7 +241,8 @@ keyDescriptor.setUse( KeyTypes.fromValue(use) ); Element key = StaxParserUtil.getDOMElement(xmlEventReader); - keyDescriptor.setKeyInfo(key); + keyDescriptor.setKeyInfo(key); + idpSSODescriptor.addKeyDescriptor(keyDescriptor); } else throw new RuntimeException( "Unknown " + localPart ); Added: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SAMLMetadataUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SAMLMetadataUtil.java (rev 0) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SAMLMetadataUtil.java 2011-01-31 23:05:50 UTC (rev 688) @@ -0,0 +1,87 @@ +/* + * 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.saml.v2.util; + +import java.security.cert.X509Certificate; + +import org.picketlink.identity.federation.core.exceptions.ConfigurationException; +import org.picketlink.identity.federation.core.exceptions.ProcessingException; +import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; +import org.picketlink.identity.federation.core.util.XMLSignatureUtil; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * Deals with SAML2 Metadata + * @author Anil.Saldhana(a)redhat.com + * @since Jan 31, 2011 + */ +public class SAMLMetadataUtil +{ + /** + * Get the {@link X509Certificate} from the KeyInfo + * @param keyDescriptor + * @return + * @throws ProcessingException + * @throws ConfigurationException + */ + public static X509Certificate getCertificate( KeyDescriptorType keyDescriptor ) throws ConfigurationException, ProcessingException + { + X509Certificate cert = null; + Element keyInfo = keyDescriptor.getKeyInfo(); + if( keyInfo != null ) + { + NodeList x509DataNodes = keyInfo.getElementsByTagName( "X509Data" ); + if( x509DataNodes == null || x509DataNodes.getLength() == 0 ) + { + x509DataNodes = keyInfo.getElementsByTagNameNS( JBossSAMLURIConstants.XMLDSIG_NSURI.get(), "X509Data" ); + } + + if( x509DataNodes == null || x509DataNodes.getLength() == 0 ) + { + x509DataNodes = keyInfo.getElementsByTagName("ds:X509Data" ); + } + + if( x509DataNodes != null && x509DataNodes.getLength() > 0 ) + { + //Choose the first one + Node x509DataNode = x509DataNodes.item(0); + NodeList children = x509DataNode.getChildNodes(); + int len = children != null ? children.getLength() : 0 ; + for( int i = 0 ; i < len ; i++ ) + { + Node nl = children.item(i); + if( nl.getNodeName().contains( "X509Certificate" ) ) + { + Node certNode = nl.getFirstChild(); + String certNodeValue = certNode.getNodeValue(); + cert = XMLSignatureUtil.getX509CertificateFromKeyInfoString( certNodeValue.trim() ); + break; + } + } + } + } + return cert; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java 2011-01-31 21:18:12 UTC (rev 687) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/XMLSignatureUtil.java 2011-01-31 23:05:50 UTC (rev 688) @@ -21,6 +21,7 @@ */ package org.picketlink.identity.federation.core.util; +import java.io.ByteArrayInputStream; import java.io.OutputStream; import java.security.AccessController; import java.security.GeneralSecurityException; @@ -29,14 +30,13 @@ import java.security.PrivateKey; import java.security.PrivilegedAction; import java.security.PublicKey; +import java.security.cert.CertificateFactory; +import java.security.cert.X509Certificate; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import javax.security.cert.X509Certificate; -import javax.xml.bind.JAXBElement; import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; import javax.xml.crypto.MarshalException; import javax.xml.crypto.dsig.CanonicalizationMethod; import javax.xml.crypto.dsig.DigestMethod; @@ -61,9 +61,9 @@ import javax.xml.transform.stream.StreamResult; import org.apache.log4j.Logger; +import org.picketlink.identity.federation.core.exceptions.ProcessingException; import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.picketlink.identity.federation.core.util.JAXBUtil; import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -81,9 +81,6 @@ { private static Logger log = Logger.getLogger(XMLSignatureUtil.class); private static boolean trace = log.isTraceEnabled(); - - private static String pkgName = "org.picketlink.identity.federation.w3.xmldsig"; - private static String schemaLocation = "schema/saml/v2/xmldsig-core-schema.xsd"; private static String canonicalizationMethodType = CanonicalizationMethod.EXCLUSIVE_WITH_COMMENTS; @@ -348,4 +345,36 @@ Transformer trans = tf.newTransformer(); trans.transform(DocumentUtil.getXMLSource(signedDocument), new StreamResult(os)); } + + /** + * Given the X509Certificate in the keyinfo element, get a {@link X509Certificate} + * @param certificateString + * @return + * @throws ProcessingException + */ + public static X509Certificate getX509CertificateFromKeyInfoString( String certificateString ) throws ProcessingException + { + X509Certificate cert = null; + StringBuilder builder = new StringBuilder(); + builder.append( "-----BEGIN CERTIFICATE-----\n" ).append( certificateString ).append( "\n-----END CERTIFICATE-----" ); + + String derFormattedString = builder.toString(); + + try + { + CertificateFactory cf = CertificateFactory.getInstance("X.509"); + ByteArrayInputStream bais = new ByteArrayInputStream( derFormattedString.getBytes()); + + while ( bais.available() > 0) + { + cert = (X509Certificate) cf.generateCertificate(bais); + } + } + catch (java.security.cert.CertificateException e) + { + throw new ProcessingException( e ); + } + return cert; + } + } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java 2011-01-31 21:18:12 UTC (rev 687) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java 2011-01-31 23:05:50 UTC (rev 688) @@ -24,12 +24,17 @@ import static org.junit.Assert.assertNotNull; import java.io.InputStream; +import java.security.cert.X509Certificate; import junit.framework.Assert; import org.junit.Test; import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; +import org.picketlink.identity.federation.core.saml.v2.util.SAMLMetadataUtil; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; /** * Unit test the SAML metadata parsing @@ -50,5 +55,10 @@ EntitiesDescriptorType entities = (EntitiesDescriptorType) parser.parse(is); Assert.assertNotNull(entities); Assert.assertEquals( 2, entities.getEntityDescriptor().size() ); + EntityDescriptorType entity = (EntityDescriptorType) entities.getEntityDescriptor().get(0); + IDPSSODescriptorType idp = entity.getChoiceType().get(0).getDescriptors().get(0).getIdpDescriptor(); + KeyDescriptorType keyDescriptor = idp.getKeyDescriptor().get(0); + X509Certificate cert = SAMLMetadataUtil.getCertificate(keyDescriptor); + Assert.assertNotNull(cert); } } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/test/resources/saml2/metadata/seam-entities.xml =================================================================== --- federation/trunk/picketlink-fed-core/src/test/resources/saml2/metadata/seam-entities.xml 2011-01-31 21:18:12 UTC (rev 687) +++ federation/trunk/picketlink-fed-core/src/test/resources/saml2/metadata/seam-entities.xml 2011-01-31 23:05:50 UTC (rev 688) @@ -9,17 +9,18 @@ <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> <ds:X509Data> <ds:X509Certificate> - MIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh - bGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09w - ZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQsw - CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAK - BgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0B - AQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+ - RkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNY - Js0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/U - QzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDA - cGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC - /FfwWigmrW0Y0Q==</ds:X509Certificate> +MIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh +bGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09w +ZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQsw +CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAK +BgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0B +AQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+ +RkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNY +Js0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/U +QzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDA +cGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC +/FfwWigmrW0Y0Q== + </ds:X509Certificate> </ds:X509Data> </ds:KeyInfo> </KeyDescriptor>

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r687 - picketlink-seam/trunk/seam-sp.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 16:18:12 -0500 (Mon, 31 Jan 2011) New Revision: 687 Modified: picketlink-seam/trunk/seam-sp/pom.xml Log: war excludes Modified: picketlink-seam/trunk/seam-sp/pom.xml =================================================================== --- picketlink-seam/trunk/seam-sp/pom.xml 2011-01-31 21:17:52 UTC (rev 686) +++ picketlink-seam/trunk/seam-sp/pom.xml 2011-01-31 21:18:12 UTC (rev 687) @@ -3,7 +3,7 @@ <parent> <groupId>org.picketlink</groupId> <artifactId>picketlink-seam-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> + <version>2.0.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>seam-sp</artifactId> @@ -76,6 +76,7 @@ <version>2.0.2</version> <configuration> <warName>seam-sp</warName> + <warSourceExcludes>WEB-INF/lib/picketlink**.jar,WEB-INF/lib/javax**.jar,WEB-INF/lib/servlet**.jar</warSourceExcludes> </configuration> </plugin> </plugins>

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r686 - picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 16:17:52 -0500 (Mon, 31 Jan 2011) New Revision: 686 Modified: picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF/jboss-web.xml Log: comment out UCL Modified: picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF/jboss-web.xml 2011-01-31 21:17:23 UTC (rev 685) +++ picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF/jboss-web.xml 2011-01-31 21:17:52 UTC (rev 686) @@ -4,8 +4,10 @@ "-//JBoss//DTD Web Application 2.3V2//EN" "http://www.jboss.org/j2ee/dtd/jboss-web_3_2.dtd"> <jboss-web> + <context-root>seam-sp</context-root> </jboss-web>

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r685 - picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 16:17:23 -0500 (Mon, 31 Jan 2011) New Revision: 685 Modified: picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF/components.xml Log: remove spurious character Modified: picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF/components.xml =================================================================== --- picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF/components.xml 2011-01-31 17:08:47 UTC (rev 684) +++ picketlink-seam/trunk/seam-sp/src/main/webapp/WEB-INF/components.xml 2011-01-31 21:17:23 UTC (rev 685) @@ -3,11 +3,11 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://jboss.com/products/seam/security" xmlns:core="http://jboss.com/products/seam/core" xsi:schemaLocation="http://jboss.com/products/seam/components http://jboss.com/products/seam/components-2.1.xsd - http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd + http://jboss.com/products/seam/core http://jboss.com/products/seam/core-2.1.xsd http://jboss.com/products/seam/security http://jboss.com/products/seam/security-2.1.xsd"> <core:init debug="false" /> <import>org.picketlink.identity.seam.federation</import> <security:identity authenticate-method="#{authenticator.authenticate}" />  <component name="urlToRedirectToAfterLogin" class="java.lang.String" /> -</components> \ No newline at end of file +</components>

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r684 - picketlink-seam/trunk/seam-sp.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 12:08:47 -0500 (Mon, 31 Jan 2011) New Revision: 684 Modified: picketlink-seam/trunk/seam-sp/pom.xml Log: formatting. remove tabs. no change Modified: picketlink-seam/trunk/seam-sp/pom.xml =================================================================== --- picketlink-seam/trunk/seam-sp/pom.xml 2011-01-31 16:55:42 UTC (rev 683) +++ picketlink-seam/trunk/seam-sp/pom.xml 2011-01-31 17:08:47 UTC (rev 684) @@ -1,83 +1,83 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <parent> - <groupId>org.picketlink</groupId> - <artifactId>picketlink-seam-parent</artifactId> - <version>2.0.0-SNAPSHOT</version> - </parent> - <modelVersion>4.0.0</modelVersion> - <artifactId>seam-sp</artifactId> - <packaging>war</packaging> - <name>Seam Service Provider</name> - <dependencies> - <dependency> - <groupId>org.jboss</groupId> - <artifactId>picketlink-seam</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-api</artifactId> - </exclusion> - <exclusion> - <groupId>sun-jaxb</groupId> - <artifactId>jaxb-impl</artifactId> - </exclusion> - <exclusion> - <groupId>stax</groupId> - <artifactId>stax-api</artifactId> - </exclusion> - <exclusion> - <groupId>apache-log4j</groupId> - <artifactId>log4j</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam</artifactId> - <version>2.1.2</version> - <type>ejb</type> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-ui</artifactId> - <version>2.1.2</version> - </dependency> - <dependency> - <groupId>org.jboss.seam</groupId> - <artifactId>jboss-seam-debug</artifactId> - <version>2.1.2</version> - </dependency> - <dependency> - <groupId>javax.faces</groupId> - <artifactId>jsf-api</artifactId> - <version>1.2</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>org.jboss.javaee</groupId> - <artifactId>jboss-javaee</artifactId> - <version>5.0.0.CR1</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>1.0</version> - <scope>provided</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <version>2.0.2</version> - <configuration> - <warName>seam-sp</warName> - </configuration> - </plugin> - </plugins> - </build> + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + <parent> + <groupId>org.picketlink</groupId> + <artifactId>picketlink-seam-parent</artifactId> + <version>2.0.0-SNAPSHOT</version> + </parent> + <modelVersion>4.0.0</modelVersion> + <artifactId>seam-sp</artifactId> + <packaging>war</packaging> + <name>Seam Service Provider</name> + <dependencies> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>picketlink-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>sun-jaxb</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>stax</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + <exclusion> + <groupId>apache-log4j</groupId> + <artifactId>log4j</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>2.1.2</version> + <type>ejb</type> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-ui</artifactId> + <version>2.1.2</version> + </dependency> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam-debug</artifactId> + <version>2.1.2</version> + </dependency> + <dependency> + <groupId>javax.faces</groupId> + <artifactId>jsf-api</artifactId> + <version>1.2</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.javaee</groupId> + <artifactId>jboss-javaee</artifactId> + <version>5.0.0.CR1</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>1.0</version> + <scope>provided</scope> + </dependency> + </dependencies> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-war-plugin</artifactId> + <version>2.0.2</version> + <configuration> + <warName>seam-sp</warName> + </configuration> + </plugin> + </plugins> + </build> </project>

13 years, 11 months

1
0
0 / 0

Picketlink SVN: r683 - in federation/trunk/picketlink-fed-core/src: main/java/org/picketlink/identity/federation/core/parsers/saml/metadata and 3 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 11:55:42 -0500 (Mon, 31 Jan 2011) New Revision: 683 Added: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java federation/trunk/picketlink-fed-core/src/test/resources/saml2/metadata/seam-entities.xml Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java Log: additional metadata parsing Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLParser.java 2011-01-31 16:16:32 UTC (rev 682) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLParser.java 2011-01-31 16:55:42 UTC (rev 683) @@ -29,6 +29,7 @@ import org.picketlink.identity.federation.core.exceptions.ParsingException; import org.picketlink.identity.federation.core.parsers.AbstractParser; import org.picketlink.identity.federation.core.parsers.ParserNamespaceSupport; +import org.picketlink.identity.federation.core.parsers.saml.metadata.SAMLEntitiesDescriptorParser; import org.picketlink.identity.federation.core.parsers.saml.metadata.SAMLEntityDescriptorParser; import org.picketlink.identity.federation.core.parsers.saml.xacml.SAMLXACMLRequestParser; import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil; @@ -111,6 +112,11 @@ SAMLEntityDescriptorParser entityDescriptorParser = new SAMLEntityDescriptorParser(); return entityDescriptorParser.parse( xmlEventReader ); } + else if( JBossSAMLConstants.ENTITIES_DESCRIPTOR.get().equals( localPart )) + { + SAMLEntitiesDescriptorParser entityDescriptorParser = new SAMLEntitiesDescriptorParser(); + return entityDescriptorParser.parse( xmlEventReader ); + } else if( JBossSAMLURIConstants.ASSERTION_NSURI.get().equals(nsURI) ) { SAMLAssertionParser assertionParser = new SAMLAssertionParser(); Added: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java (rev 0) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java 2011-01-31 16:55:42 UTC (rev 683) @@ -0,0 +1,85 @@ +/* + * 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.saml.metadata; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.EndElement; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; + +import org.picketlink.identity.federation.core.exceptions.ParsingException; +import org.picketlink.identity.federation.core.parsers.ParserNamespaceSupport; +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.saml.v2.constants.JBossSAMLURIConstants; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType; + +/** + * Parse the SAML Entities Descriptor + * @author Anil.Saldhana(a)redhat.com + * @since Jan 31, 2011 + */ +public class SAMLEntitiesDescriptorParser implements ParserNamespaceSupport +{ + private String EDT = JBossSAMLConstants.ENTITIES_DESCRIPTOR.get(); + + public Object parse( XMLEventReader xmlEventReader ) throws ParsingException + { + StartElement startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(startElement, EDT ); + + EntitiesDescriptorType entitiesDescriptorType = new EntitiesDescriptorType(); + + //Get the Child Elements + while( xmlEventReader.hasNext() ) + { + XMLEvent xmlEvent = StaxParserUtil.peek(xmlEventReader); + if( xmlEvent instanceof EndElement ) + { + StaxParserUtil.validate( (EndElement)xmlEvent , EDT ); + StaxParserUtil.getNextEndElement(xmlEventReader); + break; + } + startElement = (StartElement) xmlEvent; + String localPart = startElement.getName().getLocalPart(); + + if( JBossSAMLConstants.ENTITY_DESCRIPTOR.get().equals( localPart )) + { + SAMLEntityDescriptorParser entityParser = new SAMLEntityDescriptorParser(); + entitiesDescriptorType.addEntityDescriptor( entityParser.parse(xmlEventReader)); + } + else + throw new RuntimeException( "Unknown " + localPart ); + } + return entitiesDescriptorType; + } + + public boolean supports( QName qname ) + { + String nsURI = qname.getNamespaceURI(); + String localPart = qname.getLocalPart(); + + return nsURI.equals( JBossSAMLURIConstants.ASSERTION_NSURI.get() ) + && localPart.equals( EDT ); + } +} \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java 2011-01-31 16:16:32 UTC (rev 682) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java 2011-01-31 16:55:42 UTC (rev 683) @@ -46,6 +46,7 @@ import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IndexedEndpointType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyTypes; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedNameType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedURIType; import org.picketlink.identity.federation.newmodel.saml.v2.metadata.OrganizationType; @@ -173,6 +174,16 @@ idpSSODescriptor.addArtifactResolutionService(endpoint); } + else if( JBossSAMLConstants.ASSERTION_ID_REQUEST_SERVICE.get().equals( localPart )) + { + startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + EndpointType endpoint = getEndpointType(startElement); + + EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate( endElement, JBossSAMLConstants.ASSERTION_ID_REQUEST_SERVICE.get() ); + + idpSSODescriptor.addAssertionIDRequestService( endpoint ); + } else if( JBossSAMLConstants.SINGLE_LOGOUT_SERVICE.get().equals( localPart )) { startElement = StaxParserUtil.getNextStartElement(xmlEventReader); @@ -193,6 +204,26 @@ idpSSODescriptor.addSingleSignOnService( endpoint ); } + else if( JBossSAMLConstants.MANAGE_NAMEID_SERVICE.get().equals( localPart )) + { + startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + EndpointType endpoint = getEndpointType(startElement); + + EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate( endElement, JBossSAMLConstants.MANAGE_NAMEID_SERVICE.get() ); + + idpSSODescriptor.addManageNameIDService( endpoint ); + } + else if( JBossSAMLConstants.NAMEID_MAPPING_SERVICE.get().equals( localPart )) + { + startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + EndpointType endpoint = getEndpointType(startElement); + + EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate( endElement, JBossSAMLConstants.NAMEID_MAPPING_SERVICE.get() ); + + idpSSODescriptor.addNameIDMappingService( endpoint ); + } else if (JBossSAMLConstants.NAMEID_FORMAT.get().equalsIgnoreCase( localPart )) { startElement = StaxParserUtil.getNextStartElement(xmlEventReader); @@ -203,7 +234,16 @@ AttributeType attribute = SAMLParserUtil.parseAttribute(xmlEventReader); idpSSODescriptor.addAttribute(attribute); } - else + else if (JBossSAMLConstants.KEY_DESCRIPTOR.get().equalsIgnoreCase( localPart )) + { + KeyDescriptorType keyDescriptor = new KeyDescriptorType(); + String use = StaxParserUtil.getAttributeValue(startElement, "use" ); + keyDescriptor.setUse( KeyTypes.fromValue(use) ); + + Element key = StaxParserUtil.getDOMElement(xmlEventReader); + keyDescriptor.setKeyInfo(key); + } + else throw new RuntimeException( "Unknown " + localPart ); } return idpSSODescriptor; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java 2011-01-31 16:16:32 UTC (rev 682) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java 2011-01-31 16:55:42 UTC (rev 683) @@ -33,6 +33,7 @@ ARTIFACT_RESOLUTION_SERVICE( "ArtifactResolutionService" ), ASSERTION( "Assertion" ), ASSERTION_CONSUMER_SERVICE_URL( "AssertionConsumerServiceURL" ), + ASSERTION_ID_REQUEST_SERVICE( "AssertionIDRequestService" ), ATTRIBUTE( "Attribute" ), ATTRIBUTE_AUTHORITY_DESCRIPTOR( "AttributeAuthorityDescriptor" ), ATTRIBUTE_SERVICE( "AttributeService" ), @@ -56,6 +57,7 @@ ENCRYPTED_ASSERTION( "EncryptedAssertion" ), ENTITY_ID( "entityID" ), ENTITY_DESCRIPTOR( "EntityDescriptor" ), + ENTITIES_DESCRIPTOR( "EntitiesDescriptor" ), FORMAT( "Format" ), FRIENDLY_NAME( "FriendlyName" ), ID( "ID" ), @@ -73,12 +75,14 @@ LOCATION( "Location" ), LOGOUT_REQUEST( "LogoutRequest" ), LOGOUT_RESPONSE( "LogoutResponse" ), + MANAGE_NAMEID_SERVICE( "ManageNameIDService" ), METADATA_MIME("application/samlmetadata+xml"), METHOD( "Method" ), NAME( "Name" ), NAME_FORMAT( "NameFormat" ), NAMEID( "NameID" ), NAMEID_FORMAT( "NameIDFormat" ), + NAMEID_MAPPING_SERVICE( "NameIDMappingService" ), NAMEID_POLICY( "NameIDPolicy" ), NAME_QUALIFIER( "NameQualifier" ), NOT_BEFORE( "NotBefore" ), Added: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java (rev 0) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java 2011-01-31 16:55:42 UTC (rev 683) @@ -0,0 +1,54 @@ +/* + * 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.saml.v2.metadata; + +import static org.junit.Assert.assertNotNull; + +import java.io.InputStream; + +import junit.framework.Assert; + +import org.junit.Test; +import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; +import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType; + +/** + * Unit test the SAML metadata parsing + * @author Anil.Saldhana(a)redhat.com + * @since Jan 31, 2011 + */ +public class SAMLMetadataParsingUnitTestCase +{ + @Test + public void testEntitiesDescriptor() throws Exception + { + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); + InputStream is = + tcl.getResourceAsStream("saml2/metadata/seam-entities.xml"); + assertNotNull("Inputstream not null", is); + + SAMLParser parser = new SAMLParser(); + EntitiesDescriptorType entities = (EntitiesDescriptorType) parser.parse(is); + Assert.assertNotNull(entities); + Assert.assertEquals( 2, entities.getEntityDescriptor().size() ); + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-core/src/test/resources/saml2/metadata/seam-entities.xml =================================================================== --- federation/trunk/picketlink-fed-core/src/test/resources/saml2/metadata/seam-entities.xml (rev 0) +++ federation/trunk/picketlink-fed-core/src/test/resources/saml2/metadata/seam-entities.xml 2011-01-31 16:55:42 UTC (rev 683) @@ -0,0 +1,154 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="urn:oasis:names:tc:SAML:2.0:metadata http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"> + <EntityDescriptor entityID="http://localhost:8888/opensso"> + <IDPSSODescriptor WantAuthnRequestsSigned="false" + protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <KeyDescriptor use="signing"> + <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:X509Data> + <ds:X509Certificate> + MIICQDCCAakCBEeNB0swDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCVVMxEzARBgNVBAgTCkNh + bGlmb3JuaWExFDASBgNVBAcTC1NhbnRhIENsYXJhMQwwCgYDVQQKEwNTdW4xEDAOBgNVBAsTB09w + ZW5TU08xDTALBgNVBAMTBHRlc3QwHhcNMDgwMTE1MTkxOTM5WhcNMTgwMTEyMTkxOTM5WjBnMQsw + CQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEUMBIGA1UEBxMLU2FudGEgQ2xhcmExDDAK + BgNVBAoTA1N1bjEQMA4GA1UECxMHT3BlblNTTzENMAsGA1UEAxMEdGVzdDCBnzANBgkqhkiG9w0B + AQEFAAOBjQAwgYkCgYEArSQc/U75GB2AtKhbGS5piiLkmJzqEsp64rDxbMJ+xDrye0EN/q1U5Of+ + RkDsaN/igkAvV1cuXEgTL6RlafFPcUX7QxDhZBhsYF9pbwtMzi4A4su9hnxIhURebGEmxKW9qJNY + Js0Vo5+IgjxuEWnjnnVgHTs1+mq5QYTA7E6ZyL8CAwEAATANBgkqhkiG9w0BAQQFAAOBgQB3Pw/U + QzPKTPTYi9upbFXlrAKMwtFf2OW4yvGWWvlcwcNSZJmTJ8ARvVYOMEVNbsT4OFcfu2/PeYoAdiDA + cGy/F2Zuj8XJJpuQRSE6PtQqBuDEHjjmOQJ0rV/r8mO1ZCtHRhpZ5zYRjhRC9eCbjx9VrFax0JDC + /FfwWigmrW0Y0Q==</ds:X509Certificate> + </ds:X509Data> + </ds:KeyInfo> + </KeyDescriptor> + <ArtifactResolutionService index="0" + isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="http://localhost:8888/opensso/ArtifactResolver/metaAlias/idp" /> + <SingleLogoutService + Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + Location="http://localhost:8888/opensso/IDPSloRedirect/metaAlias/idp" + ResponseLocation="http://localhost:8888/opensso/IDPSloRedirect/metaAlias/idp" /> + <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + Location="http://localhost:8888/opensso/IDPSloPOST/metaAlias/idp" + ResponseLocation="http://localhost:8888/opensso/IDPSloPOST/metaAlias/idp" /> + <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="http://localhost:8888/opensso/IDPSloSoap/metaAlias/idp" /> + <ManageNameIDService + Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + Location="http://localhost:8888/opensso/IDPMniRedirect/metaAlias/idp" + ResponseLocation="http://localhost:8888/opensso/IDPMniRedirect/metaAlias/idp" /> + <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + Location="http://localhost:8888/opensso/IDPMniPOST/metaAlias/idp" + ResponseLocation="http://localhost:8888/opensso/IDPMniPOST/metaAlias/idp" /> + <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="http://localhost:8888/opensso/IDPMniSoap/metaAlias/idp" /> + <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat> + <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> + <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat> + <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat> + <NameIDFormat> + urn:oasis:names:tc:SAML:1.1:nameid-format:WindowsDomainQualifiedName</NameIDFormat> + <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:kerberos</NameIDFormat> + <NameIDFormat> + urn:oasis:names:tc:SAML:1.1:nameid-format:X509SubjectName</NameIDFormat> + <SingleSignOnService + Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + Location="http://localhost:8888/opensso/SSORedirect/metaAlias/idp" /> + <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + Location="http://localhost:8888/opensso/SSOPOST/metaAlias/idp" /> + <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="http://localhost:8888/opensso/SSOSoap/metaAlias/idp" /> + <NameIDMappingService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="http://localhost:8888/opensso/NIMSoap/metaAlias/idp" /> + <AssertionIDRequestService + Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="http://localhost:8888/opensso/AIDReqSoap/IDPRole/metaAlias/idp" /> + <AssertionIDRequestService Binding="urn:oasis:names:tc:SAML:2.0:bindings:URI" + Location="http://localhost:8888/opensso/AIDReqUri/IDPRole/metaAlias/idp" /> + </IDPSSODescriptor> + </EntityDescriptor> + <EntityDescriptor entityID="http://idp.ssocircle.com" + xmlns="urn:oasis:names:tc:SAML:2.0:metadata"> + <IDPSSODescriptor WantAuthnRequestsSigned="false" + protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol"> + <KeyDescriptor use="signing"> + <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:X509Data> + <ds:X509Certificate> + MIIB8TCCAVqgAwIBAgIFAIxwZnIwDQYJKoZIhvcNAQEEBQAwLjELMAkGA1UEBhMCREUxEjAQBgNV + BAoTCVNTT0NpcmNsZTELMAkGA1UEAxMCQ0EwHhcNMDkwMjIyMTUwNDI0WhcNMTEwNTIyMTUwNDI0 + WjBLMQswCQYDVQQGEwJERTESMBAGA1UEChMJU1NPQ2lyY2xlMQwwCgYDVQQLEwNpZHAxGjAYBgNV + BAMTEWlkcC5zc29jaXJjbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbzDRkudC/ + aC2gMqRVVaLdPJJEwpFB4o71fR5bnNd2ocnnNzJ/W9CoCargzKx+EJ4Nm3vWmX/IZRCFvrvy9C78 + fP1cmt6Sa091K9luaMAyWn7oC8h/YBXH7rB42tdvWLY4Kl9VJy6UCclvasyrfKx+SR4KU6zCsM62 + 2Kvp5wW67QIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAGyaydfJHDkm77C39gq9bBb7OqK8OXEUTbIM + p8PDJZzIf9QkpkE7gHGcWctRKi7fNdONulc5kn2K2nbvCGrbWsWQvr/DA0bjkBrK8OeWpRhLe7fl + +JUgsErMcDIzRTmjNpZzUZp+WESRHV1j3SIcfY4tJM2uMt4Sc/afVnl5P6wL</ds:X509Certificate> + </ds:X509Data> + </ds:KeyInfo> + + </KeyDescriptor> + <KeyDescriptor use="encryption"> + <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:X509Data> + <ds:X509Certificate> + MIIB8TCCAVqgAwIBAgIFAIxwZnIwDQYJKoZIhvcNAQEEBQAwLjELMAkGA1UEBhMCREUxEjAQBgNV + BAoTCVNTT0NpcmNsZTELMAkGA1UEAxMCQ0EwHhcNMDkwMjIyMTUwNDI0WhcNMTEwNTIyMTUwNDI0 + WjBLMQswCQYDVQQGEwJERTESMBAGA1UEChMJU1NPQ2lyY2xlMQwwCgYDVQQLEwNpZHAxGjAYBgNV + BAMTEWlkcC5zc29jaXJjbGUuY29tMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCbzDRkudC/ + aC2gMqRVVaLdPJJEwpFB4o71fR5bnNd2ocnnNzJ/W9CoCargzKx+EJ4Nm3vWmX/IZRCFvrvy9C78 + fP1cmt6Sa091K9luaMAyWn7oC8h/YBXH7rB42tdvWLY4Kl9VJy6UCclvasyrfKx+SR4KU6zCsM62 + 2Kvp5wW67QIDAQABMA0GCSqGSIb3DQEBBAUAA4GBAGyaydfJHDkm77C39gq9bBb7OqK8OXEUTbIM + p8PDJZzIf9QkpkE7gHGcWctRKi7fNdONulc5kn2K2nbvCGrbWsWQvr/DA0bjkBrK8OeWpRhLe7fl + +JUgsErMcDIzRTmjNpZzUZp+WESRHV1j3SIcfY4tJM2uMt4Sc/afVnl5P6wL</ds:X509Certificate> + </ds:X509Data> + </ds:KeyInfo> + <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"> + + <xenc:KeySize xmlns:xenc="http://www.w3.org/2001/04/xmlenc#">128</xenc:KeySize> + </EncryptionMethod> + </KeyDescriptor> + <ArtifactResolutionService index="0" + isDefault="true" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="https://idp.ssocircle.com:443/sso/ArtifactResolver/metaAlias/ssocircle" /> + <SingleLogoutService + Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + Location="https://idp.ssocircle.com:443/sso/IDPSloRedirect/metaAlias/ssocircle" + ResponseLocation="https://idp.ssocircle.com:443/sso/IDPSloRedirect/metaAlias/ssocircle" /> +  + <ManageNameIDService + Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + Location="https://idp.ssocircle.com:443/sso/IDPMniRedirect/metaAlias/ssocircle" + ResponseLocation="https://idp.ssocircle.com:443/sso/IDPMniRedirect/metaAlias/ssocircle" /> + <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + Location="https://idp.ssocircle.com:443/sso/IDPMniPOSTmetaAlias/ssocircle" + ResponseLocation="https://idp.ssocircle.com:443/sso/IDPMniPOST/metaAlias/ssocircle" /> + + <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="https://idp.ssocircle.com:443/sso/IDPMniSoap/metaAlias/ssocircle" /> + <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat> + <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat> + <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat> + <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat> + <SingleSignOnService + Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" + Location="https://idp.ssocircle.com:443/sso/SSORedirect/metaAlias/ssocircle" /> + <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" + Location="https://idp.ssocircle.com:443/sso/SSOPOST/metaAlias/ssocircle" /> + + <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="https://idp.ssocircle.com:443/sso/SSOSoap/metaAlias/ssocircle" /> + <NameIDMappingService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" + Location="https://idp.ssocircle.com:443/sso/NIMSoap/metaAlias/ssocircle" /> + </IDPSSODescriptor> + </EntityDescriptor> + +</EntitiesDescriptor> \ No newline at end of file

13 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits January 2011