Author: anil.saldhana(a)jboss.com Date: 2010-10-14 11:10:08 -0400 (Thu, 14 Oct 2010) New Revision: 467 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java Log: PLFED-110: saml parsing Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java 2010-10-14 15:05:47 UTC (rev 466) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java 2010-10-14 15:10:08 UTC (rev 467) @@ -96,13 +96,13 @@ if( tag.equals( JBossSAMLConstants.ASSERTION.get() )) { StartElement nextElement = StaxParserUtil.getNextStartElement(xmlEventReader); - Attribute idAttribute = nextElement.getAttributeByName( new QName( "", "ID" ) ); + Attribute idAttribute = nextElement.getAttributeByName( new QName( "", JBossSAMLConstants.ID.get() ) ); assertion.setID( StaxParserUtil.getAttributeValue( idAttribute )); - Attribute versionAttribute = nextElement.getAttributeByName( new QName( "", "Version" )); + Attribute versionAttribute = nextElement.getAttributeByName( new QName( "", JBossSAMLConstants.VERSION.get() )); assertion.setVersion( StaxParserUtil.getAttributeValue(versionAttribute) ); - Attribute issueInstantAttribute = nextElement.getAttributeByName( new QName( "", "IssueInstant" )); + Attribute issueInstantAttribute = nextElement.getAttributeByName( new QName( "", JBossSAMLConstants.ISSUE_INSTANT.get() )); if( issueInstantAttribute != null ) { assertion.setIssueInstant( dtf.newXMLGregorianCalendar( StaxParserUtil.getAttributeValue(issueInstantAttribute ))); @@ -143,8 +143,7 @@ SAMLConditionsParser conditionsParser = new SAMLConditionsParser(); ConditionsType conditions = (ConditionsType) conditionsParser.parse(xmlEventReader); - assertion.setConditions( conditions ); - + assertion.setConditions( conditions ); } } return assertion; @@ -166,7 +165,7 @@ if( endElement == null ) return; - if( StaxParserUtil.getEndElementName(endElement).equals( "Signature" ) ) + if( StaxParserUtil.matches( endElement , JBossSAMLConstants.SIGNATURE.get() ) ) return; } } 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 2010-10-14 15:05:47 UTC (rev 466) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java 2010-10-14 15:10:08 UTC (rev 467) @@ -32,6 +32,8 @@ AUDIENCE( "Audience" ), AUDIENCE_RESTRICTION( "AudienceRestriction" ), CONDITIONS( "Conditions" ), + ID( "ID" ), + ISSUE_INSTANT( "IssueInstant" ), ISSUER( "Issuer" ), LANG_EN("en"), METADATA_MIME("application/samlmetadata+xml"), @@ -45,6 +47,7 @@ SIGNATURE_SHA1_WITH_RSA("http://www.w3.org/2000/09/xmldsig#rsa-sha1&..., SUBJECT( "Subject" ), SUBJECT_CONFIRMATION( "SubjectConfirmation" ), + VERSION( "Version" ), VERSION_2_0("2.0"), HTTP_POST_BINDING("urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST");