From picketlink-commits at lists.jboss.org Mon Mar 21 18:14:38 2011
Content-Type: multipart/mixed; boundary="===============4289336208593718477=="
MIME-Version: 1.0
From: picketlink-commits at lists.jboss.org
To: picketlink-commits at lists.jboss.org
Subject: [picketlink-commits] Picketlink SVN: r824 -
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler.
Date: Mon, 21 Mar 2011 18:14:38 -0400
Message-ID: <201103212214.p2LMEc7A026595@svn01.web.mwc.hst.phx2.redhat.com>
--===============4289336208593718477==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Author: anil.saldhana(a)jboss.com
Date: 2011-03-21 18:14:37 -0400 (Mon, 21 Mar 2011)
New Revision: 824
Modified:
trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/S=
AML2Handler.java
Log:
use PL constants
Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/ha=
ndler/SAML2Handler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/=
SAML2Handler.java 2011-03-16 20:06:26 UTC (rev 823)
+++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/handler/=
SAML2Handler.java 2011-03-21 22:14:37 UTC (rev 824)
@@ -35,6 +35,7 @@
import org.jboss.security.SecurityContext;
import org.jboss.wsf.common.handler.GenericSOAPHandler;
import org.picketlink.identity.federation.bindings.jboss.subject.PicketLin=
kPrincipal;
+import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAML=
URIConstants;
import org.picketlink.identity.federation.core.wstrust.SamlCredential;
import org.picketlink.trust.jbossws.Constants;
import org.picketlink.trust.jbossws.SAML2Constants;
@@ -49,8 +50,10 @@
* =
* @author Marcus Moyses
* @author Alessio Soldano
+ * @author Anil Saldhana
* @version $Revision: 1 $
*/
+(a)SuppressWarnings({"rawtypes", "restriction"})
public class SAML2Handler extends GenericSOAPHandler
{
=
@@ -76,13 +79,14 @@
*/
protected boolean handleInbound(MessageContext msgContext)
{
+ String assertionNS =3D JBossSAMLURIConstants.ASSERTION_NSURI.get();
SOAPMessageContext ctx =3D (SOAPMessageContext) msgContext;
SOAPMessage soapMessage =3D ctx.getMessage();
=
// retrieve the assertion
Document document =3D soapMessage.getSOAPPart();
Element soapHeader =3D Util.findOrCreateSoapHeader(document.getDocum=
entElement());
- Element assertion =3D Util.findElement(soapHeader, new QName(SAML2Co=
nstants.SAML2_ASSERTION_URI, "Assertion"));
+ Element assertion =3D Util.findElement(soapHeader, new QName(asserti=
onNS, "Assertion"));
if (assertion !=3D null)
{
SamlCredential credential =3D new SamlCredential(assertion);
@@ -91,8 +95,8 @@
log.trace("Assertion included in SOAP payload:");
log.trace(credential.getAssertionAsString());
}
- Element subject =3D Util.findElement(assertion, new QName(SAML2Co=
nstants.SAML2_ASSERTION_URI, "Subject"));
- Element nameID =3D Util.findElement(subject, new QName(SAML2Const=
ants.SAML2_ASSERTION_URI, "NameID"));
+ Element subject =3D Util.findElement(assertion, new QName(asserti=
onNS, "Subject"));
+ Element nameID =3D Util.findElement(subject, new QName(assertionN=
S, "NameID"));
String username =3D getUsername(nameID);
// set SecurityContext
Subject s =3D new Subject();
--===============4289336208593718477==--