[picketlink-commits] Picketlink SVN: r774 - in federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core: parsers/saml and 4 other directories.

Author: anil.saldhana(a)jboss.com Date: 2011-02-23 14:57:08 -0500 (Wed, 23 Feb 2011) New Revision: 774 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/exceptions/ParsingException.java 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/SAMLAuthNRequestParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java 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/SAMLResponseParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 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/SAMLEntityDescriptorParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/xacml/SAMLXACMLRequestParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/STSConfigParser.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java Log: PLFED-44: parsing errors should include Location Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/exceptions/ParsingException.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/exceptions/ParsingException.java 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/exceptions/ParsingException.java 2011-02-23 19:57:08 UTC (rev 774) @@ -23,6 +23,9 @@ import java.security.GeneralSecurityException; +import javax.xml.stream.Location; +import javax.xml.stream.XMLStreamException; + /** * General Exception indicating parsing exception * @author Anil.Saldhana(a)redhat.com @@ -31,6 +34,8 @@ public class ParsingException extends GeneralSecurityException { private static final long serialVersionUID = 1L; + + private Location location; public ParsingException() { @@ -50,5 +55,22 @@ public ParsingException(Throwable cause) { super(cause); - } -} + } + + public ParsingException( XMLStreamException xmle ) + { + super( xmle ); + location = xmle.getLocation(); + } + + public Location getLocation() + { + return location; + } + + @Override + public String toString() + { + return "ParsingException [location=" + location + "]" + super.toString(); + } +} \ No newline at end of file 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 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -193,7 +193,7 @@ else throw new RuntimeException( "Unknown xsi:type=" + xsiTypeValue ); } - else throw new RuntimeException( "SAMLAssertionParser:: unknown: " + tag ); + else throw new RuntimeException( "SAMLAssertionParser:: unknown: " + tag + "::location=" + peekedElement.getLocation() ); } return assertion; } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAuthNRequestParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAuthNRequestParser.java 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAuthNRequestParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -92,7 +92,7 @@ { continue; } - else throw new RuntimeException( "Unknown Element:" + elementName ); + else throw new RuntimeException( "Unknown Element:" + elementName + "::location=" + startElement.getLocation() ); } return authnRequest; } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -119,7 +119,7 @@ AudienceRestrictionType audienceRestriction = getAudienceRestriction(xmlEventReader); conditions.addCondition( audienceRestriction ); } - else throw new RuntimeException( "Unknown tag:" + tag ); + else throw new RuntimeException( "Unknown tag:" + tag + "::location=" + xmlEvent.getLocation()); } return conditions; } 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-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -122,7 +122,7 @@ SAMLAssertionParser assertionParser = new SAMLAssertionParser(); return assertionParser.parse( xmlEventReader ); } - else throw new RuntimeException( "Unknown Tag:" + elementName ); + else throw new RuntimeException( "Unknown Tag:" + elementName + "::location=" + startElement.getLocation() ); } else { Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLResponseParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLResponseParser.java 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLResponseParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -92,7 +92,7 @@ response.addAssertion( new RTChoiceType( new EncryptedAssertionType(encryptedAssertion ) )); } else - throw new RuntimeException( "Unknown tag=" + elementName ); + throw new RuntimeException( "Unknown tag=" + elementName + "::location=" + startElement.getLocation() ); } return response; Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -123,7 +123,7 @@ StaxParserUtil.matches(endElement, JBossSAMLConstants.SUBJECT_CONFIRMATION.get()); } else - throw new RuntimeException("Unknown tag:" + tag); + throw new RuntimeException("Unknown tag:" + tag + "::location=" + peekedElement.getLocation() ); } return subject; } Modified: 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 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -110,7 +110,7 @@ entitiesDescriptorType.setSignature( StaxParserUtil.getDOMElement(xmlEventReader) ); } else - throw new RuntimeException( "Unknown " + localPart ); + throw new RuntimeException( "Unknown " + localPart + " ::location=" + startElement.getLocation() ); } return entitiesDescriptorType; } 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-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -151,7 +151,7 @@ StaxParserUtil.bypassElementBlock( xmlEventReader, JBossSAMLConstants.EXTENSIONS.get() ); } else - throw new RuntimeException( "Unknown " + localPart ); + throw new RuntimeException( "Unknown " + localPart + "::location=" + startElement.getLocation() ); } return entityDescriptorType; } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/xacml/SAMLXACMLRequestParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/xacml/SAMLXACMLRequestParser.java 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/xacml/SAMLXACMLRequestParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -65,7 +65,7 @@ return parseXACMLAuthzDecisionQuery(startElement, xmlEventReader); } - throw new RuntimeException( "Parsing Failed: Unknown Tag=" + tag ); + throw new RuntimeException( "Parsing Failed: Unknown Tag=" + tag + "::location=" + startElement.getLocation() ); } public boolean supports(QName qname) Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/STSConfigParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/STSConfigParser.java 2011-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/STSConfigParser.java 2011-02-23 19:57:08 UTC (rev 774) @@ -164,7 +164,7 @@ configType.setServiceProviders(this.parseServiceProviders(xmlEventReader)); } else - throw new ParsingException("Unknown Element: " + elementName); + throw new ParsingException("Unknown Element: " + elementName + "::Location=" + subEvent.getLocation() ); } return configType; } 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-02-23 19:41:18 UTC (rev 773) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java 2011-02-23 19:57:08 UTC (rev 774) @@ -86,7 +86,7 @@ AttributeType attribute = parseAttribute(xmlEventReader); attributeStatementType.addAttribute( new ASTChoiceType( attribute )); } - else throw new RuntimeException( "Unknown tag:" + tag ); + else throw new RuntimeException( "Unknown tag:" + tag + "::Location=" + startElement.getLocation() ); } return attributeStatementType; } @@ -206,7 +206,7 @@ Object attributeValue = parseAttributeValue(xmlEventReader); attributeType.addAttributeValue( attributeValue ); } - else throw new RuntimeException( "Unknown tag:" + tag ); + else throw new RuntimeException( "Unknown tag:" + tag + "::Location=" + startElement.getLocation() ); } } @@ -268,7 +268,7 @@ { authnStatementType.setAuthnContext( parseAuthnContextType( xmlEventReader ) ); } - else throw new RuntimeException( "Unknown tag:" + tag ); + else throw new RuntimeException( "Unknown tag:" + tag + "::Location=" + startElement.getLocation() ); EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); StaxParserUtil.validate(endElement, AUTHNSTATEMENT ); @@ -312,7 +312,7 @@ StaxParserUtil.validate(endElement, JBossSAMLConstants.AUTHN_CONTEXT.get() ); } else - throw new RuntimeException( "Unknown Tag:" + tag ); + throw new RuntimeException( "Unknown Tag:" + tag + "::Location=" + startElement.getLocation() ); return authnContextType; }