cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1558030 - in /cxf/trunk: rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/ services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/ services/sts/systests/basic/src/test/java/org/apache/cxf...
Date Tue, 14 Jan 2014 13:17:13 GMT
Author: coheigea
Date: Tue Jan 14 13:17:12 2014
New Revision: 1558030

URL: http://svn.apache.org/r1558030
Log:
Fixed some more WS-SecurityPolicy streaming tests

Modified:
    cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
    cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
    cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
    cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
    cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java

Modified: cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java?rev=1558030&r1=1558029&r2=1558030&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
(original)
+++ cxf/trunk/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyhandlers/StaxSymmetricBindingHandler.java
Tue Jan 14 13:17:12 2014
@@ -241,6 +241,10 @@ public class StaxSymmetricBindingHandler
                     SecurePart part = 
                         new SecurePart(new QName(WSSConstants.NS_DSIG, "Signature"), Modifier.Element);
                     encrParts.add(part);
+                    if (signatureConfirmationAdded) {
+                        part = new SecurePart(WSSConstants.TAG_wsse11_SignatureConfirmation,
Modifier.Element);
+                        encrParts.add(part);
+                    }
                     assertPolicy(
                         new QName(sbinding.getName().getNamespaceURI(), SPConstants.ENCRYPT_SIGNATURE));
                 }
@@ -387,6 +391,10 @@ public class StaxSymmetricBindingHandler
                 SecurePart part = 
                     new SecurePart(new QName(WSSConstants.NS_DSIG, "Signature"), Modifier.Element);
                 enc.add(part);
+                if (signatureConfirmationAdded) {
+                    part = new SecurePart(WSSConstants.TAG_wsse11_SignatureConfirmation,
Modifier.Element);
+                    enc.add(part);
+                }
                 assertPolicy(
                     new QName(sbinding.getName().getNamespaceURI(), SPConstants.ENCRYPT_SIGNATURE));
             }

Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java?rev=1558030&r1=1558029&r2=1558030&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java
Tue Jan 14 13:17:12 2014
@@ -194,11 +194,7 @@ public class SymmetricBindingTest extend
             SecurityTestUtil.enableStreaming(symmetricSaml1Port);
         }
 
-        // TODO Streaming - The encrypted issued token is placed under the ReferenceList
-        // and hence an error is thrown on the receiving side
-        if (!test.isStreaming()) {
-            doubleIt(symmetricSaml1Port, 25);
-        }
+        doubleIt(symmetricSaml1Port, 25);
         
         ((java.io.Closeable)symmetricSaml1Port).close();
         bus.shutdown(true);

Modified: cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java?rev=1558030&r1=1558029&r2=1558030&view=diff
==============================================================================
--- cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
(original)
+++ cxf/trunk/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509_symmetric/X509SymmetricBindingTest.java
Tue Jan 14 13:17:12 2014
@@ -196,7 +196,7 @@ public class X509SymmetricBindingTest ex
         }
         
         // TODO Streaming client is not including a separate main Signature
-        if (!(test.isStreaming() && STAX_PORT.equals(test.getPort()))) {
+        if (!test.isStreaming()) {
             doubleIt(symmetricSaml2Port, 30);
         }
         

Modified: cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java?rev=1558030&r1=1558029&r2=1558030&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
(original)
+++ cxf/trunk/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java
Tue Jan 14 13:17:12 2014
@@ -411,7 +411,9 @@ public class SamlTokenTest extends Abstr
         }
         
         // TODO Endorsing SAML not supported Streaming
-        // TODO Problem with policy validation on the StAX Server side
+        // TODO WSS-490 Problem with policy validation on the StAX Server side
+        // Remove "PORT.equals(test.getPort())" as per below to reproduce
+        // if (!test.isStreaming()) {
         if (!test.isStreaming() && PORT.equals(test.getPort())) {
             samlPort.doubleIt(25);
         }

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java?rev=1558030&r1=1558029&r2=1558030&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
Tue Jan 14 13:17:12 2014
@@ -122,12 +122,10 @@ public class WSSCTest extends AbstractBu
             // {new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
PORT, true)},
             {new TestParam("AC_IPingService", PORT, true)},
             {new TestParam("ADC_IPingService", PORT, true)},
-            // TODO Error with "EncryptBeforeSigning" ordering.
-            // {new TestParam("ADC-ES_IPingService", PORT, true)},
+            {new TestParam("ADC-ES_IPingService", PORT, true)},
             {new TestParam("_A_IPingService", PORT, true)},
             {new TestParam("_AD_IPingService", PORT, true)},
-            // TODO Error with "EncryptBeforeSigning" ordering.
-            // {new TestParam("_AD-ES_IPingService", PORT, true)},
+            {new TestParam("_AD-ES_IPingService", PORT, true)},
             {new TestParam("UXC_IPingService", PORT, true)},
             {new TestParam("UXDC_IPingService", PORT, true)},
             {new TestParam("UXDC-SEES_IPingService", PORT, true)},
@@ -147,7 +145,7 @@ public class WSSCTest extends AbstractBu
             // {new TestParam("_XD-SEES_IPingService", PORT, true)},
             // {new TestParam("_XD-ES_IPingService", PORT, true)},
 
-            // TODO Endorsing derived keys not supported.
+            // TODO StAX Policy Validation error caused by incorrect DOM message
             // {new TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",

             //               STAX_PORT, false)},
             {new TestParam("AC_IPingService", STAX_PORT, false)},
@@ -178,12 +176,10 @@ public class WSSCTest extends AbstractBu
             //               STAX_PORT, true)},
             {new TestParam("AC_IPingService", STAX_PORT, true)},
             {new TestParam("ADC_IPingService", STAX_PORT, true)},
-            // TODO Error with "EncryptBeforeSigning" ordering.
-            // {new TestParam("ADC-ES_IPingService", STAX_PORT, true)},
+            {new TestParam("ADC-ES_IPingService", STAX_PORT, true)},
             {new TestParam("_A_IPingService", STAX_PORT, true)},
             {new TestParam("_AD_IPingService", STAX_PORT, true)},
-            // TODO Error with "EncryptBeforeSigning" ordering.
-            // {new TestParam("_AD-ES_IPingService", STAX_PORT, true)},
+            {new TestParam("_AD-ES_IPingService", STAX_PORT, true)},
             {new TestParam("UXC_IPingService", STAX_PORT, true)},
             {new TestParam("UXDC_IPingService", STAX_PORT, true)},
             {new TestParam("UXDC-SEES_IPingService", STAX_PORT, true)},

Modified: cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
URL: http://svn.apache.org/viewvc/cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java?rev=1558030&r1=1558029&r2=1558030&view=diff
==============================================================================
--- cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
(original)
+++ cxf/trunk/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec11/WSSecurity112Test.java
Tue Jan 14 13:17:12 2014
@@ -124,8 +124,7 @@ public class WSSecurity112Test extends W
                 {new TestParam("X-TripleDES", StaxServer12.PORT, false)},
                 {new TestParam("XD", StaxServer12.PORT, false)},
                 {new TestParam("XD-ES", StaxServer12.PORT, false)},
-                // TODO Endorsing derived streaming not working 
-                // {new TestParam("XD-SEES", StaxServer12.PORT, false)},
+                {new TestParam("XD-SEES", StaxServer12.PORT, false)},
             });
         } else {
             return Arrays.asList(new TestParam[][] {
@@ -139,8 +138,7 @@ public class WSSecurity112Test extends W
                 {new TestParam("X-NoTimestamp", StaxServer12Restricted.PORT, false)},
                 {new TestParam("XD", StaxServer12Restricted.PORT, false)},
                 {new TestParam("XD-ES", StaxServer12Restricted.PORT, false)},
-                // TODO Endorsing derived streaming not working 
-                // {new TestParam("XD-SEES", StaxServer12Restricted.PORT, false)},
+                {new TestParam("XD-SEES", StaxServer12Restricted.PORT, false)},
             });
         }
     }



Mime
View raw message