[jboss-cvs] Picketlink SVN: r1031 - in federation/trunk/picketlink-fed-core/src: main/java/org/picketlink/identity/federation/core/saml/v1 and 2 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-06-24 13:59:14 -0400 (Fri, 24 Jun 2011)
New Revision: 1031

Added:
   federation/trunk/picketlink-fed-core/src/test/resources/parser/saml1/saml1-request-assertionartifact.xml
Modified:
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAML11RequestParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v1/SAML11Constants.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAML11RequestParserTestCase.java
Log:
more SAML11 parsing

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAML11RequestParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAML11RequestParser.java	2011-06-24 17:48:39 UTC (rev 1030)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAML11RequestParser.java	2011-06-24 17:59:14 UTC (rev 1031)
@@ -94,6 +94,11 @@
             SAML11AuthenticationQueryType query = SAML11ParserUtil.parseSAML11AuthenticationQuery(xmlEventReader);
             request.setQuery(query);
          }
+         else if (SAML11Constants.ASSERTION_ARTIFACT.equals(elementName))
+         {
+            startElement = StaxParserUtil.getNextStartElement(xmlEventReader);
+            request.addAssertionArtifact(StaxParserUtil.getElementText(xmlEventReader));
+         }
          else if (elementName.equals(JBossSAMLConstants.SIGNATURE.get()))
          {
             request.setSignature(StaxParserUtil.getDOMElement(xmlEventReader));

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v1/SAML11Constants.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v1/SAML11Constants.java	2011-06-24 17:48:39 UTC (rev 1030)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v1/SAML11Constants.java	2011-06-24 17:59:14 UTC (rev 1031)
@@ -34,6 +34,8 @@
 
    String ASSERTION_11_NSURI = "urn:oasis:names:tc:SAML:1.0:assertion";
 
+   String ASSERTION_ARTIFACT = "AssertionArtifact";
+
    String ATTRIBUTE_QUERY = "AttributeQuery";
 
    String ATTRIBUTE_NAME = "AttributeName";

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAML11RequestParserTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAML11RequestParserTestCase.java	2011-06-24 17:48:39 UTC (rev 1030)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAML11RequestParserTestCase.java	2011-06-24 17:59:14 UTC (rev 1031)
@@ -90,4 +90,22 @@
       SAML11SubjectType.SAML11SubjectTypeChoice choice = subject.getChoice();
       assertEquals("testID", choice.getNameID().getValue());
    }
+
+   @Test
+   public void testSAML11RequestWithAssertionArtifact() throws Exception
+   {
+      ClassLoader tcl = Thread.currentThread().getContextClassLoader();
+      InputStream configStream = tcl.getResourceAsStream("parser/saml1/saml1-request-assertionartifact.xml");
+
+      SAMLParser parser = new SAMLParser();
+      SAML11RequestType request = (SAML11RequestType) parser.parse(configStream);
+      assertNotNull(request);
+
+      assertEquals(1, request.getMajorVersion());
+      assertEquals(1, request.getMinorVersion());
+      assertEquals("rid", request.getID());
+      assertEquals(XMLTimeUtil.parse("2002-06-19T17:03:44.022Z"), request.getIssueInstant());
+
+      assertEquals("abcd", request.getAssertionArtifact().get(0));
+   }
 }
\ No newline at end of file

Added: federation/trunk/picketlink-fed-core/src/test/resources/parser/saml1/saml1-request-assertionartifact.xml
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/resources/parser/saml1/saml1-request-assertionartifact.xml	                        (rev 0)
+++ federation/trunk/picketlink-fed-core/src/test/resources/parser/saml1/saml1-request-assertionartifact.xml	2011-06-24 17:59:14 UTC (rev 1031)
@@ -0,0 +1,6 @@
+<samlp:Request xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol"
+	MajorVersion="1" MinorVersion="1" 
+	RequestID="rid"
+	IssueInstant="2002-06-19T17:03:44.022Z">
+	<samlp:AssertionArtifact>abcd</samlp:AssertionArtifact>
+</samlp:Request>
\ No newline at end of file