[jboss-cvs] Picketlink SVN: r530 - in federation/trunk: picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 4 13:16:39 EDT 2010
Author: anil.saldhana at jboss.com
Date: 2010-11-04 13:16:37 -0400 (Thu, 04 Nov 2010)
New Revision: 530
Modified:
federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloResponseParser.java
federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/BaseWriter.java
federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java
Log:
use stax parsing/writing
Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java
===================================================================
--- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2010-11-04 16:51:05 UTC (rev 529)
+++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2010-11-04 17:16:37 UTC (rev 530)
@@ -298,6 +298,7 @@
}
catch (Exception e)
{
+ e.printStackTrace();
if(trace)
log.trace("Server Exception:", e);
throw new IOException("Server Exception:"+ e.getLocalizedMessage());
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloResponseParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloResponseParser.java 2010-11-04 16:51:05 UTC (rev 529)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloResponseParser.java 2010-11-04 17:16:37 UTC (rev 530)
@@ -34,8 +34,8 @@
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.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType;
/**
* Parse the SLO Response
@@ -51,7 +51,7 @@
StartElement startElement = StaxParserUtil.getNextStartElement(xmlEventReader);
StaxParserUtil.validate(startElement, LOGOUT_RESPONSE.get() );
- ResponseType response = parseBaseAttributes(startElement);
+ StatusResponseType response = parseBaseAttributes(startElement);
while( xmlEventReader.hasNext() )
{
@@ -72,12 +72,7 @@
{
startElement = StaxParserUtil.getNextStartElement( xmlEventReader );
StaxParserUtil.bypassElementBlock(xmlEventReader, JBossSAMLConstants.SIGNATURE.get() );
- }
- else if( JBossSAMLConstants.ASSERTION.get().equals( elementName ))
- {
- SAMLAssertionParser assertionParser = new SAMLAssertionParser();
- response.getAssertionOrEncryptedAssertion().add( assertionParser.parse(xmlEventReader));
- }
+ }
else if( JBossSAMLConstants.STATUS.get().equals( elementName ))
{
response.setStatus( parseStatus(xmlEventReader) );
@@ -92,9 +87,9 @@
* @return
* @throws ConfigurationException
*/
- private ResponseType parseBaseAttributes( StartElement startElement ) throws ParsingException
+ private StatusResponseType parseBaseAttributes( StartElement startElement ) throws ParsingException
{
- ResponseType response = new ResponseType();
+ StatusResponseType response = new StatusResponseType();
super.parseBaseAttributes( startElement, response );
return response;
Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/BaseWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/BaseWriter.java 2010-11-04 16:51:05 UTC (rev 529)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/BaseWriter.java 2010-11-04 17:16:37 UTC (rev 530)
@@ -96,6 +96,5 @@
{
if( writer == null )
writer = StaxUtil.getXMLStreamWriter( out );
- }
-
+ }
}
\ No newline at end of file
Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2010-11-04 16:51:05 UTC (rev 529)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2010-11-04 17:16:37 UTC (rev 530)
@@ -21,25 +21,24 @@
*/
package org.picketlink.identity.federation.web.handlers.saml2;
-import java.io.IOException;
-
import javax.servlet.ServletContext;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-import javax.xml.bind.JAXBException;
import javax.xml.parsers.ParserConfigurationException;
import org.apache.log4j.Logger;
import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request;
import org.picketlink.identity.federation.api.saml.v2.response.SAML2Response;
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.saml.v2.common.IDGenerator;
+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.core.saml.v2.interfaces.SAML2Handler;
import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
+import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest.GENERATE_REQUEST_TYPE;
import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse;
-import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest.GENERATE_REQUEST_TYPE;
import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
import org.picketlink.identity.federation.saml.v2.SAML2Object;
import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType;
@@ -52,7 +51,6 @@
import org.picketlink.identity.federation.web.constants.GeneralConstants;
import org.picketlink.identity.federation.web.core.HTTPContext;
import org.picketlink.identity.federation.web.core.IdentityServer;
-import org.xml.sax.SAXException;
/**
* SAML2 LogOut Profile
@@ -303,8 +301,12 @@
{
throw new ProcessingException(pe);
}
- catch(JAXBException pe)
+ catch (ParsingException e)
{
+ throw new ProcessingException( e );
+ }
+ /*catch(JAXBException pe)
+ {
throw new ProcessingException(pe);
}
catch(IOException pe)
@@ -314,7 +316,7 @@
catch(SAXException pe)
{
throw new ProcessingException(pe);
- }
+ }*/
return;
}
@@ -345,6 +347,7 @@
statusResponse.setIssueInstant(XMLTimeUtil.getIssueInstant());
statusResponse.setInResponseTo(logOutRequestID);
statusResponse.setID(IDGenerator.create("ID_"));
+ statusResponse.setVersion( JBossSAMLConstants.VERSION_2_0.get() );
statusResponse.setIssuer(request.getIssuer());
@@ -353,7 +356,7 @@
SAML2Response saml2Response = new SAML2Response();
response.setResultingDocument(saml2Response.convert(statusResponse));
}
- catch(JAXBException je)
+ catch( ParsingException je)
{
throw new ProcessingException(je);
}
@@ -468,6 +471,7 @@
}
statusResponse.setInResponseTo(logOutRequest.getID());
statusResponse.setID(IDGenerator.create("ID_"));
+ statusResponse.setVersion( JBossSAMLConstants.VERSION_2_0.get() );
statusResponse.setIssuer(request.getIssuer());
More information about the jboss-cvs-commits
mailing list