You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by mu...@apache.org on 2007/03/09 12:12:45 UTC
svn commit: r516371 - in
/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas:
RahasConstants.java RahasData.java TrustUtil.java
Author: muthulee
Date: Fri Mar 9 03:12:44 2007
New Revision: 516371
URL: http://svn.apache.org/viewvc?view=rev&rev=516371
Log:
Commiting Claims support
Modified:
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
Modified: webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java?view=diff&rev=516371&r1=516370&r2=516371
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasConstants.java Fri Mar 9 03:12:44 2007
@@ -59,6 +59,8 @@
public static final String ENTROPY = "Entropy";
public static final String APPLIES_TO = "AppliesTo";
public static final String LIFETIME = "Lifetime";
+ public static final String CLAIMS = "Claims";
+
}
public static class CancelBindingLocalNames {
@@ -107,5 +109,6 @@
"oasis-wss-saml-token-profile-1.1#SAMLV1.1";
//Attrs
- public static final String ATTR_TYPE = "Type";
+ public static final String ATTR_TYPE = "Type";
+ public static final String ATTR_CLAIMS_DIALECT = "Dialect";
}
Modified: webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java?view=diff&rev=516371&r1=516370&r2=516371
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/RahasData.java Fri Mar 9 03:12:44 2007
@@ -69,7 +69,10 @@
private String addressingNs;
private String soapNs;
-
+
+ private OMElement claimElem;
+
+ private String claimDialect;
/**
* Create a new RahasData instance and populate it with the information from
* the request.
@@ -114,6 +117,8 @@
this.processAppliesTo();
this.processEntropy();
+
+ this.processClaims();
}
@@ -263,7 +268,22 @@
}
this.keysize = -1;
}
-
+
+ /**
+ * Processes a claims.
+ *
+ */
+ private void processClaims(){
+ claimElem = this.rstElement
+ .getFirstChildWithName(new QName(this.wstNs,
+ RahasConstants.IssuanceBindingLocalNames.CLAIMS));
+
+ if(claimElem == null){
+ claimDialect = claimElem.getAttributeValue(new QName(this.wstNs,
+ RahasConstants.ATTR_CLAIMS_DIALECT));
+ }
+
+ }
/**
* Process wst:Entropy element in the request.
@@ -418,6 +438,14 @@
public void setEphmeralKey(byte[] ephmeralKey) {
this.ephmeralKey = ephmeralKey;
}
+
+ public String getClaimDialect() {
+ return claimDialect;
+ }
+
+ public OMElement getClaimElem() {
+ return claimElem;
+ }
}
Modified: webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java?view=diff&rev=516371&r1=516370&r2=516371
==============================================================================
--- webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java (original)
+++ webservices/rampart/trunk/java/modules/rampart-trust/src/main/java/org/apache/rahas/TrustUtil.java Fri Mar 9 03:12:44 2007
@@ -19,6 +19,7 @@
import org.apache.axiom.om.OMAbstractFactory;
import org.apache.axiom.om.OMElement;
import org.apache.axiom.om.OMFactory;
+import org.apache.axiom.om.OMNamespace;
import org.apache.axiom.om.impl.dom.DOOMAbstractFactory;
import org.apache.axiom.soap.SOAP11Constants;
import org.apache.axiom.soap.SOAPEnvelope;
@@ -441,6 +442,23 @@
RahasConstants.WST_PREFIX);
}
+
+ public static OMElement createClaims(int version,
+ OMElement parent, String dialect) throws TrustException{
+ OMElement omElem = createOMElement(parent,
+ getWSTNamespace(version),
+ RahasConstants.IssuanceBindingLocalNames.CLAIMS,
+ RahasConstants.WST_PREFIX);
+
+ OMNamespace ns = omElem.getOMFactory().createOMNamespace(getWSTNamespace(version),
+ RahasConstants.WSP_PREFIX);
+ omElem.addAttribute(RahasConstants.ATTR_CLAIMS_DIALECT , dialect, ns);
+
+
+ return omElem;
+ }
+
+
public static OMElement createCancelRequest(String tokenId,
int version) throws TrustException {
@@ -500,4 +518,6 @@
cryptoElem.getAttribute(PROVIDER).getAttributeValue().trim());
return properties;
}
+
+
}