cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [2/2] cxf git commit: Some minor fixes
Date Fri, 20 Mar 2015 18:49:13 GMT
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 <coheigea@apache.org>
Authored: Fri Mar 20 17:28:39 2015 +0000
Committer: Colm O hEigeartaigh <coheigea@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;
         }
         


Mime
View raw message