Author: coheigea Date: Fri Sep 28 13:13:53 2012 New Revision: 1391447 URL: http://svn.apache.org/viewvc?rev=1391447&view=rev Log: Merged revisions 1391445 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.5.x-fixes
........ r1391445 | coheigea | 2012-09-28 14:11:09 +0100 (Fri, 28 Sep 2012) | 18 lines Merged revisions 1391442 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1391442 | coheigea | 2012-09-28 14:06:58 +0100 (Fri, 28 Sep 2012) | 10 lines Merged revisions 1391438 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1391438 | coheigea | 2012-09-28 14:01:23 +0100 (Fri, 28 Sep 2012) | 2 lines Fixing WS-SecurityPolicy unit tests to properly check that some policies were not asserted ........ ........ ........ Added: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy3.xml - copied, changed from r1391130, cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy.xml Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/content_encrypted_elements_policy.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy2.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_body.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_and_body.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_namespace_only.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_parts_policy_header_and_body_encrypted.xml Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractPolicySecurityTest.java Fri Sep 28 13:13:53 2012 @@ -40,6 +40,7 @@ import javax.xml.xpath.XPathFactory; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; + import org.apache.cxf.Bus; import org.apache.cxf.BusException; import org.apache.cxf.binding.Binding; @@ -201,6 +202,21 @@ public abstract class AbstractPolicySecu } } + /* + // Check that the things that weren't asserted are expected + Set<QName> assertions = aim.keySet(); + for (QName assertionType : assertions) { + Collection<AssertionInfo> ais = aim.get(assertionType); + for (AssertionInfo ai : ais) { + if (!ai.isAsserted() && ((notAssertedInAssertions == null) + || (!notAssertedInAssertions.contains(assertionType)))) { + throw new Exception("Assertion: " + assertionType + " is not asserted: " + + ai.getErrorMessage()); + } + } + } + */ + if (notAssertedInAssertions != null) { for (QName assertionType : notAssertedInAssertions) { Collection<AssertionInfo> ais = aim.get(assertionType); Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWss4JInOutTest.java Fri Sep 28 13:13:53 2012 @@ -202,6 +202,12 @@ public class PolicyBasedWss4JInOutTest e SP12Constants.ENCRYPTED_ELEMENTS, null, CoverageType.ENCRYPTED); + this.runInInterceptorAndValidate( + "encrypted_body_content.xml", + "encrypted_elements_policy3.xml", + Arrays.asList(SP12Constants.ENCRYPTED_ELEMENTS), + Arrays.asList(SP12Constants.SYMMETRIC_BINDING, SP12Constants.PROTECTION_TOKEN), + Arrays.asList(CoverageType.ENCRYPTED)); this.runAndValidate( "wsse-request-clean.xml", Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/saml/PolicyBasedSamlTest.java Fri Sep 28 13:13:53 2012 @@ -40,7 +40,7 @@ public class PolicyBasedSamlTest extends "wsse-request-clean.xml", "saml_assertion_policy.xml", null, - Arrays.asList(SP12Constants.SAML_TOKEN), + Arrays.asList(SP12Constants.SAML_TOKEN, SP12Constants.SUPPORTING_TOKENS), new ArrayList<CoverageType>()); // // This should pass as the policy wants a SAML1 assertion and it is in the request @@ -72,7 +72,7 @@ public class PolicyBasedSamlTest extends "wsse-request-clean.xml", "saml2_assertion_policy.xml", null, - Arrays.asList(SP12Constants.SAML_TOKEN), + Arrays.asList(SP12Constants.SAML_TOKEN, SP12Constants.SUPPORTING_TOKENS), new ArrayList<CoverageType>()); // // This should pass as the policy wants a SAML2 assertion and it is in the request Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/content_encrypted_elements_policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/content_encrypted_elements_policy.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/content_encrypted_elements_policy.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/content_encrypted_elements_policy.xml Fri Sep 28 13:13:53 2012 @@ -19,7 +19,7 @@ </sp:ProtectionToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic128 /> + <sp:Basic128Rsa15 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy.xml Fri Sep 28 13:13:53 2012 @@ -19,7 +19,7 @@ </sp:ProtectionToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic128 /> + <sp:Basic128Rsa15 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy2.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy2.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy2.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy2.xml Fri Sep 28 13:13:53 2012 @@ -19,7 +19,7 @@ </sp:ProtectionToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic128 /> + <sp:Basic128Rsa15 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout> Copied: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy3.xml (from r1391130, cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy.xml) URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy3.xml?p2=cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy3.xml&p1=cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_elements_policy.xml&r1=1391130&r2=1391447&rev=1391447&view=diff ============================================================================== (empty) Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_body.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_body.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_body.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_body.xml Fri Sep 28 13:13:53 2012 @@ -18,7 +18,7 @@ </sp:ProtectionToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic128 /> + <sp:Basic128Rsa15 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header.xml Fri Sep 28 13:13:53 2012 @@ -18,7 +18,7 @@ </sp:ProtectionToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic128 /> + <sp:Basic128Rsa15 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_and_body.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_and_body.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_and_body.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_and_body.xml Fri Sep 28 13:13:53 2012 @@ -18,7 +18,7 @@ </sp:ProtectionToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic128 /> + <sp:Basic128Rsa15 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_namespace_only.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_namespace_only.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_namespace_only.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/encrypted_parts_policy_header_namespace_only.xml Fri Sep 28 13:13:53 2012 @@ -18,7 +18,7 @@ </sp:ProtectionToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic128 /> + <sp:Basic128Rsa15 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_direct_ref_complement.xml Fri Sep 28 13:13:53 2012 @@ -32,6 +32,7 @@ <sp:Strict /> </wsp:Policy> </sp:Layout> + <sp:IncludeTimestamp /> <sp:AlgorithmSuite> <wsp:Policy> <sp:Basic256 /> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/protect_token_policy_asym_x509_issuer_serial_complement.xml Fri Sep 28 13:13:53 2012 @@ -9,7 +9,7 @@ <wsp:Policy> <sp:InitiatorToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Always";> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never";> <wsp:Policy> <sp:WssX509V3Token10 /> <sp:RequireEmbeddedTokenReference /> @@ -19,7 +19,7 @@ </sp:InitiatorToken> <sp:RecipientToken> <wsp:Policy> - <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Always";> + <sp:X509Token sp:IncludeToken="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702/IncludeToken/Never";> <wsp:Policy> <sp:WssX509V3Token10 /> <sp:RequireEmbeddedTokenReference /> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/saml/saml2_assertion_policy.xml Fri Sep 28 13:13:53 2012 @@ -5,7 +5,7 @@ xmlns:ser="http://www.sdj.pl";> <wsp:ExactlyOne> <wsp:All> - <sp:SignedSupportingTokens + <sp:SupportingTokens xmlns:sp="http://docs.oasis-open.org/ws-sx/ws-securitypolicy/200702";> <wsp:Policy> <sp:SamlToken @@ -15,7 +15,7 @@ </wsp:Policy> </sp:SamlToken> </wsp:Policy> - </sp:SignedSupportingTokens> + </sp:SupportingTokens> </wsp:All> </wsp:ExactlyOne> </wsp:Policy> Modified: cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_parts_policy_header_and_body_encrypted.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_parts_policy_header_and_body_encrypted.xml?rev=1391447&r1=1391446&r2=1391447&view=diff ============================================================================== --- cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_parts_policy_header_and_body_encrypted.xml (original) +++ cxf/branches/2.4.x-fixes/rt/ws/security/src/test/resources/org/apache/cxf/ws/security/wss4j/signed_parts_policy_header_and_body_encrypted.xml Fri Sep 28 13:13:53 2012 @@ -28,7 +28,7 @@ </sp:RecipientToken> <sp:AlgorithmSuite> <wsp:Policy> - <sp:Basic256 /> + <sp:Basic128Rsa15 /> </wsp:Policy> </sp:AlgorithmSuite> <sp:Layout>
