You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by co...@apache.org on 2015/03/20 19:49:12 UTC
[1/2] cxf git commit: More policy validation work
Repository: cxf
Updated Branches:
refs/heads/master cc9222b45 -> eacd93f72
More policy validation work
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/eacd93f7
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/eacd93f7
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/eacd93f7
Branch: refs/heads/master
Commit: eacd93f72c78bd28e9a3222ddfd4f0c33af6b8ec
Parents: a16abff
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Mar 20 17:34:05 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Mar 20 18:49:00 2015 +0000
----------------------------------------------------------------------
.../wss4j/PolicyBasedWSS4JInInterceptor.java | 77 ++++++++------------
.../AlgorithmSuitePolicyValidator.java | 6 +-
.../AsymmetricBindingPolicyValidator.java | 6 +-
.../ConcreteSupportingTokenPolicyValidator.java | 6 +-
.../EncryptedTokenPolicyValidator.java | 6 +-
.../EndorsingEncryptedTokenPolicyValidator.java | 6 +-
.../EndorsingTokenPolicyValidator.java | 6 +-
.../IssuedTokenPolicyValidator.java | 10 +--
.../KerberosTokenPolicyValidator.java | 8 +-
.../policyvalidators/LayoutPolicyValidator.java | 6 +-
.../SamlTokenPolicyValidator.java | 6 +-
.../SecurityContextTokenPolicyValidator.java | 6 +-
.../SecurityPolicyValidator.java | 4 +-
.../SignedEncryptedTokenPolicyValidator.java | 6 +-
...dEndorsingEncryptedTokenPolicyValidator.java | 6 +-
.../SignedEndorsingTokenPolicyValidator.java | 6 +-
.../SignedTokenPolicyValidator.java | 6 +-
.../SymmetricBindingPolicyValidator.java | 6 +-
.../TransportBindingPolicyValidator.java | 6 +-
.../UsernameTokenPolicyValidator.java | 6 +-
.../policyvalidators/WSS11PolicyValidator.java | 5 +-
.../X509TokenPolicyValidator.java | 6 +-
22 files changed, 75 insertions(+), 131 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
index 8dd7243..f417a5e 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/PolicyBasedWSS4JInInterceptor.java
@@ -672,17 +672,9 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
}
parameters.setTimestampElement(timestamp);
- if (!checkTokenCoverage(parameters)) {
- LOG.fine("Incoming request failed token policy validation");
- }
-
- if (!checkBindingCoverage(parameters)) {
- LOG.fine("Incoming request failed binding policy validation");
- }
-
- if (!checkSupportingTokenCoverage(parameters)) {
- LOG.fine("Incoming request failed supporting token policy validation");
- }
+ checkTokenCoverage(parameters);
+ checkBindingCoverage(parameters);
+ checkSupportingTokenCoverage(parameters);
super.doResults(msg, actor, soapHeader, soapBody, results, utWithCallbacks);
}
@@ -704,10 +696,10 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
//
boolean check = true;
if (!isTransportBinding(aim, msg)) {
- check &= assertTokens(
+ assertTokens(
aim, SPConstants.SIGNED_PARTS, signed, msg, soapHeader, soapBody, CoverageType.SIGNED
);
- check &= assertTokens(
+ assertTokens(
aim, SPConstants.ENCRYPTED_PARTS, encrypted, msg, soapHeader, soapBody,
CoverageType.ENCRYPTED
);
@@ -719,123 +711,114 @@ public class PolicyBasedWSS4JInInterceptor extends WSS4JInInterceptor {
final XPathFactory factory = XPathFactory.newInstance();
final XPath xpath = factory.newXPath();
- check &= assertXPathTokens(aim, SPConstants.SIGNED_ELEMENTS, signed, soapEnvelope,
+ assertXPathTokens(aim, SPConstants.SIGNED_ELEMENTS, signed, soapEnvelope,
CoverageType.SIGNED, CoverageScope.ELEMENT, xpath);
- check &= assertXPathTokens(aim, SPConstants.ENCRYPTED_ELEMENTS, encrypted, soapEnvelope,
+ assertXPathTokens(aim, SPConstants.ENCRYPTED_ELEMENTS, encrypted, soapEnvelope,
CoverageType.ENCRYPTED, CoverageScope.ELEMENT, xpath);
- check &= assertXPathTokens(aim, SPConstants.CONTENT_ENCRYPTED_ELEMENTS, encrypted,
+ assertXPathTokens(aim, SPConstants.CONTENT_ENCRYPTED_ELEMENTS, encrypted,
soapEnvelope, CoverageType.ENCRYPTED, CoverageScope.CONTENT, xpath);
}
- check &= assertHeadersExists(aim, msg, soapHeader);
+ assertHeadersExists(aim, msg, soapHeader);
return check;
}
/**
* Check the token coverage
*/
- private boolean checkTokenCoverage(PolicyValidatorParameters parameters) {
+ private void checkTokenCoverage(PolicyValidatorParameters parameters) {
- boolean check = true;
AssertionInfoMap aim = parameters.getAssertionInfoMap();
Collection<AssertionInfo> ais =
PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.X509_TOKEN);
SecurityPolicyValidator x509Validator = new X509TokenPolicyValidator();
- check &= x509Validator.validatePolicies(parameters, ais);
+ x509Validator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.USERNAME_TOKEN);
SecurityPolicyValidator utValidator = new UsernameTokenPolicyValidator();
- check &= utValidator.validatePolicies(parameters, ais);
+ utValidator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.SAML_TOKEN);
SecurityPolicyValidator samlValidator = new SamlTokenPolicyValidator();
- check &= samlValidator.validatePolicies(parameters, ais);
+ samlValidator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.SECURITY_CONTEXT_TOKEN);
SecurityPolicyValidator sctValidator = new SecurityContextTokenPolicyValidator();
- check &= sctValidator.validatePolicies(parameters, ais);
+ sctValidator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.WSS11);
SecurityPolicyValidator wss11Validator = new WSS11PolicyValidator();
- check &= wss11Validator.validatePolicies(parameters, ais);
-
- return check;
+ wss11Validator.validatePolicies(parameters, ais);
}
/**
* Check the binding coverage
*/
- private boolean checkBindingCoverage(PolicyValidatorParameters parameters) {
- boolean check = true;
+ private void checkBindingCoverage(PolicyValidatorParameters parameters) {
AssertionInfoMap aim = parameters.getAssertionInfoMap();
Collection<AssertionInfo> ais =
PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.TRANSPORT_BINDING);
SecurityPolicyValidator transportValidator = new TransportBindingPolicyValidator();
- check &= transportValidator.validatePolicies(parameters, ais);
+ transportValidator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.SYMMETRIC_BINDING);
SecurityPolicyValidator symmetricValidator = new SymmetricBindingPolicyValidator();
- check &= symmetricValidator.validatePolicies(parameters, ais);
+ symmetricValidator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.ASYMMETRIC_BINDING);
SecurityPolicyValidator asymmetricValidator = new AsymmetricBindingPolicyValidator();
- check &= asymmetricValidator.validatePolicies(parameters, ais);
+ asymmetricValidator.validatePolicies(parameters, ais);
// Check AlgorithmSuite + Layout that might not be tied to a binding
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.ALGORITHM_SUITE);
SecurityPolicyValidator algorithmSuiteValidator = new AlgorithmSuitePolicyValidator();
- check &= algorithmSuiteValidator.validatePolicies(parameters, ais);
+ algorithmSuiteValidator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.LAYOUT);
LayoutPolicyValidator layoutValidator = new LayoutPolicyValidator();
- check &= layoutValidator.validatePolicies(parameters, ais);
-
- return check;
+ layoutValidator.validatePolicies(parameters, ais);
}
/**
* Check the supporting token coverage
*/
- private boolean checkSupportingTokenCoverage(PolicyValidatorParameters parameters) {
- boolean check = true;
+ private void checkSupportingTokenCoverage(PolicyValidatorParameters parameters) {
AssertionInfoMap aim = parameters.getAssertionInfoMap();
Collection<AssertionInfo> ais =
PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.SUPPORTING_TOKENS);
SecurityPolicyValidator validator = new ConcreteSupportingTokenPolicyValidator();
- check &= validator.validatePolicies(parameters, ais);
+ validator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.SIGNED_SUPPORTING_TOKENS);
validator = new SignedTokenPolicyValidator();
- check &= validator.validatePolicies(parameters, ais);
+ validator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.ENDORSING_SUPPORTING_TOKENS);
validator = new EndorsingTokenPolicyValidator();
- check &= validator.validatePolicies(parameters, ais);
+ validator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.SIGNED_ENDORSING_SUPPORTING_TOKENS);
validator = new SignedEndorsingTokenPolicyValidator();
- check &= validator.validatePolicies(parameters, ais);
+ validator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.SIGNED_ENCRYPTED_SUPPORTING_TOKENS);
validator = new SignedEncryptedTokenPolicyValidator();
- check &= validator.validatePolicies(parameters, ais);
+ validator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.ENCRYPTED_SUPPORTING_TOKENS);
validator = new EncryptedTokenPolicyValidator();
- check &= validator.validatePolicies(parameters, ais);
+ validator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.ENDORSING_ENCRYPTED_SUPPORTING_TOKENS);
validator = new EndorsingEncryptedTokenPolicyValidator();
- check &= validator.validatePolicies(parameters, ais);
+ validator.validatePolicies(parameters, ais);
ais = PolicyUtils.getAllAssertionsByLocalname(aim, SPConstants.SIGNED_ENDORSING_ENCRYPTED_SUPPORTING_TOKENS);
validator = new SignedEndorsingEncryptedTokenPolicyValidator();
- check &= validator.validatePolicies(parameters, ais);
-
- return check;
+ validator.validatePolicies(parameters, ais);
}
private boolean assertHeadersExists(AssertionInfoMap aim, SoapMessage msg, Node header)
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
index f7e54ba..b8ca765 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
@@ -62,9 +62,9 @@ public class AlgorithmSuitePolicyValidator extends AbstractSecurityPolicyValidat
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
AlgorithmSuite algorithmSuite = (AlgorithmSuite)ai.getAssertion();
ai.setAsserted(true);
@@ -84,8 +84,6 @@ public class AlgorithmSuitePolicyValidator extends AbstractSecurityPolicyValidat
ai.setNotAsserted("Error in validating AlgorithmSuite policy");
}
}
-
- return true;
}
private boolean validatePolicy(
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java
index 26cd466..6c86faf 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AsymmetricBindingPolicyValidator.java
@@ -58,9 +58,9 @@ public class AsymmetricBindingPolicyValidator extends AbstractBindingPolicyValid
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
boolean hasDerivedKeys = false;
for (WSSecurityEngineResult result : parameters.getResults()) {
Integer actInt = (Integer)result.get(WSSecurityEngineResult.TAG_ACTION);
@@ -91,8 +91,6 @@ public class AsymmetricBindingPolicyValidator extends AbstractBindingPolicyValid
continue;
}
}
-
- return true;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/ConcreteSupportingTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/ConcreteSupportingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/ConcreteSupportingTokenPolicyValidator.java
index c78706a..89517d5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/ConcreteSupportingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/ConcreteSupportingTokenPolicyValidator.java
@@ -56,9 +56,9 @@ public class ConcreteSupportingTokenPolicyValidator extends AbstractSupportingTo
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SupportingTokens binding = (SupportingTokens)ai.getAssertion();
ai.setAsserted(true);
@@ -112,8 +112,6 @@ public class ConcreteSupportingTokenPolicyValidator extends AbstractSupportingTo
}
}
}
-
- return true;
}
protected boolean isSigned() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java
index 46eacb2..4a52304 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EncryptedTokenPolicyValidator.java
@@ -54,9 +54,9 @@ public class EncryptedTokenPolicyValidator extends AbstractSupportingTokenPolicy
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SupportingTokens binding = (SupportingTokens)ai.getAssertion();
ai.setAsserted(true);
@@ -110,8 +110,6 @@ public class EncryptedTokenPolicyValidator extends AbstractSupportingTokenPolicy
}
}
}
-
- return true;
}
protected boolean isSigned() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java
index d8b0ff8..9e0ca22 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingEncryptedTokenPolicyValidator.java
@@ -58,9 +58,9 @@ public class EndorsingEncryptedTokenPolicyValidator extends AbstractSupportingTo
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SupportingTokens binding = (SupportingTokens)ai.getAssertion();
ai.setAsserted(true);
@@ -118,8 +118,6 @@ public class EndorsingEncryptedTokenPolicyValidator extends AbstractSupportingTo
}
}
}
-
- return true;
}
protected boolean isSigned() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java
index 9acf13d..354ec8b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/EndorsingTokenPolicyValidator.java
@@ -57,9 +57,9 @@ public class EndorsingTokenPolicyValidator extends AbstractSupportingTokenPolicy
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SupportingTokens binding = (SupportingTokens)ai.getAssertion();
ai.setAsserted(true);
@@ -116,8 +116,6 @@ public class EndorsingTokenPolicyValidator extends AbstractSupportingTokenPolicy
}
}
}
-
- return true;
}
protected boolean isSigned() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java
index 401a63e..c41c679 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/IssuedTokenPolicyValidator.java
@@ -70,9 +70,9 @@ public class IssuedTokenPolicyValidator extends AbstractSamlPolicyValidator {
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters,
+ public void validatePolicies(PolicyValidatorParameters parameters,
Collection<AssertionInfo> ais) {
List<WSSecurityEngineResult> samlResults = parameters.getSamlResults();
if (samlResults != null) {
@@ -83,7 +83,7 @@ public class IssuedTokenPolicyValidator extends AbstractSamlPolicyValidator {
// Store token on the security context
SecurityToken token = createSecurityToken(samlAssertion);
parameters.getMessage().getExchange().put(SecurityConstants.TOKEN, token);
- return true;
+ return;
}
}
}
@@ -101,12 +101,10 @@ public class IssuedTokenPolicyValidator extends AbstractSamlPolicyValidator {
// Store token on the security context
SecurityToken token = createSecurityToken(binarySecurity);
parameters.getMessage().getExchange().put(SecurityConstants.TOKEN, token);
- return true;
+ return;
}
}
}
-
- return true;
}
private boolean validateSAMLToken(PolicyValidatorParameters parameters,
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java
index b295fdf..351e94b 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/KerberosTokenPolicyValidator.java
@@ -65,9 +65,9 @@ public class KerberosTokenPolicyValidator extends AbstractSecurityPolicyValidato
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
List<WSSecurityEngineResult> kerberosResults = findKerberosResults(parameters.getResults());
for (WSSecurityEngineResult kerberosResult : kerberosResults) {
@@ -106,11 +106,9 @@ public class KerberosTokenPolicyValidator extends AbstractSecurityPolicyValidato
token.setSecret((byte[])kerberosResult.get(WSSecurityEngineResult.TAG_SECRET));
SecurityUtils.getTokenStore(parameters.getMessage()).add(token);
parameters.getMessage().getExchange().put(SecurityConstants.TOKEN_ID, token.getId());
- return true;
+ return;
}
}
-
- return true;
}
private void assertToken(KerberosToken token, AssertionInfoMap aim) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java
index 07f9b3f..c4322ff 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java
@@ -66,9 +66,9 @@ public class LayoutPolicyValidator extends AbstractSecurityPolicyValidator {
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
Layout layout = (Layout)ai.getAssertion();
ai.setAsserted(true);
@@ -79,8 +79,6 @@ public class LayoutPolicyValidator extends AbstractSecurityPolicyValidator {
ai.setNotAsserted(error);
}
}
-
- return true;
}
private void assertToken(Layout token, AssertionInfoMap aim) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
index 2d37d3c..27f61c8 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
@@ -58,9 +58,9 @@ public class SamlTokenPolicyValidator extends AbstractSamlPolicyValidator {
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SamlToken samlToken = (SamlToken)ai.getAssertion();
ai.setAsserted(true);
@@ -111,8 +111,6 @@ public class SamlTokenPolicyValidator extends AbstractSamlPolicyValidator {
*/
}
}
-
- return true;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
index 87452fd..2b58882 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityContextTokenPolicyValidator.java
@@ -52,9 +52,9 @@ public class SecurityContextTokenPolicyValidator extends AbstractSecurityPolicyV
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
List<WSSecurityEngineResult> sctResults =
WSSecurityUtil.fetchAllActionResults(parameters.getResults(), WSConstants.SCT);
@@ -74,8 +74,6 @@ public class SecurityContextTokenPolicyValidator extends AbstractSecurityPolicyV
continue;
}
}
-
- return true;
}
private void assertToken(SecurityContextToken token, AssertionInfoMap aim) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityPolicyValidator.java
index 860c626..858f844 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SecurityPolicyValidator.java
@@ -35,7 +35,7 @@ public interface SecurityPolicyValidator {
boolean canValidatePolicy(AssertionInfo assertionInfo);
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais);
+ void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais);
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java
index 6ab1e74..1126c20 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEncryptedTokenPolicyValidator.java
@@ -54,9 +54,9 @@ public class SignedEncryptedTokenPolicyValidator extends AbstractSupportingToken
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SupportingTokens binding = (SupportingTokens)ai.getAssertion();
ai.setAsserted(true);
@@ -110,8 +110,6 @@ public class SignedEncryptedTokenPolicyValidator extends AbstractSupportingToken
}
}
}
-
- return true;
}
protected boolean isSigned() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java
index cde8eac..f7bb086 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingEncryptedTokenPolicyValidator.java
@@ -58,9 +58,9 @@ public class SignedEndorsingEncryptedTokenPolicyValidator extends AbstractSuppor
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SupportingTokens binding = (SupportingTokens)ai.getAssertion();
ai.setAsserted(true);
@@ -118,8 +118,6 @@ public class SignedEndorsingEncryptedTokenPolicyValidator extends AbstractSuppor
}
}
}
-
- return true;
}
protected boolean isSigned() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java
index d7911a9..a207715 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedEndorsingTokenPolicyValidator.java
@@ -57,9 +57,9 @@ public class SignedEndorsingTokenPolicyValidator extends AbstractSupportingToken
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SupportingTokens binding = (SupportingTokens)ai.getAssertion();
ai.setAsserted(true);
@@ -116,8 +116,6 @@ public class SignedEndorsingTokenPolicyValidator extends AbstractSupportingToken
}
}
}
-
- return true;
}
protected boolean isSigned() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java
index 82948cb..ea80db1 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SignedTokenPolicyValidator.java
@@ -55,9 +55,9 @@ public class SignedTokenPolicyValidator extends AbstractSupportingTokenPolicyVal
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
SupportingTokens binding = (SupportingTokens)ai.getAssertion();
ai.setAsserted(true);
@@ -110,8 +110,6 @@ public class SignedTokenPolicyValidator extends AbstractSupportingTokenPolicyVal
}
}
}
-
- return true;
}
protected boolean isSigned() {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java
index 56aee2a..2c6d355 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SymmetricBindingPolicyValidator.java
@@ -56,9 +56,9 @@ public class SymmetricBindingPolicyValidator extends AbstractBindingPolicyValida
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
boolean hasDerivedKeys = false;
for (WSSecurityEngineResult result : parameters.getResults()) {
Integer actInt = (Integer)result.get(WSSecurityEngineResult.TAG_ACTION);
@@ -89,8 +89,6 @@ public class SymmetricBindingPolicyValidator extends AbstractBindingPolicyValida
continue;
}
}
-
- return true;
}
/**
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java
index 58a2162..869804d 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/TransportBindingPolicyValidator.java
@@ -52,9 +52,9 @@ public class TransportBindingPolicyValidator extends AbstractBindingPolicyValida
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
TransportBinding binding = (TransportBinding)ai.getAssertion();
ai.setAsserted(true);
@@ -90,8 +90,6 @@ public class TransportBindingPolicyValidator extends AbstractBindingPolicyValida
PolicyUtils.assertPolicy(parameters.getAssertionInfoMap(), SP12Constants.SIGNED_PARTS);
PolicyUtils.assertPolicy(parameters.getAssertionInfoMap(), SP11Constants.SIGNED_PARTS);
}
-
- return true;
}
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
index 0073940..2e06b02 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/UsernameTokenPolicyValidator.java
@@ -58,9 +58,9 @@ public class UsernameTokenPolicyValidator extends AbstractSecurityPolicyValidato
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies. W
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
for (AssertionInfo ai : ais) {
org.apache.wss4j.policy.model.UsernameToken usernameTokenPolicy =
(org.apache.wss4j.policy.model.UsernameToken)ai.getAssertion();
@@ -82,8 +82,6 @@ public class UsernameTokenPolicyValidator extends AbstractSecurityPolicyValidato
continue;
}
}
-
- return true;
}
private void assertToken(org.apache.wss4j.policy.model.UsernameToken token, AssertionInfoMap aim) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
index 1e7ada7..68c54c5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
@@ -56,9 +56,9 @@ public class WSS11PolicyValidator extends AbstractSecurityPolicyValidator {
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
List<WSSecurityEngineResult> scResults =
WSSecurityUtil.fetchAllActionResults(parameters.getResults(), WSConstants.SC);
@@ -79,7 +79,6 @@ public class WSS11PolicyValidator extends AbstractSecurityPolicyValidator {
continue;
}
}
- return true;
}
private void assertToken(Wss11 token, AssertionInfoMap aim) {
http://git-wip-us.apache.org/repos/asf/cxf/blob/eacd93f7/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
index e7ed835..7f032f5 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/X509TokenPolicyValidator.java
@@ -71,9 +71,9 @@ public class X509TokenPolicyValidator extends AbstractSecurityPolicyValidator {
}
/**
- * Validate policies. Return true if all of the policies are valid.
+ * Validate policies.
*/
- public boolean validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
+ public void validatePolicies(PolicyValidatorParameters parameters, Collection<AssertionInfo> ais) {
List<WSSecurityEngineResult> bstResults =
WSSecurityUtil.fetchAllActionResults(parameters.getResults(), WSConstants.BST);
@@ -98,8 +98,6 @@ public class X509TokenPolicyValidator extends AbstractSecurityPolicyValidator {
continue;
}
}
-
- return true;
}
private void assertToken(X509Token token, AssertionInfoMap aim) {
[2/2] cxf git commit: Some minor fixes
Posted by co...@apache.org.
Some minor fixes
Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a16abff2
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a16abff2
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a16abff2
Branch: refs/heads/master
Commit: a16abff276542979aef91f7e56cd8e67a695db14
Parents: cc9222b
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Fri Mar 20 17:28:39 2015 +0000
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Mar 20 18:49:00 2015 +0000
----------------------------------------------------------------------
.../wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java | 2 +-
.../security/wss4j/policyvalidators/LayoutPolicyValidator.java | 6 +++---
.../wss4j/policyvalidators/SamlTokenPolicyValidator.java | 4 ++--
.../security/wss4j/policyvalidators/WSS11PolicyValidator.java | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cxf/blob/a16abff2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
index 08b1c5a..f7e54ba 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/AlgorithmSuitePolicyValidator.java
@@ -88,7 +88,7 @@ public class AlgorithmSuitePolicyValidator extends AbstractSecurityPolicyValidat
return true;
}
- public boolean validatePolicy(
+ private boolean validatePolicy(
AssertionInfo ai, AlgorithmSuite algorithmPolicy, List<WSSecurityEngineResult> results
) {
boolean success = true;
http://git-wip-us.apache.org/repos/asf/cxf/blob/a16abff2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java
index 45f5ba0..07f9b3f 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/LayoutPolicyValidator.java
@@ -57,8 +57,8 @@ public class LayoutPolicyValidator extends AbstractSecurityPolicyValidator {
*/
public boolean canValidatePolicy(AssertionInfo assertionInfo) {
if (assertionInfo.getAssertion() != null
- && (SP12Constants.USERNAME_TOKEN.equals(assertionInfo.getAssertion().getName())
- || SP11Constants.USERNAME_TOKEN.equals(assertionInfo.getAssertion().getName()))) {
+ && (SP12Constants.LAYOUT.equals(assertionInfo.getAssertion().getName())
+ || SP11Constants.LAYOUT.equals(assertionInfo.getAssertion().getName()))) {
return true;
}
@@ -92,7 +92,7 @@ public class LayoutPolicyValidator extends AbstractSecurityPolicyValidator {
}
}
- public boolean validatePolicy(
+ private boolean validatePolicy(
Layout layout,
List<WSSecurityEngineResult> results,
List<WSSecurityEngineResult> signedResults
http://git-wip-us.apache.org/repos/asf/cxf/blob/a16abff2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
index adaf971..2d37d3c 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/SamlTokenPolicyValidator.java
@@ -49,8 +49,8 @@ public class SamlTokenPolicyValidator extends AbstractSamlPolicyValidator {
*/
public boolean canValidatePolicy(AssertionInfo assertionInfo) {
if (assertionInfo.getAssertion() != null
- && (SP12Constants.USERNAME_TOKEN.equals(assertionInfo.getAssertion().getName())
- || SP11Constants.USERNAME_TOKEN.equals(assertionInfo.getAssertion().getName()))) {
+ && (SP12Constants.SAML_TOKEN.equals(assertionInfo.getAssertion().getName())
+ || SP11Constants.SAML_TOKEN.equals(assertionInfo.getAssertion().getName()))) {
return true;
}
http://git-wip-us.apache.org/repos/asf/cxf/blob/a16abff2/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
----------------------------------------------------------------------
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
index 5e64993..1e7ada7 100644
--- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
+++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/policyvalidators/WSS11PolicyValidator.java
@@ -47,8 +47,8 @@ public class WSS11PolicyValidator extends AbstractSecurityPolicyValidator {
*/
public boolean canValidatePolicy(AssertionInfo assertionInfo) {
if (assertionInfo.getAssertion() != null
- && (SP12Constants.USERNAME_TOKEN.equals(assertionInfo.getAssertion().getName())
- || SP11Constants.USERNAME_TOKEN.equals(assertionInfo.getAssertion().getName()))) {
+ && (SP12Constants.WSS11.equals(assertionInfo.getAssertion().getName())
+ || SP11Constants.WSS11.equals(assertionInfo.getAssertion().getName()))) {
return true;
}