Author: ruchithf
Date: Fri Mar 22 04:16:43 2013
New Revision: 1459623
URL: http://svn.apache.org/r1459623
Log:
- Making sure UsernameTokens are only encrypted when required.
- Removed some deprecated methods.
- Some more code fixes to use generics.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java?rev=1459623&r1=1459622&r2=1459623&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/RampartMessageData.java
Fri Mar 22 04:16:43 2013
@@ -26,6 +26,7 @@ import org.apache.axis2.description.Para
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.axis2.util.PolicyUtil;
import org.apache.axis2.wsdl.WSDLConstants;
+import org.apache.neethi.Assertion;
import org.apache.neethi.Policy;
import org.apache.neethi.PolicyComponent;
import org.apache.neethi.PolicyEngine;
@@ -261,7 +262,7 @@ public class RampartMessageData {
}
if(this.servicePolicy != null){
- List it = (List)this.servicePolicy.getAlternatives().next();
+ List<Assertion> it =
this.servicePolicy.getAlternatives().next();
//Process policy and build policy data
this.policyData = RampartPolicyBuilder.build(it);
@@ -430,7 +431,7 @@ public class RampartMessageData {
this.servicePolicy.addAssertion(rc);
}
- List it = (List) this.servicePolicy.getAlternatives().next();
+ List<Assertion> it = this.servicePolicy.getAlternatives().next();
//Process policy and build policy data
try {
@@ -449,14 +450,6 @@ public class RampartMessageData {
}
/**
- * @param document The document to set.
- * @deprecated document is derived from MessageContext passed in
constructor
- */
- public void setDocument(Document document) {
- this.document = document;
- }
-
- /**
* @return Returns the timeToLive.
*/
public int getTimeToLive() {
@@ -507,14 +500,6 @@ public class RampartMessageData {
}
/**
- * @param msgContext The msgContext to set.
- * @deprecated MessageContext is set in constructor
- */
- public void setMsgContext(MessageContext msgContext) {
- this.msgContext = msgContext;
- }
-
- /**
* @return Returns the policyData.
*/
public RampartPolicyData getPolicyData() {
@@ -522,28 +507,6 @@ public class RampartMessageData {
}
/**
- * @param policyData The policyData to set.
- * @deprecated Policy data determined within constructor
- */
- public void setPolicyData(RampartPolicyData policyData) throws
RampartException {
- this.policyData = policyData;
-
- try {
- //if client side then check whether sig conf enabled
- //and get hold of the stored signature values
- if(this.isInitiator && !this.sender &&
policyData.isSignatureConfirmation()) {
- OperationContext opCtx = msgContext.getOperationContext();
- MessageContext outMsgCtx = opCtx
-
.getMessageContext(WSDLConstants.MESSAGE_LABEL_OUT_VALUE);
- msgContext.setProperty(WSHandlerConstants.SEND_SIGV, outMsgCtx
- .getProperty(WSHandlerConstants.SEND_SIGV));
- }
- } catch (AxisFault e) {
- throw new
RampartException("errorGettingSignatureValuesForSigconf", e);
- }
- }
-
- /**
* @return Returns the secHeader.
*/
public WSSecHeader getSecHeader() {
@@ -725,14 +688,6 @@ public class RampartMessageData {
}
/**
- * @param wstVersion The wstVersion to set.
- * @deprecated This is defined by the class.
- */
- public void setWstVersion(int wstVersion) {
- this.wstVersion = wstVersion;
- }
-
- /**
* @return Returns the secConvVersion.
*/
public int getSecConvVersion() {
@@ -746,13 +701,6 @@ public class RampartMessageData {
return servicePolicy;
}
- /**
- * @param servicePolicy The servicePolicy to set.
- * @deprecated servicePolicy determined in constructor
- */
- public void setServicePolicy(Policy servicePolicy) {
- this.servicePolicy = servicePolicy;
- }
/**
* @return Returns the timestampId.
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java?rev=1459623&r1=1459622&r2=1459623&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/AsymmetricBindingBuilder.java
Fri Mar 22 04:16:43 2013
@@ -27,14 +27,12 @@ import org.apache.rampart.policy.Rampart
import org.apache.rampart.policy.SupportingPolicyData;
import org.apache.rampart.policy.model.RampartConfig;
import org.apache.rampart.util.RampartUtil;
-import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import org.apache.ws.secpolicy.model.SupportingToken;
import org.apache.ws.secpolicy.model.Token;
import org.apache.ws.secpolicy.model.X509Token;
import org.apache.ws.security.WSConstants;
import org.apache.ws.security.WSEncryptionPart;
-import org.apache.ws.security.WSSConfig;
import org.apache.ws.security.WSSecurityException;
import org.apache.ws.security.conversation.ConversationException;
import org.apache.ws.security.handler.WSHandlerConstants;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java?rev=1459623&r1=1459622&r2=1459623&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/builder/BindingBuilder.java
Fri Mar 22 04:16:43 2013
@@ -424,8 +424,10 @@ public abstract class BindingBuilder {
//Add the UT
Element elem = utBuilder.getUsernameTokenElement();
elem = RampartUtil.insertSiblingAfter(rmd,
this.getInsertionLocation(), elem);
-
- encryptedTokensIdList.add(utBuilder.getId());
+
+ if (suppTokens.isEncryptedToken()) {
+ encryptedTokensIdList.add(utBuilder.getId());
+ }
//Move the insert location to the next element
this.setInsertionLocation(elem);
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java?rev=1459623&r1=1459622&r2=1459623&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/handler/PostDispatchVerificationHandler.java
Fri Mar 22 04:16:43 2013
@@ -121,13 +121,13 @@ public class PostDispatchVerificationHan
return InvocationResponse.CONTINUE;
}
- Iterator alternatives = policy.getAlternatives();
+ Iterator<List<Assertion>> alternatives = policy.getAlternatives();
boolean securityPolicyPresent = false;
if(alternatives.hasNext()) {
- List assertions = (List)alternatives.next();
- for (Iterator iterator = assertions.iterator();
iterator.hasNext();) {
- Assertion assertion = (Assertion) iterator.next();
+ List<Assertion> assertions = alternatives.next();
+ for (Iterator<Assertion> iterator = assertions.iterator();
iterator.hasNext();) {
+ Assertion assertion = iterator.next();
//Check for any *Binding assertion
if (assertion instanceof Binding) {
securityPolicyPresent = true;
Modified:
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
URL:
http://svn.apache.org/viewvc/axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java?rev=1459623&r1=1459622&r2=1459623&view=diff
==============================================================================
---
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
(original)
+++
axis/axis2/java/rampart/trunk/modules/rampart-core/src/main/java/org/apache/rampart/policy/RampartPolicyBuilder.java
Fri Mar 22 04:16:43 2013
@@ -36,7 +36,6 @@ import org.apache.ws.secpolicy.model.Sig
import org.apache.ws.secpolicy.model.SupportingToken;
import org.apache.ws.secpolicy.model.SymmetricAsymmetricBindingBase;
import org.apache.ws.secpolicy.model.SymmetricBinding;
-import org.apache.ws.secpolicy.model.TokenWrapper;
import org.apache.ws.secpolicy.model.TransportBinding;
import org.apache.ws.secpolicy.model.TransportToken;
import org.apache.ws.secpolicy.model.Trust10;
@@ -363,14 +362,14 @@ public class RampartPolicyBuilder {
*/
private static void asymmetricBinding(AsymmetricBinding binding,
RampartPolicyData rpd) throws WSSPolicyException {
- TokenWrapper tokWrapper = binding.getRecipientToken();
- TokenWrapper tokWrapper1 = binding.getInitiatorToken();
- if (tokWrapper == null || tokWrapper1 == null) {
+ RecipientToken rt = binding.getRecipientToken();
+ InitiatorToken it = binding.getInitiatorToken();
+ if (rt == null || it == null) {
throw new WSSPolicyException("Asymmetric binding should have both
Initiator and " +
"Recipient tokens defined");
}
- rpd.setRecipientToken(((RecipientToken)
tokWrapper).getReceipientToken());
- rpd.setInitiatorToken(((InitiatorToken)
tokWrapper1).getInitiatorToken());
+ rpd.setRecipientToken(rt.getReceipientToken());
+ rpd.setInitiatorToken(it.getInitiatorToken());
}
private static void processSupportingTokens(SupportingToken token,
