You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2010/02/25 02:21:10 UTC

svn commit: r916077 - in /cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j: PolicyBasedWss4JInOutTest.java RoundTripTest.java signed_x509_issuer_serial_missing_signed_body.xml signed_x509_issuer_serial_missing_signed_header.xml

Author: dkulp
Date: Thu Feb 25 01:21:10 2010
New Revision: 916077

URL: http://svn.apache.org/viewvc?rev=916077&view=rev
Log:
[CXF-2654] Add missing files and re-enable tests

Added:
    cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml   (with props)
    cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml   (with props)
Modified:
    cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
    cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java

Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java?rev=916077&r1=916076&r2=916077&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java (original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java Thu Feb 25 01:21:10 2010
@@ -95,7 +95,6 @@
     }
     
     @Test
-    @org.junit.Ignore("missing file")
     public void testSignedElementsPolicyWithIncompleteCoverage() throws Exception {
         this.runInInterceptorAndValidate(
                 "signed_x509_issuer_serial_missing_signed_header.xml",
@@ -125,7 +124,6 @@
     }
 
     @Test
-    @org.junit.Ignore("missing file")
     public void testSignedPartsPolicyWithIncompleteCoverage() throws Exception {
         this.runInInterceptorAndValidate(
                 "signed_x509_issuer_serial_missing_signed_body.xml",

Modified: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java?rev=916077&r1=916076&r2=916077&view=diff
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java (original)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/RoundTripTest.java Thu Feb 25 01:21:10 2010
@@ -30,7 +30,6 @@
 import org.apache.ws.security.handler.WSHandlerConstants;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 public class RoundTripTest extends AbstractSecurityTest {
@@ -90,7 +89,6 @@
     }
 
     @Test
-    @Ignore("Seems to randomly hang on Linux")
     public void testEncryptionPlusSig() throws Exception {
         wsIn.setProperty(WSHandlerConstants.ACTION, WSHandlerConstants.ENCRYPT + " "
                                                     + WSHandlerConstants.SIGNATURE);

Added: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml?rev=916077&view=auto
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml (added)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml Thu Feb 25 01:21:10 2010
@@ -0,0 +1,43 @@
+<soapenv:Envelope xmlns:ser="http://blah" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+   <soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><ds:Signature Id="Signature-9" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:SignedInfo>
+<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+<ds:Reference URI="#id-10">
+<ds:Transforms>
+<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+</ds:Transforms>
+<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+<ds:DigestValue>sLqsvlWXRWziGUK7j1LuqHzIGKg=</ds:DigestValue>
+</ds:Reference>
+<ds:Reference URI="#id-8">
+<ds:Transforms>
+<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+</ds:Transforms>
+<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+<ds:DigestValue>TJj4H4XAG1HaH/gPprXOv5zwkXQ=</ds:DigestValue>
+</ds:Reference>
+</ds:SignedInfo>
+<ds:SignatureValue>
+DQ4W/xmahVdPAFqnyFmCjaTqvvJJ5Vn5QI9CnS2AvojUuKrxNfE8s2aiMAd8vpjQj3ACg1gqP8xG
+kGfJvVuKsRQko3ej/KuDZNGT5Jb5ONOECVkG1EDlbcejxECU+BhuVrObB2idmS1gc57ApuGGsLQy
+fe+JAqQ8QseAAqIsgas=
+</ds:SignatureValue>
+<ds:KeyInfo Id="KeyId-B5419464DCB3C8B05A126471035842914">
+<wsse:SecurityTokenReference wsu:Id="STRId-B5419464DCB3C8B05A126471035842915" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"><ds:X509Data>
+<ds:X509IssuerSerial>
+<ds:X509IssuerName>CN=myAlias</ds:X509IssuerName>
+<ds:X509SerialNumber>1181668586</ds:X509SerialNumber>
+</ds:X509IssuerSerial>
+</ds:X509Data></wsse:SecurityTokenReference>
+</ds:KeyInfo>
+</ds:Signature></wsse:Security>
+      <Header wsu:Id="id-10" xmlns="http://www.sdj.pl" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">1234</Header>
+      <Header wsu:Id="id-8" xmlns="http://www.sdj.pl" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">5678</Header>
+   </soapenv:Header>
+   <soapenv:Body>
+     <echo xmlns="http://www.sdj.pl">
+       <in0>A</in0>    
+     </echo>
+   </soapenv:Body>
+</soapenv:Envelope>

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_body.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Added: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml?rev=916077&view=auto
==============================================================================
--- cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml (added)
+++ cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml Thu Feb 25 01:21:10 2010
@@ -0,0 +1,36 @@
+<soapenv:Envelope xmlns:ser="http://blah" xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+   <soapenv:Header><wsse:Security xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"><ds:Signature Id="Signature-5" xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+<ds:SignedInfo>
+<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+<ds:Reference URI="#id-6">
+<ds:Transforms>
+<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+</ds:Transforms>
+<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+<ds:DigestValue>a0+IBfK+SfKXlyyJcIzg+M6OouI=</ds:DigestValue>
+</ds:Reference>
+</ds:SignedInfo>
+<ds:SignatureValue>
+VGURrUkUzHrVxveLRhp7ttaGSY6Aj+LR3k75pLLsFgXDEqSHOO2IsUnAt6cLGAGE/ijKKsip6g+O
+K1AuHQleQLbc/sGyIkRDLLU+slV2s5XTC0x1DeBGFKy3O8D48obEQFnSfb2MpF/mtOarMLGc0BZ0
+J5bPqmDSmsqTvzcC/MY=
+</ds:SignatureValue>
+<ds:KeyInfo Id="KeyId-B5419464DCB3C8B05A12646118281118">
+<wsse:SecurityTokenReference wsu:Id="STRId-B5419464DCB3C8B05A12646118281279" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd"><ds:X509Data>
+<ds:X509IssuerSerial>
+<ds:X509IssuerName>CN=myAlias</ds:X509IssuerName>
+<ds:X509SerialNumber>1181668586</ds:X509SerialNumber>
+</ds:X509IssuerSerial>
+</ds:X509Data></wsse:SecurityTokenReference>
+</ds:KeyInfo>
+</ds:Signature></wsse:Security>
+      <Header wsu:Id="id-6" xmlns="http://www.sdj.pl" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">1234</Header>
+      <Header xmlns="http://www.sdj.pl">5678</Header>
+   </soapenv:Header>
+   <soapenv:Body>
+     <echo xmlns="http://www.sdj.pl">
+       <in0>A</in0>    
+     </echo>
+   </soapenv:Body>
+</soapenv:Envelope>

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: cxf/trunk/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/signed_x509_issuer_serial_missing_signed_header.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml