July 2011 - picketlink-commits - Jboss List Archives

Picketlink SVN: r1117 - federation/trunk/picketlink-fed-api.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-25 10:48:50 -0400 (Mon, 25 Jul 2011) New Revision: 1117 Modified: federation/trunk/picketlink-fed-api/pom.xml Log: PLINK-48: mvn deps Modified: federation/trunk/picketlink-fed-api/pom.xml =================================================================== --- federation/trunk/picketlink-fed-api/pom.xml 2011-07-25 14:35:12 UTC (rev 1116) +++ federation/trunk/picketlink-fed-api/pom.xml 2011-07-25 14:48:50 UTC (rev 1117) @@ -62,15 +62,10 @@ <artifactId>jbossxacml</artifactId> </dependency> <dependency> - <groupId>org.openid4java</groupId> - <artifactId>openid4java-nodeps</artifactId> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> </dependency> <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.0.1</version> - </dependency> - <dependency> <groupId>org.apache</groupId> <artifactId>xmlsec</artifactId> </dependency> @@ -85,7 +80,7 @@ <version>2.7.1.patch01-brew</version> <scope>test</scope> </dependency> - <dependency> + <dependency> <groupId>apache-xalan</groupId> <artifactId>serializer</artifactId> <version>2.7.1.patch01-brew</version>

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1116 - federation/trunk/picketlink-fed-core.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-25 10:35:12 -0400 (Mon, 25 Jul 2011) New Revision: 1116 Modified: federation/trunk/picketlink-fed-core/pom.xml Log: PLINK-48: mvn deps Modified: federation/trunk/picketlink-fed-core/pom.xml =================================================================== --- federation/trunk/picketlink-fed-core/pom.xml 2011-07-25 14:32:06 UTC (rev 1115) +++ federation/trunk/picketlink-fed-core/pom.xml 2011-07-25 14:35:12 UTC (rev 1116) @@ -125,16 +125,6 @@ <version>2.7.1.patch01-brew</version> <scope>test</scope> </dependency> - <dependency> - <groupId>org.openid4java</groupId> - <artifactId>openid4java-nodeps</artifactId> - </dependency> - <dependency> - <groupId>commons-httpclient</groupId> - <artifactId>commons-httpclient</artifactId> - <version>3.1</version> - <scope>test</scope> - </dependency> </dependencies> <reporting>

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1115 - in federation/trunk: picketlink-fed-core and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-25 10:32:06 -0400 (Mon, 25 Jul 2011) New Revision: 1115 Modified: federation/trunk/parent/pom.xml federation/trunk/picketlink-fed-core/pom.xml Log: PLINK-48: mvn deps Modified: federation/trunk/parent/pom.xml =================================================================== --- federation/trunk/parent/pom.xml 2011-07-23 23:02:41 UTC (rev 1114) +++ federation/trunk/parent/pom.xml 2011-07-25 14:32:06 UTC (rev 1115) @@ -126,7 +126,7 @@ <optional>true</optional> </dependency> <dependency> - <groupId>apache-logging</groupId> + <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> <version>1.0.3</version> <optional>true</optional> Modified: federation/trunk/picketlink-fed-core/pom.xml =================================================================== --- federation/trunk/picketlink-fed-core/pom.xml 2011-07-23 23:02:41 UTC (rev 1114) +++ federation/trunk/picketlink-fed-core/pom.xml 2011-07-25 14:32:06 UTC (rev 1115) @@ -61,7 +61,7 @@ <artifactId>xmlsec</artifactId> </dependency> <dependency> - <groupId>apache-logging</groupId> + <groupId>commons-logging</groupId> <artifactId>commons-logging-api</artifactId> </dependency> <dependency>

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1114 - integration-tests/trunk/parent.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-23 19:02:41 -0400 (Sat, 23 Jul 2011) New Revision: 1114 Modified: integration-tests/trunk/parent/pom.xml Log: PLINK-47: fix log4j groupid Modified: integration-tests/trunk/parent/pom.xml =================================================================== --- integration-tests/trunk/parent/pom.xml 2011-07-23 23:01:36 UTC (rev 1113) +++ integration-tests/trunk/parent/pom.xml 2011-07-23 23:02:41 UTC (rev 1114) @@ -114,7 +114,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> <optional>true</optional>

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1113 - in federation/trunk: picketlink-fed-core and 1 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-23 19:01:36 -0400 (Sat, 23 Jul 2011) New Revision: 1113 Modified: federation/trunk/parent/pom.xml federation/trunk/picketlink-fed-core/pom.xml federation/trunk/picketlink-web/pom.xml Log: PLINK-47: fix log4j groupid Modified: federation/trunk/parent/pom.xml =================================================================== --- federation/trunk/parent/pom.xml 2011-07-23 04:45:11 UTC (rev 1112) +++ federation/trunk/parent/pom.xml 2011-07-23 23:01:36 UTC (rev 1113) @@ -114,7 +114,7 @@ <scope>test</scope> </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> <version>1.2.14</version> <optional>true</optional> Modified: federation/trunk/picketlink-fed-core/pom.xml =================================================================== --- federation/trunk/picketlink-fed-core/pom.xml 2011-07-23 04:45:11 UTC (rev 1112) +++ federation/trunk/picketlink-fed-core/pom.xml 2011-07-23 23:01:36 UTC (rev 1113) @@ -53,7 +53,7 @@ <version>${project.version}</version> </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> <dependency> Modified: federation/trunk/picketlink-web/pom.xml =================================================================== --- federation/trunk/picketlink-web/pom.xml 2011-07-23 04:45:11 UTC (rev 1112) +++ federation/trunk/picketlink-web/pom.xml 2011-07-23 23:01:36 UTC (rev 1113) @@ -138,7 +138,7 @@ <artifactId>jbossxacml</artifactId> </dependency> <dependency> - <groupId>apache-log4j</groupId> + <groupId>log4j</groupId> <artifactId>log4j</artifactId> </dependency> <dependency>

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1112 - integration-tests/trunk/picketlink-trust-jbas51-native.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-23 00:45:11 -0400 (Sat, 23 Jul 2011) New Revision: 1112 Modified: integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml Log: fix version Modified: integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml =================================================================== --- integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml 2011-07-23 02:35:20 UTC (rev 1111) +++ integration-tests/trunk/picketlink-trust-jbas51-native/pom.xml 2011-07-23 04:45:11 UTC (rev 1112) @@ -98,13 +98,13 @@ <dependency> <groupId>org.picketlink</groupId> <artifactId>picketlink-fed</artifactId> - <version>${version}</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency> <groupId>org.picketlink</groupId> <artifactId>picketlink-trust-jbossws</artifactId> - <version>${version}</version> + <version>${project.version}</version> <scope>test</scope> </dependency> <dependency>

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1111 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-22 22:35:20 -0400 (Fri, 22 Jul 2011) New Revision: 1111 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/TransformerUtil.java Log: PLFED-212: TransformerUtil/StaxUtil changes with xmlns Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/TransformerUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/TransformerUtil.java 2011-07-22 18:46:26 UTC (rev 1110) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/TransformerUtil.java 2011-07-23 02:35:20 UTC (rev 1111) @@ -358,7 +358,10 @@ log.trace("Set Attribute Namespace=" + name.getNamespaceURI() + "::Qual=:" + qual + "::Value=" + namespace.getNamespaceURI()); } - el.setAttributeNS(name.getNamespaceURI(), qual, namespace.getNamespaceURI()); + if (qual != null && qual.startsWith("xmlns")) + { + el.setAttributeNS(name.getNamespaceURI(), qual, namespace.getNamespaceURI()); + } } XMLEvent nextEvent = StaxParserUtil.peek(xmlEventReader); @@ -410,7 +413,7 @@ if (prefix != null && prefix != "") qual = (localPart != null && localPart != "") ? prefix + ":" + localPart : prefix; - if (qual.equals("xmlns")) + if (qual != null && qual.equals("xmlns")) return namespace.getNamespaceURI(); } return null;

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1110 - in federation/trunk/picketlink-fed-core/src: main/java/org/picketlink/identity/federation/core/util and 2 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-22 14:46:26 -0400 (Fri, 22 Jul 2011) New Revision: 1110 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/DocumentUtil.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/StaxUtil.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/TransformerUtil.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java Log: PLFED-212: TransformerUtil/StaxUtil changes with xmlns Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/DocumentUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/DocumentUtil.java 2011-07-22 17:17:21 UTC (rev 1109) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/DocumentUtil.java 2011-07-22 18:46:26 UTC (rev 1110) @@ -50,6 +50,7 @@ import org.picketlink.identity.federation.core.exceptions.ProcessingException; import org.picketlink.identity.federation.core.util.TransformerUtil; import org.w3c.dom.DOMConfiguration; +import org.w3c.dom.DOMException; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -109,6 +110,31 @@ } /** + * Create a document with the root element of the form <someElement xmlns="customNamespace" + * @param baseNamespace + * @return + * @throws ProcessingException + */ + public static Document createDocumentWithBaseNamespace(String baseNamespace, String localPart) + throws ProcessingException + { + try + { + DocumentBuilderFactory factory = getDocumentBuilderFactory(); + DocumentBuilder builder = factory.newDocumentBuilder(); + return builder.getDOMImplementation().createDocument(baseNamespace, localPart, null); + } + catch (DOMException e) + { + throw new ProcessingException(e); + } + catch (ParserConfigurationException e) + { + throw new ProcessingException(e); + } + } + + /** * Parse a document from the string * @param docString * @return Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/StaxUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/StaxUtil.java 2011-07-22 17:17:21 UTC (rev 1109) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/StaxUtil.java 2011-07-22 18:46:26 UTC (rev 1110) @@ -373,6 +373,10 @@ // writeNameSpace(writer, domElementPrefix, domElementNS ); registeredNSStack.get().push(domElementNS); } + else if (domElementPrefix == "" && domElementNS != null) + { + writeNameSpace(writer, "xmlns", domElementNS); + } // Deal with Attributes NamedNodeMap attrs = domElement.getAttributes(); @@ -385,12 +389,8 @@ if (attributePrefix == null || attributePrefix.length() == 0) { - if ("xmlns".equals(attribLocalName)) + if (!("xmlns".equals(attribLocalName))) { - writeDefaultNameSpace(writer, attribValue); - } - else - { writeAttribute(writer, attribLocalName, attribValue); } } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/TransformerUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/TransformerUtil.java 2011-07-22 17:17:21 UTC (rev 1109) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/TransformerUtil.java 2011-07-22 18:46:26 UTC (rev 1110) @@ -54,7 +54,9 @@ import org.apache.log4j.Logger; import org.picketlink.identity.federation.core.exceptions.ConfigurationException; import org.picketlink.identity.federation.core.exceptions.ParsingException; +import org.picketlink.identity.federation.core.exceptions.ProcessingException; import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil; +import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -226,7 +228,7 @@ } } } - catch (ParsingException e) + catch (Exception e) { throw new TransformerException(e); } @@ -293,7 +295,7 @@ } private Element handleStartElement(XMLEventReader xmlEventReader, StartElement startElement, CustomHolder holder) - throws ParsingException + throws ParsingException, ProcessingException { Document doc = holder.doc; @@ -303,8 +305,15 @@ String localPart = elementName.getLocalPart(); String qual = prefix != null && prefix != "" ? prefix + ":" + localPart : localPart; + Element el = doc.createElementNS(ns, qual); + String containsBaseNamespace = containsBaseNamespace(startElement); + if (StringUtil.isNotNull(containsBaseNamespace)) + { + el = DocumentUtil.createDocumentWithBaseNamespace(containsBaseNamespace, localPart).getDocumentElement(); + el = (Element) doc.importNode(el, true); + } if (StringUtil.isNotNull(prefix)) { el.setPrefix(prefix); @@ -342,9 +351,12 @@ if (prefix != null && prefix != "") qual = (localPart != null && localPart != "") ? prefix + ":" + localPart : prefix; + if (qual.equals("xmlns")) + continue; if (trace) { - log.trace("Set Attribute Namespace=" + name.getNamespaceURI() + ":" + qual); + log.trace("Set Attribute Namespace=" + name.getNamespaceURI() + "::Qual=:" + qual + "::Value=" + + namespace.getNamespaceURI()); } el.setAttributeNS(name.getNamespaceURI(), qual, namespace.getNamespaceURI()); } @@ -383,6 +395,27 @@ return el; } + @SuppressWarnings("unchecked") + private String containsBaseNamespace(StartElement startElement) + { + String localPart, prefix, qual = null; + + Iterator<Namespace> namespaces = startElement.getNamespaces(); + while (namespaces != null && namespaces.hasNext()) + { + Namespace namespace = namespaces.next(); + QName name = namespace.getName(); + localPart = name.getLocalPart(); + prefix = name.getPrefix(); + if (prefix != null && prefix != "") + qual = (localPart != null && localPart != "") ? prefix + ":" + localPart : prefix; + + if (qual.equals("xmlns")) + return namespace.getNamespaceURI(); + } + return null; + } + private class CustomHolder { public Document doc; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2011-07-22 17:17:21 UTC (rev 1109) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2011-07-22 18:46:26 UTC (rev 1110) @@ -33,6 +33,7 @@ import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants; import org.picketlink.identity.federation.core.saml.v2.factories.SAMLAssertionFactory; import org.picketlink.identity.federation.core.saml.v2.util.AssertionUtil; +import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.saml.v2.util.StatementUtil; import org.picketlink.identity.federation.core.sts.AbstractSecurityTokenProvider; import org.picketlink.identity.federation.core.wstrust.SecurityToken; @@ -67,6 +68,8 @@ { protected static Logger logger = Logger.getLogger(SAML20TokenProvider.class); + protected boolean trace = logger.isTraceEnabled(); + private SAML20TokenAttributeProvider attributeProvider; /* @@ -340,6 +343,10 @@ { try { + if (trace) + { + logger.trace("Assertion Element=" + DocumentUtil.getNodeAsString(assertionElement)); + } assertion = SAMLUtil.fromElement(assertionElement); } catch (Exception e) Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java 2011-07-22 17:17:21 UTC (rev 1109) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java 2011-07-22 18:46:26 UTC (rev 1110) @@ -25,6 +25,7 @@ import java.io.ByteArrayOutputStream; import java.security.GeneralSecurityException; +import org.apache.log4j.Logger; import org.picketlink.identity.federation.core.exceptions.ConfigurationException; import org.picketlink.identity.federation.core.exceptions.ParsingException; import org.picketlink.identity.federation.core.exceptions.ProcessingException; @@ -48,7 +49,10 @@ */ public class SAMLUtil { + protected static Logger log = Logger.getLogger(SAMLUtil.class); + protected static boolean trace = log.isTraceEnabled(); + public static final String SAML11_BEARER_URI = "urn:oasis:names:tc:SAML:1.0:cm:bearer"; public static final String SAML11_HOLDER_OF_KEY_URI = "urn:oasis:names:tc:SAML:1.0:cm:holder-of-key"; @@ -89,6 +93,11 @@ ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray()); Document document = DocumentUtil.getDocument(bis); + if (trace) + { + log.trace("Written Assertion=" + DocumentUtil.asString(document)); + } + return document.getDocumentElement(); } Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java 2011-07-22 17:17:21 UTC (rev 1109) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java 2011-07-22 18:46:26 UTC (rev 1110) @@ -292,5 +292,13 @@ else throw new RuntimeException("Unknown statement type:" + statement); } + + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + //Lets do the writing + SAMLResponseWriter writer = new SAMLResponseWriter(StaxUtil.getXMLStreamWriter(baos)); + writer.write(response); + String writtenString = new String(baos.toByteArray()); + System.out.println(writtenString); + validateSchema(writtenString); } } \ No newline at end of file

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1109 - federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-22 13:17:21 -0400 (Fri, 22 Jul 2011) New Revision: 1109 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java Log: PLFED-213: the saml writers should write prefix for Issuer Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java 2011-07-22 04:36:49 UTC (rev 1108) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java 2011-07-22 17:17:21 UTC (rev 1109) @@ -90,7 +90,7 @@ NameIDType issuer = assertion.getIssuer(); if (issuer != null) - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); Element sig = assertion.getSignature(); if (sig != null) Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java 2011-07-22 04:36:49 UTC (rev 1108) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java 2011-07-22 17:17:21 UTC (rev 1109) @@ -138,7 +138,7 @@ NameIDType issuer = request.getIssuer(); if (issuer != null) { - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); } Element sig = request.getSignature(); @@ -186,7 +186,7 @@ StaxUtil.writeAttribute(writer, JBossSAMLConstants.CONSENT.get(), consent); NameIDType issuer = logOutRequest.getIssuer(); - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); NameIDType nameID = logOutRequest.getNameID(); if (nameID != null) @@ -254,7 +254,7 @@ NameIDType issuer = request.getIssuer(); if (issuer != null) { - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); } Element sig = request.getSignature(); if (sig != null) @@ -296,7 +296,7 @@ NameIDType issuer = request.getIssuer(); if (issuer != null) { - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); } Element sig = request.getSignature(); if (sig != null) @@ -355,7 +355,7 @@ NameIDType issuer = xacmlQuery.getIssuer(); if (issuer != null) { - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); } RequestType xacmlRequest = xacmlQuery.getRequest(); Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java 2011-07-22 04:36:49 UTC (rev 1108) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java 2011-07-22 17:17:21 UTC (rev 1109) @@ -74,14 +74,14 @@ StaxUtil.writeNameSpace(writer, PROTOCOL_PREFIX, PROTOCOL_NSURI.get()); StaxUtil.writeNameSpace(writer, ASSERTION_PREFIX, ASSERTION_NSURI.get()); - StaxUtil.writeDefaultNameSpace(writer, ASSERTION_NSURI.get()); + //StaxUtil.writeDefaultNameSpace(writer, ASSERTION_NSURI.get()); writeBaseAttributes(response); NameIDType issuer = response.getIssuer(); if (issuer != null) { - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); } Element sig = response.getSignature(); @@ -130,7 +130,7 @@ NameIDType issuer = response.getIssuer(); if (issuer != null) { - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); } Element sig = response.getSignature(); @@ -186,7 +186,7 @@ writeBaseAttributes(response); NameIDType issuer = response.getIssuer(); - write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get())); + write(issuer, new QName(ASSERTION_NSURI.get(), JBossSAMLConstants.ISSUER.get(), ASSERTION_PREFIX)); StatusType status = response.getStatus(); write(status);

13 years, 5 months

1
0
0 / 0

Picketlink SVN: r1108 - in federation/trunk: picketlink-fed-api/src/test/resources/saml/v2 and 5 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-07-22 00:36:49 -0400 (Fri, 22 Jul 2011) New Revision: 1108 Added: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2ResponseUnitTestCase.java federation/trunk/picketlink-fed-api/src/test/resources/saml/v2/response/ federation/trunk/picketlink-fed-api/src/test/resources/saml/v2/response/saml2-response-adfs-claims.xml federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2/saml2-response-adfs-claims.xml Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.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/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java Log: PLFED-211: verify that we are parsing the adfs claims successfully Added: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2ResponseUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2ResponseUnitTestCase.java (rev 0) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2ResponseUnitTestCase.java 2011-07-22 04:36:49 UTC (rev 1108) @@ -0,0 +1,48 @@ +/* + * 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.api.saml.v2; + +import static org.junit.Assert.assertNotNull; + +import java.io.InputStream; + +import org.junit.Test; +import org.picketlink.identity.federation.api.saml.v2.response.SAML2Response; +import org.picketlink.identity.federation.saml.v2.SAML2Object; + +/** + * @author Anil.Saldhana(a)redhat.com + * @since Jul 21, 2011 + */ +public class SAML2ResponseUnitTestCase +{ + @Test + public void parseADFSClaims() throws Exception + { + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); + InputStream configStream = tcl.getResourceAsStream("saml/v2/response/saml2-response-adfs-claims.xml"); + SAML2Response samlResponse = new SAML2Response(); + SAML2Object samlObject = samlResponse.getSAML2ObjectFromStream(configStream); + assertNotNull(samlObject); + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-api/src/test/resources/saml/v2/response/saml2-response-adfs-claims.xml =================================================================== --- federation/trunk/picketlink-fed-api/src/test/resources/saml/v2/response/saml2-response-adfs-claims.xml (rev 0) +++ federation/trunk/picketlink-fed-api/src/test/resources/saml/v2/response/saml2-response-adfs-claims.xml 2011-07-22 04:36:49 UTC (rev 1108) @@ -0,0 +1,66 @@ +<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" + Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" + Destination="https://something" + ID="_48db7f2f-a2d2-4e45-94bc-bb680a47d073" InResponseTo="CPSID_47811a63-caf3-4e4e-84cb-fa872cafff05" + IssueInstant="2011-07-19T21:23:42.077Z" Version="2.0"> + <Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion">urn:adfs:services:trust + </Issuer> + <samlp:Status> + <samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" /> + </samlp:Status> + <Assertion xmlns="urn:oasis:names:tc:SAML:2.0:assertion" ID="_334b1e3d-8783-4ea6-b5a9-0dd6317999d2" + IssueInstant="2011-07-19T21:23:42.077Z" Version="2.0"> + <Issuer>urn:adfs:services:trust</Issuer> + <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:SignedInfo> + <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /> + <ds:SignatureMethod + Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /> + <ds:Reference URI="#_334b1e3d-8783-4ea6-b5a9-0dd6317999d2"> + <ds:Transforms> + <ds:Transform + Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /> + <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /> + </ds:Transforms> + <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /> + <ds:DigestValue>6UvO3uhEz2ErtcrijZ4WfvhrPGEoP+fdmiMOg0mOeMQ= + </ds:DigestValue> + </ds:Reference> + </ds:SignedInfo> + <ds:SignatureValue>JGR4KOgUKksRKGn0c2OvyVhCIbOX5rafDiaXezTyGPsQJnVhbYUa6xDnDEb1kMXefL3IxAWL2o1PgYlnrrGfuP3QgAeF1B+w9JlO4/H7DTeumMWz7ZvpsmUMARrcFBJjsOXgIZxDU3UY1yzn6IMZonQRz2CO6kVo2q3zemlb8TAssZttj71Wl/fceRDlkV/+suQChaaXeDWVW2T+ITnt2JSJY2GL6PpT8K+hHAyfS0PgC9o3RedAwIZT73ZiCQugZYxBgjQbZXT72x6arh8phWVtENCr6JEcXFUrAGnYzOn3/48M6w9MQ2GhHB4XqgWAQrrpcG6nw47q+Z4zn+9Wig== + </ds:SignatureValue> + <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> + <ds:X509Data> + <ds:X509Certificate>MIIC7jCCAdagAwIBAgIQXp/JPRE5SaJCiQcYG8wqBzANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyhBREZTIFNpZ25pbmcgLSBDUFMtRVhULUZTLmV4dC5zdy5yaW0ubmV0MB4XDTExMDUwODIyMDQ1OVoXDTEyMDUwNzIyMDQ1OVowMzExMC8GA1UEAxMoQURGUyBTaWduaW5nIC0gQ1BTLUVYVC1GUy5leHQuc3cucmltLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANN57C+4eyqeB44BiUB4xmyTcUMhJR55yjnJWWse8KllXJYnFzZzJPvVC1SPlACz2EzuATT5gWFhHyhqolgqAR5a0pke1wXVN4aHKOkUzmDhdd2JfOGFoJRIV9wgkX1bbA2FS+kJMl0ewdgxKdjOlKM+LXNmFteqRYZq2+0ss7vtZJ8/ls9t6cRNd2qI+7zJvPqvs1Beaiia9P45oXn7YPK4TJKIR3aq4vmI1q2cSFK1a1b76YDvzYYAASCpeGJ+20lh3j81/5D408MrjaDb1pMXWhK01okcypQeNwaGoEQwlFm8M5eQCRgnJbHzASE8NMdV+2NW2vn+GNbp327gOk0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAkYq2FmFTkP9NRXJn/J3XU+9Idv4h76vNdIT4hvfnzhlKGqVZANgIVgXk6aIzSv22x3vxkjSvMDQkhINHLEcKzabWdpAtwUUiqBUykwg+MvzolLkuG6yNT59KrUPbteqxQrhK5O+VCsDIaxjWjvSW0O7ACuPgQFPcnDZDcVXJWOCy6sUmnMSuD1kMmCJ6ubu72IrlnPKWp1obfVl1EV1GOWwx6LSn/WyZ0+ca4bkOLhMku5v+7myQLMWxS5sqb9578ZG51qrfJRde3wCOGAfRBCUa/8H/6xvkp7T6j0Fx4uH! j8XBn8wjL8epgWSyH381owGepLRJ+evRIjtbYVEAs7w== + </ds:X509Certificate> + </ds:X509Data> + </KeyInfo> + </ds:Signature> + <Subject> + <SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"> + <SubjectConfirmationData + InResponseTo="CPSID_47811a63-caf3-4e4e-84cb-fa872cafff05" + NotOnOrAfter="2011-07-19T21:28:42.077Z" Recipient="https://somebody" /> + </SubjectConfirmation> + </Subject> + <Conditions NotBefore="2011-07-19T21:23:42.077Z" + NotOnOrAfter="2011-07-19T22:23:42.077Z"> + <AudienceRestriction> + <Audience>https://somebody</Audience> + </AudienceRestriction> + </Conditions> + <AttributeStatement> + <Attribute Name="http://schemas.xmlsoap.org/claims/EmailAddress"> + <AttributeValue>admin(a)test.net</AttributeValue> + </Attribute> + <Attribute Name="http://schemas.xmlsoap.org/claims/PUID"> + <AttributeValue>1004567899</AttributeValue> + </Attribute> + </AttributeStatement> + <AuthnStatement AuthnInstant="2011-07-19T21:10:57.923Z"> + <AuthnContext> + <AuthnContextClassRef>urn:federation:authentication:windows</AuthnContextClassRef> + </AuthnContext> + </AuthnStatement> + </Assertion> +</samlp:Response> \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java 2011-07-21 15:21:22 UTC (rev 1107) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java 2011-07-22 04:36:49 UTC (rev 1108) @@ -45,6 +45,7 @@ import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextClassRefType; import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextDeclRefType; import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType; +import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType.AuthnContextTypeSequence; import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType; import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; import org.picketlink.identity.federation.saml.v2.assertion.SubjectLocalityType; @@ -310,7 +311,10 @@ String text = StaxParserUtil.getElementText(xmlEventReader); AuthnContextClassRefType aAuthnContextClassRefType = new AuthnContextClassRefType(URI.create(text)); - authnContextType.addURIType(aAuthnContextClassRefType); + AuthnContextTypeSequence authnContextSequence = authnContextType.new AuthnContextTypeSequence(); + authnContextSequence.setClassRef(aAuthnContextClassRefType); + + authnContextType.setSequence(authnContextSequence); EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); StaxParserUtil.validate(endElement, JBossSAMLConstants.AUTHN_CONTEXT.get()); } 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 2011-07-21 15:21:22 UTC (rev 1107) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLURIConstants.java 2011-07-22 04:36:49 UTC (rev 1108) @@ -36,13 +36,36 @@ AC_UNSPECIFIED("urn:oasis:names:tc:SAML:2.0:ac:classes:unspecified"), 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"), + + + BEARER( "urn:oasis:names:tc:SAML:2.0:cm:bearer" ), + CLAIMS_EMAIL_ADDRESS_2005( "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress"), + CLAIMS_EMAIL_ADDRESS( "http://schemas.xmlsoap.org/claims/EmailAddress"), + CLAIMS_GIVEN_NAME( "http://schemas.xmlsoap.org/ws/2005/05/identity/claims/givenname"), + CLAIMS_NAME("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/name"), + CLAIMS_USER_PRINCIPAL_NAME_2005("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn"), + CLAIMS_USER_PRINCIPAL_NAME("http://schemas.xmlsoap.org/claims/UPN"), + CLAIMS_COMMON_NAME("http://schemas.xmlsoap.org/claims/CommonName"), + CLAIMS_GROUP("http://schemas.xmlsoap.org/claims/Group"), + CLAIMS_ROLE("http://schemas.microsoft.com/ws/2008/06/identity/claims/role"), + CLAIMS_SURNAME("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/surname"), + CLAIMS_PRIVATE_ID("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/privatepersonaliden..."), + CLAIMS_NAME_IDENTIFIER("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/nameidentifier"), + CLAIMS_AUTHENTICATION_METHOD("http://schemas.microsoft.com/ws/2008/06/identity/claims/authenticationmethod"), + CLAIMS_DENY_ONLY_GROUP_SID("http://schemas.xmlsoap.org/ws/2005/05/identity/claims/denyonlysid"), + CLAIMS_DENY_ONLY_PRIMARY_SID("http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarysid"), + CLAIMS_DENY_ONLY_PRIMARY_GROUP_SID("http://schemas.microsoft.com/ws/2008/06/identity/claims/denyonlyprimarygr..."), + CLAIMS_GROUP_SID("http://schemas.microsoft.com/ws/2008/06/identity/claims/groupsid"), + CLAIMS_PRIMARY_GROUP_SID("http://schemas.microsoft.com/ws/2008/06/identity/claims/primarygroupsid"), + CLAIMS_PRIMARY_SID("http://schemas.microsoft.com/ws/2008/06/identity/claims/primarysid"), + CLAIMS_WINDOWS_ACCOUNT_NAME("http://schemas.microsoft.com/ws/2008/06/identity/claims/windowsaccountname"), + CLAIMS_PUID("http://schemas.xmlsoap.org/claims/PUID"), + + HOLDER_OF_KEY( "urn:oasis:names:tc:SAML:2.0:cm:holder-of-key" ), METADATA_NSURI( "urn:oasis:names:tc:SAML:2.0:metadata" ), Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java 2011-07-21 15:21:22 UTC (rev 1107) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java 2011-07-22 04:36:49 UTC (rev 1108) @@ -29,18 +29,22 @@ import java.io.InputStream; import java.util.Iterator; import java.util.List; +import java.util.Set; import org.junit.Test; import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; +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.saml.v2.util.XMLTimeUtil; import org.picketlink.identity.federation.core.saml.v2.writers.SAMLResponseWriter; import org.picketlink.identity.federation.core.util.StaxUtil; import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType; import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextDeclRefType; import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType; +import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType.AuthnContextTypeSequence; import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType; import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType; @@ -244,4 +248,49 @@ System.out.println(writtenString); validateSchema(writtenString); } + + @Test + public void testSAMLResponseADFSClaims() throws Exception + { + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); + InputStream configStream = tcl.getResourceAsStream("parser/saml2/saml2-response-adfs-claims.xml"); + + SAMLParser parser = new SAMLParser(); + ResponseType response = (ResponseType) parser.parse(configStream); + assertNotNull("ResponseType is not null", response); + + List<RTChoiceType> choices = response.getAssertions(); + assertEquals(1, choices.size()); + RTChoiceType rtc = choices.get(0); + AssertionType assertion = rtc.getAssertion(); + Set<StatementAbstractType> statements = assertion.getStatements(); + for (StatementAbstractType statement : statements) + { + if (statement instanceof AuthnStatementType) + { + AuthnStatementType authnStat = (AuthnStatementType) statement; + AuthnContextType authnContext = authnStat.getAuthnContext(); + + AuthnContextTypeSequence sequence = authnContext.getSequence(); + assertNotNull(sequence); + assertEquals("urn:federation:authentication:windows", sequence.getClassRef().getValue().toString()); + } + else if (statement instanceof AttributeStatementType) + { + AttributeStatementType attribStat = (AttributeStatementType) statement; + List<ASTChoiceType> attributes = attribStat.getAttributes(); + assertEquals(2, attributes.size()); + for (ASTChoiceType astChoice : attributes) + { + AttributeType attribute = astChoice.getAttribute(); + String attributeName = attribute.getName(); + if (!(JBossSAMLURIConstants.CLAIMS_EMAIL_ADDRESS.get().equals(attributeName) || JBossSAMLURIConstants.CLAIMS_PUID + .get().equals(attributeName))) + throw new RuntimeException("Unknown attr name:" + attributeName); + } + } + else + throw new RuntimeException("Unknown statement type:" + statement); + } + } } \ No newline at end of file Added: federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2/saml2-response-adfs-claims.xml =================================================================== --- federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2/saml2-response-adfs-claims.xml (rev 0) +++ federation/trunk/picketlink-fed-core/src/test/resources/parser/saml2/saml2-response-adfs-claims.xml 2011-07-22 04:36:49 UTC (rev 1108) @@ -0,0 +1,66 @@ +<samlp:Response xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol" + Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" + Destination="https://something" + ID="_48db7f2f-a2d2-4e45-94bc-bb680a47d073" InResponseTo="CPSID_47811a63-caf3-4e4e-84cb-fa872cafff05" + IssueInstant="2011-07-19T21:23:42.077Z" Version="2.0"> + <Issuer xmlns="urn:oasis:names:tc:SAML:2.0:assertion">urn:adfs:services:trust + </Issuer> + <samlp:Status> + <samlp:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" /> + </samlp:Status> + <Assertion xmlns="urn:oasis:names:tc:SAML:2.0:assertion" ID="_334b1e3d-8783-4ea6-b5a9-0dd6317999d2" + IssueInstant="2011-07-19T21:23:42.077Z" Version="2.0"> + <Issuer>urn:adfs:services:trust</Issuer> + <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"> + <ds:SignedInfo> + <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /> + <ds:SignatureMethod + Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" /> + <ds:Reference URI="#_334b1e3d-8783-4ea6-b5a9-0dd6317999d2"> + <ds:Transforms> + <ds:Transform + Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /> + <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /> + </ds:Transforms> + <ds:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256" /> + <ds:DigestValue>6UvO3uhEz2ErtcrijZ4WfvhrPGEoP+fdmiMOg0mOeMQ= + </ds:DigestValue> + </ds:Reference> + </ds:SignedInfo> + <ds:SignatureValue>JGR4KOgUKksRKGn0c2OvyVhCIbOX5rafDiaXezTyGPsQJnVhbYUa6xDnDEb1kMXefL3IxAWL2o1PgYlnrrGfuP3QgAeF1B+w9JlO4/H7DTeumMWz7ZvpsmUMARrcFBJjsOXgIZxDU3UY1yzn6IMZonQRz2CO6kVo2q3zemlb8TAssZttj71Wl/fceRDlkV/+suQChaaXeDWVW2T+ITnt2JSJY2GL6PpT8K+hHAyfS0PgC9o3RedAwIZT73ZiCQugZYxBgjQbZXT72x6arh8phWVtENCr6JEcXFUrAGnYzOn3/48M6w9MQ2GhHB4XqgWAQrrpcG6nw47q+Z4zn+9Wig== + </ds:SignatureValue> + <KeyInfo xmlns="http://www.w3.org/2000/09/xmldsig#"> + <ds:X509Data> + <ds:X509Certificate>MIIC7jCCAdagAwIBAgIQXp/JPRE5SaJCiQcYG8wqBzANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDEyhBREZTIFNpZ25pbmcgLSBDUFMtRVhULUZTLmV4dC5zdy5yaW0ubmV0MB4XDTExMDUwODIyMDQ1OVoXDTEyMDUwNzIyMDQ1OVowMzExMC8GA1UEAxMoQURGUyBTaWduaW5nIC0gQ1BTLUVYVC1GUy5leHQuc3cucmltLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANN57C+4eyqeB44BiUB4xmyTcUMhJR55yjnJWWse8KllXJYnFzZzJPvVC1SPlACz2EzuATT5gWFhHyhqolgqAR5a0pke1wXVN4aHKOkUzmDhdd2JfOGFoJRIV9wgkX1bbA2FS+kJMl0ewdgxKdjOlKM+LXNmFteqRYZq2+0ss7vtZJ8/ls9t6cRNd2qI+7zJvPqvs1Beaiia9P45oXn7YPK4TJKIR3aq4vmI1q2cSFK1a1b76YDvzYYAASCpeGJ+20lh3j81/5D408MrjaDb1pMXWhK01okcypQeNwaGoEQwlFm8M5eQCRgnJbHzASE8NMdV+2NW2vn+GNbp327gOk0CAwEAATANBgkqhkiG9w0BAQsFAAOCAQEAkYq2FmFTkP9NRXJn/J3XU+9Idv4h76vNdIT4hvfnzhlKGqVZANgIVgXk6aIzSv22x3vxkjSvMDQkhINHLEcKzabWdpAtwUUiqBUykwg+MvzolLkuG6yNT59KrUPbteqxQrhK5O+VCsDIaxjWjvSW0O7ACuPgQFPcnDZDcVXJWOCy6sUmnMSuD1kMmCJ6ubu72IrlnPKWp1obfVl1EV1GOWwx6LSn/WyZ0+ca4bkOLhMku5v+7myQLMWxS5sqb9578ZG51qrfJRde3wCOGAfRBCUa/8H/6xvkp7T6j0Fx4uH! j8XBn8wjL8epgWSyH381owGepLRJ+evRIjtbYVEAs7w== + </ds:X509Certificate> + </ds:X509Data> + </KeyInfo> + </ds:Signature> + <Subject> + <SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"> + <SubjectConfirmationData + InResponseTo="CPSID_47811a63-caf3-4e4e-84cb-fa872cafff05" + NotOnOrAfter="2011-07-19T21:28:42.077Z" Recipient="https://somebody" /> + </SubjectConfirmation> + </Subject> + <Conditions NotBefore="2011-07-19T21:23:42.077Z" + NotOnOrAfter="2011-07-19T22:23:42.077Z"> + <AudienceRestriction> + <Audience>https://somebody</Audience> + </AudienceRestriction> + </Conditions> + <AttributeStatement> + <Attribute Name="http://schemas.xmlsoap.org/claims/EmailAddress"> + <AttributeValue>admin(a)test.net</AttributeValue> + </Attribute> + <Attribute Name="http://schemas.xmlsoap.org/claims/PUID"> + <AttributeValue>1004567899</AttributeValue> + </Attribute> + </AttributeStatement> + <AuthnStatement AuthnInstant="2011-07-19T21:10:57.923Z"> + <AuthnContext> + <AuthnContextClassRef>urn:federation:authentication:windows</AuthnContextClassRef> + </AuthnContext> + </AuthnStatement> + </Assertion> +</samlp:Response> \ No newline at end of file

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits July 2011