ws-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1039330 - in /webservices/wss4j/trunk: interop/org/apache/ws/axis/oasis/ interop/org/apache/ws/axis/oasis/ping/ samples/org/apache/ws/axis/samples/wssec/doall/ src/org/apache/ws/security/handler/ test/interop/
Date Fri, 26 Nov 2010 12:29:27 GMT
Author: coheigea
Date: Fri Nov 26 12:29:26 2010
New Revision: 1039330

URL: http://svn.apache.org/viewvc?rev=1039330&view=rev
Log:
The encryption and decryption crypto instances no longer fall back to the signature crypto
instance

Modified:
    webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
    webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd
    webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client-config.wsdd
    webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client_deploy.wsdd
    webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server-config.wsdd
    webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server_deploy.wsdd
    webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
    webservices/wss4j/trunk/test/interop/TestJAXRPCHandler.java

Modified: webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd?rev=1039330&r1=1039329&r2=1039330&view=diff
==============================================================================
--- webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd (original)
+++ webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/Client_deploy.wsdd Fri Nov 26
12:29:26 2010
@@ -94,6 +94,7 @@
       value="org.apache.ws.axis.oasis.PWCallback1Out"/>
     <parameter name="signatureKeyIdentifier" value="DirectReference" />
     <parameter name="signaturePropFile" value="wsstest.properties" />
+    <parameter name="encryptionPropFile" value="wsstest.properties" />
     <parameter name="encryptionKeyIdentifier" value="SKIKeyIdentifier" />
     <parameter name="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
/>    
     <parameter name="encryptionUser" value="bob" />
@@ -105,6 +106,7 @@
       value="org.apache.ws.axis.oasis.PWCallback1In"/>
     <parameter name="action" value="Signature Encrypt Timestamp"/>
     <parameter name="signaturePropFile" value="wsstest.properties" />
+    <parameter name="decryptionPropFile" value="wsstest.properties" />
    </handler>
   </responseFlow>
  </service>
@@ -171,6 +173,7 @@
       value="org.apache.ws.axis.oasis.PWCallback1Out"/>
     <parameter name="signatureKeyIdentifier" value="DirectReference" />
     <parameter name="signaturePropFile" value="wsstest.properties" />
+    <parameter name="encryptionPropFile" value="wsstest.properties" />
     <parameter name="encryptionKeyIdentifier" value="SKIKeyIdentifier" />
     <parameter name="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
/>    
     <!-- Use the Server's cert/key to encrypt the request -->
@@ -182,6 +185,7 @@
     <parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1In"/>
     <parameter name="action" value="Encrypt Signature Timestamp"/>
     <parameter name="signaturePropFile" value="wsstest.properties" />
+    <parameter name="decryptionPropFile" value="wsstest.properties" />
    </handler>
   </responseFlow>
   </service>

Modified: webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd?rev=1039330&r1=1039329&r2=1039330&view=diff
==============================================================================
--- webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd (original)
+++ webservices/wss4j/trunk/interop/org/apache/ws/axis/oasis/ping/deploy.wsdd Fri Nov 26 12:29:26
2010
@@ -158,6 +158,7 @@
     <parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1In"/>
     <parameter name="action" value="Signature Encrypt Timestamp"/>
     <parameter name="signaturePropFile" value="wsstest.properties" />
+    <parameter name="decryptionPropFile" value="wsstest.properties" />
    </handler>
   </requestFlow>
   <responseFlow>
@@ -169,6 +170,7 @@
       value="org.apache.ws.axis.oasis.PWCallback1Out"/>
     <parameter name="signatureKeyIdentifier" value="DirectReference" />
     <parameter name="signaturePropFile" value="wsstest.properties" />
+    <parameter name="encryptionPropFile" value="wsstest.properties" />
     <parameter name="encryptionKeyIdentifier" value="SKIKeyIdentifier" />
     <parameter name="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
/>    
     <!-- Use the Client's cert/key to encrypt the response -->
@@ -275,6 +277,7 @@
    <handler type="java:org.apache.ws.axis.security.WSDoAllReceiver">
     <parameter name="passwordCallbackClass" value="org.apache.ws.axis.oasis.PWCallback1In"/>
     <parameter name="action" value="Encrypt Signature Timestamp"/>
+    <parameter name="decryptionPropFile" value="wsstest.properties" />
     <parameter name="signaturePropFile" value="wsstest.properties" />
    </handler>
   </requestFlow>
@@ -287,6 +290,7 @@
       value="org.apache.ws.axis.oasis.PWCallback1Out"/>
     <parameter name="signatureKeyIdentifier" value="SKIKeyIdentifier" />
     <parameter name="signaturePropFile" value="wsstest.properties" />
+    <parameter name="encryptionPropFile" value="wsstest.properties" />
     <parameter name="encryptionKeyIdentifier" value="DirectReference" />
     <parameter name="encryptionSymAlgorithm" value="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"
/>    
     <!-- Use the Client's cert/key to encrypt the response -->

Modified: webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client-config.wsdd
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client-config.wsdd?rev=1039330&r1=1039329&r2=1039330&view=diff
==============================================================================
--- webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client-config.wsdd
(original)
+++ webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client-config.wsdd
Fri Nov 26 12:29:26 2010
@@ -10,7 +10,7 @@
     <parameter name="action" value="Signature Encrypt"/>
     <!-- <parameter name="action" value="Encrypt"/> -->
     <parameter name="signaturePropFile" value="crypto.properties" />
-    <!-- <parameter name="encryptionPropFile" value="crypto.properties" /> -->
+    <parameter name="encryptionPropFile" value="crypto.properties" />
     <parameter name="signatureKeyIdentifier" value="DirectReference" />
     <parameter name="encryptionKeyIdentifier" value="X509KeyIdentifier" />
 	<!-- <parameter name="encryptionParts" value="{Content}{http://example.org/paymentv2}CreditCard;{Element}{}UserName"
/> -->
@@ -24,7 +24,7 @@
     <!-- <parameter name="action" value="Signature Encrypt"/> -->
     <!-- <parameter name="action" value="Encrypt"/> -->
     <parameter name="signaturePropFile" value="crypto.properties" />
-    <!-- <parameter name="decryptionPropFile" value="crypto.properties" /> -->
+    <parameter name="decryptionPropFile" value="crypto.properties" />
    </handler>
   </responseFlow>
   

Modified: webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client_deploy.wsdd
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client_deploy.wsdd?rev=1039330&r1=1039329&r2=1039330&view=diff
==============================================================================
--- webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client_deploy.wsdd
(original)
+++ webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/client_deploy.wsdd
Fri Nov 26 12:29:26 2010
@@ -12,7 +12,7 @@
     <parameter name="action" value="Signature Encrypt"/>
     <!-- <parameter name="action" value="Encrypt"/> -->
     <parameter name="signaturePropFile" value="crypto.properties" />
-    <!-- <parameter name="encryptionPropFile" value="crypto.properties" /> -->
+    <parameter name="encryptionPropFile" value="crypto.properties" />
     <parameter name="signatureKeyIdentifier" value="DirectReference" />
     <parameter name="encryptionKeyIdentifier" value="X509KeyIdentifier" />
 	<!-- <parameter name="encryptionParts" value="{Content}{http://example.org/paymentv2}CreditCard;{Element}{}UserName"
/> -->
@@ -26,7 +26,7 @@
     <!-- <parameter name="action" value="Signature Encrypt"/> -->
     <!-- <parameter name="action" value="Encrypt"/> -->
     <parameter name="signaturePropFile" value="crypto.properties" />
-    <!-- <parameter name="decryptionPropFile" value="crypto.properties" /> -->
+    <parameter name="decryptionPropFile" value="crypto.properties" />
    </handler>
   </responseFlow>
  </service>

Modified: webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server-config.wsdd
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server-config.wsdd?rev=1039330&r1=1039329&r2=1039330&view=diff
==============================================================================
--- webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server-config.wsdd
(original)
+++ webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server-config.wsdd
Fri Nov 26 12:29:26 2010
@@ -31,7 +31,7 @@
     <parameter name="action" value="Signature Encrypt"/>
     <!-- <parameter name="action" value="Encrypt"/> -->
     <parameter name="signaturePropFile" value="crypto.properties" />
-    <!-- <parameter name="decryptionPropFile" value="crypto.properties" /> -->
+    <parameter name="decryptionPropFile" value="crypto.properties" />
    </handler>
   </requestFlow>
   <responseFlow>
@@ -43,7 +43,7 @@
     <!-- <parameter name="action" value="Signature Encrypt"/> -->
     <!-- <parameter name="action" value="Encrypt"/> -->
     <parameter name="signaturePropFile" value="crypto.properties" />
-    <!-- <parameter name="encryptionPropFile" value="crypto.properties" /> -->
+    <parameter name="encryptionPropFile" value="crypto.properties" />
     <parameter name="signatureKeyIdentifier" value="DirectReference" />
     <parameter name="encryptionKeyIdentifier" value="X509KeyIdentifier" />
    </handler>

Modified: webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server_deploy.wsdd
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server_deploy.wsdd?rev=1039330&r1=1039329&r2=1039330&view=diff
==============================================================================
--- webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server_deploy.wsdd
(original)
+++ webservices/wss4j/trunk/samples/org/apache/ws/axis/samples/wssec/doall/server_deploy.wsdd
Fri Nov 26 12:29:26 2010
@@ -30,7 +30,7 @@
        <parameter name="action" value="Signature Encrypt"/>
        <!-- <parameter name="action" value="Encrypt"/> -->
        <parameter name="signaturePropFile" value="crypto.properties" />
-       <!-- <parameter name="decryptionPropFile" value="crypto.properties" /> -->
+       <parameter name="decryptionPropFile" value="crypto.properties" />
 	  </handler>
  	</requestFlow>
   <responseFlow>
@@ -42,7 +42,7 @@
     <!-- <parameter name="action" value="Signature Encrypt"/> -->
     <!-- <parameter name="action" value="Encrypt"/> -->
     <parameter name="signaturePropFile" value="crypto.properties" />
-    <!-- <parameter name="encryptionPropFile" value="crypto.properties" /> -->
+    <parameter name="encryptionPropFile" value="crypto.properties" />
     <parameter name="signatureKeyIdentifier" value="DirectReference" />
     <parameter name="encryptionKeyIdentifier" value="X509KeyIdentifier" />
    </handler>

Modified: webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java?rev=1039330&r1=1039329&r2=1039330&view=diff
==============================================================================
--- webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java (original)
+++ webservices/wss4j/trunk/src/org/apache/ws/security/handler/WSHandler.java Fri Nov 26 12:29:26
2010
@@ -496,11 +496,6 @@ public abstract class WSHandler {
                     }
                 }
             }
-        } else if (reqData.getSigCrypto() != null) {
-            //
-            // Default to the signature crypto
-            //
-            crypto = reqData.getSigCrypto();
         }
         
         return crypto;
@@ -694,7 +689,7 @@ public abstract class WSHandler {
         RequestData reqData
     ) throws WSSecurityException {
         return decodeBooleanConfigValue(
-            reqData, WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, true
+            reqData, WSHandlerConstants.ENABLE_SIGNATURE_CONFIRMATION, false
         );
     }
     
@@ -1004,11 +999,6 @@ public abstract class WSHandler {
                     }
                 }
             }
-        } else if (reqData.getSigCrypto() != null) {
-            //
-            // Default to the signature crypto
-            //
-            crypto = reqData.getSigCrypto();
         }
         
         return crypto;

Modified: webservices/wss4j/trunk/test/interop/TestJAXRPCHandler.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/test/interop/TestJAXRPCHandler.java?rev=1039330&r1=1039329&r2=1039330&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/interop/TestJAXRPCHandler.java (original)
+++ webservices/wss4j/trunk/test/interop/TestJAXRPCHandler.java Fri Nov 26 12:29:26 2010
@@ -84,6 +84,8 @@ public class TestJAXRPCHandler extends T
         config.put("passwordCallbackClass", "org.apache.ws.axis.oasis.PWCallback1Out");
         config.put("signatureKeyIdentifier", "DirectReference");
         config.put("signaturePropFile", "wsstest.properties");
+        config.put("encryptionPropFile", "wsstest.properties");
+        config.put("decryptionPropFile", "wsstest.properties");
         config.put("encryptionKeyIdentifier", "SKIKeyIdentifier");
         config.put("encryptionUser", "bob");
         invokeService (config, 3);
@@ -96,6 +98,7 @@ public class TestJAXRPCHandler extends T
         config.put("passwordCallbackClass", "org.apache.ws.axis.oasis.PWCallback1Out");
         config.put("signatureKeyIdentifier", "DirectReference");
         config.put("signaturePropFile", "wsstest.properties");
+        config.put("encryptionPropFile", "wsstest.properties");
         config.put("encryptionKeyIdentifier", "EmbeddedKeyName");
         config.put("encryptionSymAlgorithm", "http://www.w3.org/2001/04/xmlenc#tripledes-cbc");
         config.put("EmbeddedKeyCallbackClass", "org.apache.ws.axis.oasis.PWCallback1Out");
@@ -125,6 +128,8 @@ public class TestJAXRPCHandler extends T
         config.put("passwordCallbackClass", "org.apache.ws.axis.oasis.PWCallback1Out");
         config.put("signatureKeyIdentifier", "DirectReference");
         config.put("signaturePropFile", "wsstest.properties");
+        config.put("encryptionPropFile", "wsstest.properties");
+        config.put("decryptionPropFile", "wsstest.properties");
         config.put("encryptionKeyIdentifier", "SKIKeyIdentifier");
         config.put("encryptionUser", "bob");
         invokeService (config, 6);
@@ -140,6 +145,7 @@ public class TestJAXRPCHandler extends T
         config.put("encryptionKeyIdentifier", "SKIKeyIdentifier");
         config.put("encryptionUser", "bob");
         config.put("encryptionPropFile", "wsstest.properties");
+        config.put("decryptionPropFile", "wsstest.properties");
         config.put("signatureParts", "{}{http://schemas.xmlsoap.org/soap/envelope/}Body;STRTransform");
         invokeService (config, 7);
     }



Mime
View raw message