You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ru...@apache.org on 2006/07/05 19:18:03 UTC
svn commit: r419285 - in /webservices/axis2/trunk/java/modules:
integration/test/org/apache/rahas/ rahas/src/org/apache/rahas/
rahas/src/org/apache/rahas/impl/
security/src/org/apache/rampart/conversation/
security/src/org/apache/rampart/handler/
Author: ruchithf
Date: Wed Jul 5 10:18:03 2006
New Revision: 419285
URL: http://svn.apache.org/viewvc?rev=419285&view=rev
Log:
IMPORTANT: This depends on the latest WSS4J-SNAPSHOT
- Changes to complement changes in WSS4J
- Adding the WS-SX namespaces to get Rahas to support both 2005/02 version and the latest WS-SX
Modified:
webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java
webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
Modified: webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java (original)
+++ webservices/axis2/trunk/java/modules/integration/test/org/apache/rahas/RahasSAMLTokenTest.java Wed Jul 5 10:18:03 2006
@@ -77,7 +77,7 @@
Axis2Util.useDOOM(false);
StAXOMBuilder builder = new StAXOMBuilder(new StreamWrapper(rst
- .getPullParser(new QName(org.apache.rahas.Constants.WST_NS,
+ .getPullParser(new QName(org.apache.rahas.Constants.WST_NS_05_02,
org.apache.rahas.Constants.REQUEST_SECURITY_TOKEN_LN))));
OMElement rstElem = builder.getDocumentElement();
@@ -96,7 +96,7 @@
}
public void validateRsponse(OMElement resp) {
- OMElement rst = resp.getFirstChildWithName(new QName(Constants.WST_NS, Constants.REQUESTED_SECURITY_TOKEN_LN));
+ OMElement rst = resp.getFirstChildWithName(new QName(Constants.WST_NS_05_02, Constants.REQUESTED_SECURITY_TOKEN_LN));
assertNotNull("RequestedSecurityToken missing", rst);
OMElement elem = rst.getFirstChildWithName(new QName(XML.SAML_NS, "Assertion"));
assertNotNull("Missing SAML Assertoin", elem);
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/Constants.java Wed Jul 5 10:18:03 2006
@@ -16,14 +16,29 @@
package org.apache.rahas;
-public interface Constants {
+public class Constants {
+
+ /**
+ * WS-Trust 2005 Feb namespace
+ */
+ public final static String WST_NS_05_02 = "http://schemas.xmlsoap.org/ws/2005/02/trust";
+
+ /**
+ * WS-SX Namespace
+ */
+ public final static String WST_NS_05_12 = "http://docs.oasis-open.org/ws-sx/ws-trust/200512";
- public final static String WST_NS = "http://schemas.xmlsoap.org/ws/2005/02/trust";
public final static String WST_PREFIX = "wst";
public final static String WSP_NS = "http://schemas.xmlsoap.org/ws/2004/09/policy";
public final static String WSP_PREFIX = "wsp";
+ public static String NS = WST_NS_05_02;
+
+ public static void setVersion(String ns) {
+ NS = ns;
+ }
+
//Local names
public final static String REQUEST_TYPE_LN = "RequestType";
public final static String TOKEN_TYPE_LN = "TokenType";
@@ -40,10 +55,10 @@
public final static String LIFETIME_LN = "Lifetime";
//RequestTypes
- public final static String REQ_TYPE_ISSUE = "http://schemas.xmlsoap.org/ws/2005/02/trust/Issue";
- public final static String REQ_TYPE_VALIDATE = "http://schemas.xmlsoap.org/ws/2005/02/trust/Validate";
- public final static String REQ_TYPE_RENEW = "http://schemas.xmlsoap.org/ws/2005/02/trust/Renew";
- public final static String REQ_TYPE_CANCEL = "http://schemas.xmlsoap.org/ws/2005/02/trust/Cancel";
+ public final static String REQ_TYPE_ISSUE = NS + "/Issue";
+ public final static String REQ_TYPE_VALIDATE = NS + "/Validate";
+ public final static String REQ_TYPE_RENEW = NS + "/Renew";
+ public final static String REQ_TYPE_CANCEL = NS + "/Cancel";
//Token types
public final static String TOK_TYPE_SCT = "http://schemas.xmlsoap.org/ws/2005/02/sc/sct";
@@ -51,22 +66,22 @@
//RST actions
- public final static String RST_ACTON_ISSUE = "http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Issue";
- public final static String RST_ACTON_VALIDATE = "http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Renew";
- public final static String RST_ACTON_RENEW = "http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Cancel";
- public final static String RST_ACTON_CANCEL = "http://schemas.xmlsoap.org/ws/2005/02/trust/RST/Validate";
- public final static String RST_ACTON_SCT = "http://schemas.xmlsoap.org/ws/2005/02/trust/RST/SCT";
+ public final static String RST_ACTON_ISSUE = NS + "/RST/Issue";
+ public final static String RST_ACTON_VALIDATE = NS + "/RST/Renew";
+ public final static String RST_ACTON_RENEW = NS + "/RST/Cancel";
+ public final static String RST_ACTON_CANCEL = NS + "/RST/Validate";
+ public final static String RST_ACTON_SCT = NS + "/RST/SCT";
//RSTR actions
- public final static String RSTR_ACTON_ISSUE = "http://schemas.xmlsoap.org/ws/2005/02/trust/RSTR/Issue";
- public final static String RSTR_ACTON_VALIDATE = "http://schemas.xmlsoap.org/ws/2005/02/trust/RSTR/Renew";
- public final static String RSTR_ACTON_RENEW = "http://schemas.xmlsoap.org/ws/2005/02/trust/RSTR/Cancel";
- public final static String RSTR_ACTON_CANCEL = "http://schemas.xmlsoap.org/ws/2005/02/trust/RSTR/Validate";
- public final static String RSTR_ACTON_SCT = "http://schemas.xmlsoap.org/ws/2005/02/trust/RSTR/SCT";
+ public final static String RSTR_ACTON_ISSUE = NS + "/RSTR/Issue";
+ public final static String RSTR_ACTON_VALIDATE = NS + "/RSTR/Renew";
+ public final static String RSTR_ACTON_RENEW = NS + "/RSTR/Cancel";
+ public final static String RSTR_ACTON_CANCEL = NS + "/RSTR/Validate";
+ public final static String RSTR_ACTON_SCT = NS + "/RSTR/SCT";
//Attrs
public final static String ATTR_TYPE = "Type";
//Attr values
- public final static String BIN_SEC_TYPE_NONCE = WST_NS + "/Nonce";
+ public final static String BIN_SEC_TYPE_NONCE = NS + "/Nonce";
}
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TokenRequestDispatcher.java Wed Jul 5 10:18:03 2006
@@ -55,7 +55,7 @@
RequestSecurityTokenType request = null;
OMElement rstElem = inMsgCtx.getEnvelope().getBody()
.getFirstChildWithName(
- new QName(Constants.WST_NS,
+ new QName(Constants.WST_NS_05_02,
Constants.REQUEST_SECURITY_TOKEN_LN));
try {
request = RequestSecurityTokenType.Factory.parse(rstElem
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/TrustUtil.java Wed Jul 5 10:18:03 2006
@@ -54,35 +54,35 @@
public static OMElement createRequestSecurityTokenResponseElement(
OMElement parent) {
- return createOMElement(parent,Constants.WST_NS,
+ return createOMElement(parent,Constants.WST_NS_05_02,
Constants.REQUEST_SECURITY_TOKEN_RESPONSE_LN,
Constants.WST_PREFIX);
}
public static OMElement createRequestedSecurityTokenElement(OMElement parent) {
- return createOMElement(parent,Constants.WST_NS,
+ return createOMElement(parent,Constants.WST_NS_05_02,
Constants.REQUESTED_SECURITY_TOKEN_LN,
Constants.WST_PREFIX);
}
public static OMElement createRequestedProofTokenElement(OMElement parent) {
- return createOMElement(parent, Constants.WST_NS,
+ return createOMElement(parent, Constants.WST_NS_05_02,
Constants.REQUESTED_PROOF_TOKEN_LN, Constants.WST_PREFIX);
}
public static OMElement createEntropyElement(OMElement parent) {
- return createOMElement(parent, Constants.WST_NS,
+ return createOMElement(parent, Constants.WST_NS_05_02,
Constants.ENTROPY_LN, Constants.WST_PREFIX);
}
public static OMElement createtTokenTypeElement(OMElement parent) {
- return createOMElement(parent, Constants.WST_NS,
+ return createOMElement(parent, Constants.WST_NS_05_02,
Constants.TOKEN_TYPE_LN, Constants.WST_PREFIX);
}
public static OMElement createBinarySecretElement(OMElement parent,
String type) {
- OMElement elem = createOMElement(parent, Constants.WST_NS,
+ OMElement elem = createOMElement(parent, Constants.WST_NS_05_02,
Constants.BINARY_SECRET_LN, Constants.WST_PREFIX);
if(type != null) {
elem.addAttribute(elem.getOMFactory().createOMAttribute(
@@ -93,7 +93,7 @@
public static OMElement createRequestedUnattachedRef(OMElement parent,
String refUri, String refValueType) {
- OMElement elem = createOMElement(parent, Constants.WST_NS,
+ OMElement elem = createOMElement(parent, Constants.WST_NS_05_02,
Constants.REQUESTED_UNATTACHED_REFERENCE_LN,
Constants.WST_PREFIX);
elem.addChild((OMElement) createSecurityTokenReference(
@@ -103,7 +103,7 @@
public static OMElement createRequestedAttachedRef(OMElement parent,
String refUri, String refValueType) {
- OMElement elem = createOMElement(parent, Constants.WST_NS,
+ OMElement elem = createOMElement(parent, Constants.WST_NS_05_02,
Constants.REQUESTED_ATTACHED_REFERENCE_LN,
Constants.WST_PREFIX);
elem.addChild((OMElement) createSecurityTokenReference(
@@ -112,14 +112,14 @@
}
public static OMElement createKeySizeElement(OMElement parent) {
- return createOMElement(parent, Constants.WST_NS,
+ return createOMElement(parent, Constants.WST_NS_05_02,
Constants.KEY_SIZE_LN,
Constants.WST_PREFIX);
}
public static OMElement createLifetimeElement(OMElement parent,
String created, String expires) {
- OMElement ltElem = createOMElement(parent, Constants.WST_NS,
+ OMElement ltElem = createOMElement(parent, Constants.WST_NS_05_02,
Constants.LIFETIME_LN,
Constants.WST_PREFIX);
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SAMLTokenIssuer.java Wed Jul 5 10:18:03 2006
@@ -270,7 +270,7 @@
private int getKeySize(OMElement request, SAMLTokenIssuerConfig config)
throws TrustException {
OMElement keySizeElem = request.getFirstChildWithName(
- new QName(Constants.WST_NS, Constants.KEY_SIZE_LN));
+ new QName(Constants.WST_NS_05_02, Constants.KEY_SIZE_LN));
if (keySizeElem != null) {
// Try to get the wst:KeySize value
try {
Modified: webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java (original)
+++ webservices/axis2/trunk/java/modules/rahas/src/org/apache/rahas/impl/SCTIssuer.java Wed Jul 5 10:18:03 2006
@@ -160,7 +160,7 @@
* @param config
*/
private void parseEntropyInfo(SOAPEnvelope envelope, SCTIssuerConfig config) {
- OMElement elem = envelope.getBody().getFirstChildWithName(new QName(Constants.WST_NS, Constants.REQUEST_SECURITY_TOKEN_LN));
+ OMElement elem = envelope.getBody().getFirstChildWithName(new QName(Constants.WST_NS_05_02, Constants.REQUEST_SECURITY_TOKEN_LN));
if(elem != null) {
//TODO get the entropy and keysize info
}
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/STSRequester.java Wed Jul 5 10:18:03 2006
@@ -87,7 +87,7 @@
Axis2Util.useDOOM(false);
StAXOMBuilder builder = new StAXOMBuilder(new StreamWrapper(rst
- .getPullParser(new QName(Constants.WST_NS,
+ .getPullParser(new QName(Constants.WST_NS_05_02,
Constants.REQUEST_SECURITY_TOKEN_LN))));
OMElement rstElem = builder.getDocumentElement();
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/conversation/Util.java Wed Jul 5 10:18:03 2006
@@ -78,7 +78,7 @@
throws Exception {
// Extract the SecurityContextToken
OMElement rstElem = rstr.getFirstChildWithName(new QName(
- Constants.WST_NS, Constants.REQUESTED_SECURITY_TOKEN_LN));
+ Constants.WST_NS_05_02, Constants.REQUESTED_SECURITY_TOKEN_LN));
Token token = null;
if (rstElem != null) {
OMElement sctElem = rstElem
@@ -97,7 +97,7 @@
// Process RequestedProofToken and extract the secret
byte[] secret = null;
- OMElement rpt = rstr.getFirstChildWithName(new QName(Constants.WST_NS,
+ OMElement rpt = rstr.getFirstChildWithName(new QName(Constants.WST_NS_05_02,
Constants.REQUESTED_PROOF_TOKEN_LN));
if (rpt != null) {
OMElement elem = rpt.getFirstElement();
@@ -112,7 +112,7 @@
null);
secret = processor.getDecryptedBytes();
} else if (Constants.BINARY_SECRET_LN.equals(elem.getLocalName())
- && Constants.WST_NS.equals(elem.getNamespace().getName())) {
+ && Constants.WST_NS_05_02.equals(elem.getNamespace().getName())) {
// Handle the wst:BinarySecret case
secret = Base64.decode(elem.getText());
} else {
@@ -126,12 +126,12 @@
// Check for attached ref
OMElement reqAttElem = rstr.getFirstChildWithName(new QName(
- Constants.WST_NS, Constants.REQUESTED_ATTACHED_REFERENCE_LN));
+ Constants.WST_NS_05_02, Constants.REQUESTED_ATTACHED_REFERENCE_LN));
OMElement reqAttRef = reqAttElem == null ? null : reqAttElem
.getFirstElement();
OMElement reqUnattElem = rstr.getFirstChildWithName(new QName(
- Constants.WST_NS, Constants.REQUESTED_UNATTACHED_REFERENCE_LN));
+ Constants.WST_NS_05_02, Constants.REQUESTED_UNATTACHED_REFERENCE_LN));
OMElement reqUnattRef = reqUnattElem == null ? null : reqUnattElem
.getFirstElement();
Modified: webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java?rev=419285&r1=419284&r2=419285&view=diff
==============================================================================
--- webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java (original)
+++ webservices/axis2/trunk/java/modules/security/src/org/apache/rampart/handler/WSDoAllSender.java Wed Jul 5 10:18:03 2006
@@ -402,8 +402,6 @@
}
private void constructMessage(ConversationConfiguration config) throws Exception {
-
- Crypto crypto = Util.getCryptoInstace(config);
Document doc = config.getDocument();
@@ -428,7 +426,7 @@
String tokenId = sct.getID();
encrBuilder.setExternalKey(tempSecret, tokenId);
}
- encrBuilder.build(doc, crypto, secHeader);
+ encrBuilder.build(doc, secHeader);
WSSecurityUtil.prependChildElement(doc, secHeader.getSecurityHeader(),
sct.getElement(), false);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org