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 na...@apache.org on 2008/05/07 12:54:29 UTC
svn commit: r654069 - in
/webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws:
secpolicy/model/AlgorithmSuite.java
secpolicy11/builders/AlgorithmSuiteBuilder.java
secpolicy12/builders/AlgorithmSuiteBuilder.java
Author: nandana
Date: Wed May 7 03:54:28 2008
New Revision: 654069
URL: http://svn.apache.org/viewvc?rev=654069&view=rev
Log:
RAMPART-162 Throws an exception if an invalid algorithm suite is provided (fixing the 1.4 branch)
Modified:
webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java
webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java
Modified: webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java?rev=654069&r1=654068&r2=654069&view=diff
==============================================================================
--- webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java (original)
+++ webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy/model/AlgorithmSuite.java Wed May 7 03:54:28 2008
@@ -21,8 +21,8 @@
import org.apache.neethi.PolicyComponent;
import org.apache.ws.secpolicy.SP11Constants;
-import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.WSSPolicyException;
public class AlgorithmSuite extends AbstractConfigurableSecurityAssertion {
@@ -93,7 +93,7 @@
* @see SPConstants#ALGO_SUITE_TRIPLE_DES_SHA256
* @see SPConstants#ALGO_SUITE_TRIPLE_DES_SHA256_RSA15
*/
- public void setAlgorithmSuite(String algoSuite) {
+ public void setAlgorithmSuite(String algoSuite) throws WSSPolicyException {
setAlgoSuiteString(algoSuite);
this.algoSuiteString = algoSuite;
@@ -273,8 +273,8 @@
this.minimumSymmetricKeyLength = 192;
this.maximumSymmetricKeyLength = 192; //due to use of 3des
} else {
- // throw new WSSPolicyException("Invalid algorithm suite : " +
- // algoSuite);
+ throw new WSSPolicyException("Invalid algorithm suite : " +
+ algoSuite);
}
}
Modified: webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java?rev=654069&r1=654068&r2=654069&view=diff
==============================================================================
--- webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java (original)
+++ webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy11/builders/AlgorithmSuiteBuilder.java Wed May 7 03:54:28 2008
@@ -21,6 +21,7 @@
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SP11Constants;
import org.apache.ws.secpolicy.SPConstants;
+import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import javax.xml.namespace.QName;
@@ -31,7 +32,12 @@
AlgorithmSuite algorithmSuite = new AlgorithmSuite(SPConstants.SP_V11);
OMElement policyElem = element.getFirstElement();
- algorithmSuite.setAlgorithmSuite(policyElem.getFirstElement().getLocalName());
+
+ try {
+ algorithmSuite.setAlgorithmSuite(policyElem.getFirstElement().getLocalName());
+ } catch (WSSPolicyException e) {
+ throw new IllegalArgumentException(e);
+ }
return algorithmSuite;
}
Modified: webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java
URL: http://svn.apache.org/viewvc/webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java?rev=654069&r1=654068&r2=654069&view=diff
==============================================================================
--- webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java (original)
+++ webservices/rampart/branches/java/1_4/modules/rampart-policy/src/main/java/org/apache/ws/secpolicy12/builders/AlgorithmSuiteBuilder.java Wed May 7 03:54:28 2008
@@ -21,6 +21,7 @@
import org.apache.neethi.builders.AssertionBuilder;
import org.apache.ws.secpolicy.SPConstants;
import org.apache.ws.secpolicy.SP12Constants;
+import org.apache.ws.secpolicy.WSSPolicyException;
import org.apache.ws.secpolicy.model.AlgorithmSuite;
import javax.xml.namespace.QName;
@@ -31,7 +32,12 @@
AlgorithmSuite algorithmSuite = new AlgorithmSuite(SPConstants.SP_V12);
OMElement policyElem = element.getFirstElement();
- algorithmSuite.setAlgorithmSuite(policyElem.getFirstElement().getLocalName());
+
+ try {
+ algorithmSuite.setAlgorithmSuite(policyElem.getFirstElement().getLocalName());
+ } catch (WSSPolicyException e) {
+ throw new IllegalArgumentException(e);
+ }
return algorithmSuite;
}