You are viewing a plain text version of this content. The canonical link for it is here.
Posted to wss4j-dev@ws.apache.org by we...@apache.org on 2006/02/11 10:12:17 UTC

svn commit: r376957 - in /webservices/wss4j/trunk/test/policy: SecurityPolicyBindingsAsymmTest.xml WSSPolicyTesterAsymm.java

Author: werner
Date: Sat Feb 11 01:12:14 2006
New Revision: 376957

URL: http://svn.apache.org/viewcvs?rev=376957&view=rev
Log:
SupportingTokens at top level, not part of binding.

Modified:
    webservices/wss4j/trunk/test/policy/SecurityPolicyBindingsAsymmTest.xml
    webservices/wss4j/trunk/test/policy/WSSPolicyTesterAsymm.java

Modified: webservices/wss4j/trunk/test/policy/SecurityPolicyBindingsAsymmTest.xml
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/test/policy/SecurityPolicyBindingsAsymmTest.xml?rev=376957&r1=376956&r2=376957&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/policy/SecurityPolicyBindingsAsymmTest.xml (original)
+++ webservices/wss4j/trunk/test/policy/SecurityPolicyBindingsAsymmTest.xml Sat Feb 11 01:12:14 2006
@@ -37,16 +37,6 @@
     <sp:EncryptBeforeSigning />
     <sp:EncryptSignature />
     <sp:ProtectTokens />
-    <sp:SignedSupportingTokens>
-      <wsp:Policy>
-        <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once" />
-      </wsp:Policy>
-    </sp:SignedSupportingTokens>
-    <sp:SignedEndorsingSupportingTokens>
-      <wsp:Policy>
-        <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once" />
-      </wsp:Policy>
-    </sp:SignedEndorsingSupportingTokens>
   </wsp:Policy> 
 </sp:AsymmetricBinding>
 <sp:Wss11> 
@@ -54,6 +44,30 @@
     <sp:RequireSignatureConfirmation />
   </wsp:Policy>
 </sp:Wss11>
+<sp:SignedSupportingTokens>
+  <wsp:Policy>
+    <sp:UsernameToken sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Once" />
+    <sp:AlgorithmSuite>
+      <wsp:Policy>
+        <sp:Basic256 />
+      </wsp:Policy>
+    </sp:AlgorithmSuite>
+  </wsp:Policy>
+</sp:SignedSupportingTokens>
+<sp:SignedEndorsingSupportingTokens>
+  <wsp:Policy>
+    <sp:X509Token sp:IncludeToken="http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/Always" >
+      <wsp:Policy>
+        <sp:RequireIssuerSerialReference />
+      </wsp:Policy>
+    </sp:X509Token>
+    <sp:AlgorithmSuite>
+      <wsp:Policy>
+        <sp:Basic256 />
+      </wsp:Policy>
+    </sp:AlgorithmSuite>
+  </wsp:Policy>
+</sp:SignedEndorsingSupportingTokens>
 </wsp:Policy>
 
  

Modified: webservices/wss4j/trunk/test/policy/WSSPolicyTesterAsymm.java
URL: http://svn.apache.org/viewcvs/webservices/wss4j/trunk/test/policy/WSSPolicyTesterAsymm.java?rev=376957&r1=376956&r2=376957&view=diff
==============================================================================
--- webservices/wss4j/trunk/test/policy/WSSPolicyTesterAsymm.java (original)
+++ webservices/wss4j/trunk/test/policy/WSSPolicyTesterAsymm.java Sat Feb 11 01:12:14 2006
@@ -150,7 +150,10 @@
 			String[] files = new String[2];
 			files[0] = "test/policy/SecurityPolicyBindingsAsymmTest.xml";
 			files[1] = "test/policy/SecurityPolicyMsgTest.xml";
-			processor.go(files);
+			if (!processor.go(files)) {
+			    System.out.println("Cannot parse the policy files.");
+                System.exit(1);
+            }
 
 			RootPolicyEngineData rootPolicyEngineData = (RootPolicyEngineData) processor.secProcessorContext
 					.popPolicyEngineData();
@@ -399,6 +402,7 @@
 		secEngine.processSecurityHeader(doc, null, this, crypto, cryptoSKI);
 		SOAPUtil.updateSOAPMessage(doc, message);
 		String decryptedString = message.getSOAPPartAsString();
+        log.debug(decryptedString);
 		assertTrue(decryptedString.indexOf("LogTestService2") > 0 ? true
 				: false);
 	}



---------------------------------------------------------------------
To unsubscribe, e-mail: wss4j-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: wss4j-dev-help@ws.apache.org