Author: ruchithf
Date: Tue Feb 20 23:28:19 2007
New Revision: 509927
URL: http://svn.apache.org/viewvc?view=rev&rev=509927
Log:
s/isClientside/isInitiator
makesure we always use isInitiator() and not msgCtx.isServerside()
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java?view=diff&rev=509927&r1=509926&r2=509927
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/MessageBuilder.java
Tue Feb 20 23:28:19 2007
@@ -63,7 +63,7 @@
}
//Copy the RECV_RESULTS if available
- if(!rmd.isClientSide()) {
+ if(!rmd.isInitiator()) {
OperationContext opCtx = msgCtx.getOperationContext();
MessageContext inMsgCtx;
if(opCtx != null &&
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java?view=diff&rev=509927&r1=509926&r2=509927
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/PolicyBasedResultsValidator.java
Tue Feb 20 23:28:19 2007
@@ -80,7 +80,7 @@
validateSignedPartsHeaders(data, results);
//Supporting tokens
- if(!rmd.isClientSide()) {
+ if(!rmd.isInitiator()) {
validateSupportingTokens(data, results);
}
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?view=diff&rev=509927&r1=509926&r2=509927
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Tue Feb 20 23:28:19 2007
@@ -127,7 +127,7 @@
*/
private Policy servicePolicy;
- private boolean isClientSide;
+ private boolean isInitiator;
private boolean sender;
@@ -176,6 +176,19 @@
this.servicePolicy =
(Policy)msgCtx.getProperty(KEY_RAMPART_POLICY);
}
+ Parameter clientSideParam =
msgCtx.getAxisService().getParameter(PARAM_CLIENT_SIDE);
+ if(clientSideParam != null) {
+ this.isInitiator = true;
+ } else {
+ this.isInitiator = !msgCtx.isServerSide();
+ if(this.isInitiator) {
+ clientSideParam = new Parameter();
+ clientSideParam.setName(PARAM_CLIENT_SIDE);
+ clientSideParam.setLocked(true);
+ msgCtx.getAxisService().addParameter(clientSideParam);
+ }
+ }
+
/*
* Init policy:
* When creating the RampartMessageData instance we
@@ -183,7 +196,7 @@
* If it is missing then try to obtain from the configuration
files.
*/
if(this.servicePolicy == null) {
- if(msgCtx.isServerSide()) {
+ if(!this.isInitiator) {
this.servicePolicy = msgCtx.getEffectivePolicy();
} else {
Parameter param =
msgCtx.getParameter(RampartMessageData.KEY_RAMPART_POLICY);
@@ -199,7 +212,7 @@
}
- if(!msgCtx.isServerSide() && this.servicePolicy != null) {
+ if(this.isInitiator && this.servicePolicy != null) {
msgCtx.getServiceContext().setProperty(RampartMessageData.KEY_RAMPART_POLICY,
this.servicePolicy);
}
@@ -211,7 +224,7 @@
}
- if(isClientSide && this.policyData != null &&
this.policyData.getRampartConfig() == null) {
+ if(isInitiator && this.policyData != null &&
this.policyData.getRampartConfig() == null) {
//We'r missing the extra info rampart needs
throw new RampartException("rampartConigMissing");
}
@@ -246,26 +259,12 @@
}
}
- Parameter clientSideParam =
msgCtx.getAxisService().getParameter(PARAM_CLIENT_SIDE);
- if(clientSideParam != null) {
- this.isClientSide = true;
- } else {
- this.isClientSide = !msgCtx.isServerSide();
- if(this.isClientSide) {
- clientSideParam = new Parameter();
- clientSideParam.setName(PARAM_CLIENT_SIDE);
- clientSideParam.setLocked(true);
- msgCtx.getAxisService().addParameter(clientSideParam);
- }
- }
-
-
this.sender = sender;
OperationContext opCtx = this.msgContext.getOperationContext();
- if(!this.isClientSide && this.sender) {
+ if(!this.isInitiator && this.sender) {
//Get hold of the incoming msg ctx
MessageContext inMsgCtx;
if (opCtx != null
@@ -280,7 +279,7 @@
}
}
- if(this.isClientSide && !this.sender) {
+ if(this.isInitiator && !this.sender) {
MessageContext outMsgCtx;
if (opCtx != null
&& (outMsgCtx = opCtx
@@ -387,7 +386,7 @@
try {
//if client side then check whether sig conf enabled
//and get hold of the stored signature values
- if(this.isClientSide && !this.sender &&
policyData.isSignatureConfirmation()) {
+ if(this.isInitiator && !this.sender &&
policyData.isSignatureConfirmation()) {
OperationContext opCtx = msgContext.getOperationContext();
MessageContext outMsgCtx = opCtx
.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
@@ -448,7 +447,7 @@
public String getSecConvTokenId() {
String id = null;
- if(this.isClientSide) {
+ if(this.isInitiator) {
String contextIdentifierKey =
RampartUtil.getContextIdentifierKey(this.msgContext);
id = (String)
RampartUtil.getContextMap(this.msgContext).get(contextIdentifierKey);
} else {
@@ -626,8 +625,8 @@
/**
* @return Returns the isClientSide.
*/
- public boolean isClientSide() {
- return isClientSide;
+ public boolean isInitiator() {
+ return isInitiator;
}
public ClassLoader getCustomClassLoader() {
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?view=diff&rev=509927&r1=509926&r2=509927
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
Tue Feb 20 23:28:19 2007
@@ -174,7 +174,7 @@
sigParts.add(new WSEncryptionPart(RampartUtil
.addWsuIdToElement((OMElement) this.timestampElement)));
- if (rmd.isClientSide()) {
+ if (rmd.isInitiator()) {
// Now add the supporting tokens
SupportingToken sgndSuppTokens = rpd
@@ -205,7 +205,7 @@
this.doSignature(rmd);
}
- if (rmd.isClientSide()) {
+ if (rmd.isInitiator()) {
// Do endorsed signatures
Vector endSigVals = this.doEndorsedSignatures(rmd,
endSuppTokMap);
@@ -277,7 +277,7 @@
sigParts.add(new WSEncryptionPart(RampartUtil
.addWsuIdToElement((OMElement) this.timestampElement)));
- if (rmd.isClientSide()) {
+ if (rmd.isInitiator()) {
// Now add the supporting tokens
SupportingToken sgndSuppTokens = rpd.getSignedSupportingTokens();
@@ -307,7 +307,7 @@
//Do endorsed signature
- if (rmd.isClientSide()) {
+ if (rmd.isInitiator()) {
// Do endorsed signatures
Vector endSigVals = this.doEndorsedSignatures(rmd,
endSuppTokMap);
@@ -519,7 +519,7 @@
*/
private void setupEncryptedKey(RampartMessageData rmd, Token token)
throws RampartException {
- if(!rmd.isClientSide() && token.isDerivedKeys()) {
+ if(!rmd.isInitiator() && token.isDerivedKeys()) {
//If we already have them, simply return
if(this.encryptedKeyId != null && this.encryptedKeyValue !=
null) {
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?view=diff&rev=509927&r1=509926&r2=509927
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Tue Feb 20 23:28:19 2007
@@ -292,7 +292,7 @@
for (Iterator iter = tokens.iterator(); iter.hasNext();) {
Token token = (Token) iter.next();
org.apache.rahas.Token endSuppTok = null;
- if(token instanceof IssuedToken && rmd.isClientSide()){
+ if(token instanceof IssuedToken && rmd.isInitiator()){
String id = RampartUtil.getIssuedToken(rmd,
(IssuedToken)token);
try {
endSuppTok = rmd.getTokenStorage().getToken(id);
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java?view=diff&rev=509927&r1=509926&r2=509927
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/SymmetricBindingBuilder.java
Tue Feb 20 23:28:19 2007
@@ -61,7 +61,7 @@
this.addTimestamp(rmd);
}
- if(rmd.isClientSide()) {
+ if(rmd.isInitiator()) {
//Setup required tokens
initializeTokens(rmd);
}
@@ -129,7 +129,7 @@
if(Constants.INCLUDE_ALWAYS.equals(encryptionToken.getInclusion())
||
Constants.INCLUDE_ONCE.equals(encryptionToken.getInclusion()) ||
- (rmd.isClientSide() &&
Constants.INCLUDE_ALWAYS_TO_RECIPIENT.equals(encryptionToken.getInclusion()))) {
+ (rmd.isInitiator() &&
Constants.INCLUDE_ALWAYS_TO_RECIPIENT.equals(encryptionToken.getInclusion()))) {
encrTokenElement = RampartUtil.appendChildToSecHeader(rmd,
tok.getToken());
attached = true;
}
@@ -198,7 +198,7 @@
sigParts.add(new WSEncryptionPart(RampartUtil
.addWsuIdToElement((OMElement) this.timestampElement)));
- if(rmd.isClientSide()) {
+ if(rmd.isInitiator()) {
// Now add the supporting tokens
SupportingToken sgndSuppTokens =
rpd.getSignedSupportingTokens();
@@ -227,7 +227,7 @@
this.mainSigId =
RampartUtil.addWsuIdToElement((OMElement)this.getInsertionLocation());
- if(rmd.isClientSide()) {
+ if(rmd.isInitiator()) {
//Do endorsed signatures
Vector endSigVals = this.doEndorsedSignatures(rmd,
endSuppTokMap);
for (Iterator iter = endSigVals.iterator(); iter.hasNext();) {
@@ -320,7 +320,7 @@
if(Constants.INCLUDE_ALWAYS.equals(sigToken.getInclusion()) ||
Constants.INCLUDE_ONCE.equals(sigToken.getInclusion()) ||
- (rmd.isClientSide() &&
+ (rmd.isInitiator() &&
Constants.INCLUDE_ALWAYS_TO_RECIPIENT.equals(
sigToken.getInclusion()))) {
sigTokElem = RampartUtil.appendChildToSecHeader(rmd,
@@ -346,7 +346,7 @@
sigParts.add(new WSEncryptionPart(RampartUtil
.addWsuIdToElement((OMElement) this.timestampElement)));
- if(rmd.isClientSide()) {
+ if(rmd.isInitiator()) {
// Now add the supporting tokens
SupportingToken sgndSuppTokens = rpd.getSignedSupportingTokens();
@@ -371,7 +371,7 @@
this.mainSigId =
RampartUtil.addWsuIdToElement((OMElement)this.getInsertionLocation());
- if(rmd.isClientSide()) {
+ if(rmd.isInitiator()) {
//Do endorsed signatures
Vector endSigVals = this.doEndorsedSignatures(rmd, endSuppTokMap);
for (Iterator iter = endSigVals.iterator(); iter.hasNext();) {
@@ -399,7 +399,7 @@
if(Constants.INCLUDE_ALWAYS.equals(encrToken.getInclusion()) ||
Constants.INCLUDE_ONCE.equals(encrToken.getInclusion()) ||
- (rmd.isClientSide() &&
Constants.INCLUDE_ALWAYS_TO_RECIPIENT.equals(encrToken.getInclusion()))) {
+ (rmd.isInitiator() &&
Constants.INCLUDE_ALWAYS_TO_RECIPIENT.equals(encrToken.getInclusion()))) {
encrTokElem = (Element)encrTok.getToken();
//Add the encrToken element before the sigToken element
Modified:
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java?view=diff&rev=509927&r1=509926&r2=509927
==============================================================================
---
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
(original)
+++
webservices/rampart/trunk/java/modules/rampart-core/src/main/java/org/apache/rampart/builder/TransportBindingBuilder.java
Tue Feb 20 23:28:19 2007
@@ -61,7 +61,7 @@
/*
* Process Supporting tokens
*/
- if(rmd.isClientSide()) {
+ if(rmd.isInitiator()) {
Vector signatureValues = new Vector();
SupportingToken sgndSuppTokens = rpd.getSignedSupportingTokens();
@@ -101,7 +101,7 @@
ArrayList tokens = sgndEndSuppTokens.getTokens();
for (Iterator iter = tokens.iterator(); iter.hasNext();) {
Token token = (Token) iter.next();
- if(token instanceof IssuedToken && rmd.isClientSide()) {
+ if(token instanceof IssuedToken && rmd.isInitiator()) {
signatureValues.add(doIssuedTokenSignature(rmd,
token));
} else if(token instanceof X509Token) {
signatureValues.add(doX509TokenSignature(rmd, token));
@@ -116,7 +116,7 @@
ArrayList tokens = endSupptokens.getTokens();
for (Iterator iter = tokens.iterator(); iter.hasNext();) {
Token token = (Token) iter.next();
- if(token instanceof IssuedToken && rmd.isClientSide()){
+ if(token instanceof IssuedToken && rmd.isInitiator()){
signatureValues.add(doIssuedTokenSignature(rmd,
token));
} else if(token instanceof X509Token) {
signatureValues.add(doX509TokenSignature(rmd, token));
@@ -258,7 +258,7 @@
if(inclusion.equals(Constants.INCLUDE_ALWAYS) ||
((inclusion.equals(Constants.INCLUDE_ALWAYS_TO_RECIPIENT)
|| inclusion.equals(Constants.INCLUDE_ONCE))
- && rmd.isClientSide())) {
+ && rmd.isInitiator())) {
//Add the token
rmd.getSecHeader().getSecurityHeader().appendChild(
