Author: coheigea Date: Tue Mar 12 16:10:00 2013 New Revision: 1455595 URL: http://svn.apache.org/r1455595 Log: Merged revisions 1455590 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
........ r1455590 | coheigea | 2013-03-12 15:57:43 +0000 (Tue, 12 Mar 2013) | 10 lines Merged revisions 1455588 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1455588 | coheigea | 2013-03-12 15:52:00 +0000 (Tue, 12 Mar 2013) | 2 lines Some minor security fixes ........ ........ Conflicts: rt/ws/security/src/main/java/org/apache/cxf/ws/security/policy/builders/SamlTokenBuilder.java Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java?rev=1455595&r1=1455594&r2=1455595&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java Tue Mar 12 16:10:00 2013 @@ -576,7 +576,6 @@ public class PolicyBasedWSS4JInIntercept } // relatively irrelevant stuff from a verification standpoint - assertPolicy(aim, SP12Constants.LAYOUT); assertPolicy(aim, SP12Constants.WSS10); assertPolicy(aim, SP12Constants.TRUST_13); assertPolicy(aim, SP11Constants.TRUST_10); Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java?rev=1455595&r1=1455594&r2=1455595&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AbstractBindingPolicyValidator.java Tue Mar 12 16:10:00 2013 @@ -190,11 +190,11 @@ public abstract class AbstractBindingPol boolean timestampLast = layout.getValue() == SPConstants.Layout.LaxTimestampLast; if (!validateLayout(timestampFirst, timestampLast, results)) { String error = "Layout does not match the requirements"; - notAssertPolicy(aim, SP12Constants.LAYOUT, error); + notAssertPolicy(aim, layout, error); ai.setNotAsserted(error); return false; } - assertPolicy(aim, SP12Constants.LAYOUT); + assertPolicy(aim, layout); // Check the EntireHeaderAndBodySignatures property if (binding.isEntireHeadersAndBodySignatures() @@ -373,6 +373,17 @@ public abstract class AbstractBindingPol } } + protected void notAssertPolicy(AssertionInfoMap aim, Assertion token, String msg) { + Collection<AssertionInfo> ais = aim.get(token.getName()); + if (ais != null && !ais.isEmpty()) { + for (AssertionInfo ai : ais) { + if (ai.getAssertion() == token) { + ai.setNotAsserted(msg); + } + } + } + } + protected boolean assertPolicy(AssertionInfoMap aim, QName q) { Collection<AssertionInfo> ais = aim.get(q); if (ais != null && !ais.isEmpty()) { Modified: cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java?rev=1455595&r1=1455594&r2=1455595&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java (original) +++ cxf/branches/2.5.x-fixes/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java Tue Mar 12 16:10:00 2013 @@ -91,11 +91,11 @@ public class TransportBindingPolicyValid boolean timestampLast = layout.getValue() == SPConstants.Layout.LaxTimestampLast; if (!validateLayout(timestampFirst, timestampLast, results)) { String error = "Layout does not match the requirements"; - notAssertPolicy(aim, SP12Constants.LAYOUT, error); + notAssertPolicy(aim, layout, error); ai.setNotAsserted(error); continue; } - assertPolicy(aim, SP12Constants.LAYOUT); + assertPolicy(aim, layout); } // We don't need to check these policies for the Transport binding
