svn commit: r1562792 - in /webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor: BinarySecurityTokenProcessor.java SAMLTokenProcessor.java UsernameTokenProcessor.java

Thu, 30 Jan 2014 04:03:46 -0800 

Author: coheigea
Date: Thu Jan 30 12:03:02 2014
New Revision: 1562792

URL: http://svn.apache.org/r1562792
Log:
[WSS-491] - Problem storing custom Principals


Conflicts:
        
src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
        src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
        
src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java

Modified:
    
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
    
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
    
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java

Modified: 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java?rev=1562792&r1=1562791&r2=1562792&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
 (original)
+++ 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/BinarySecurityTokenProcessor.java
 Thu Jan 30 12:03:02 2014
@@ -97,9 +97,13 @@ public class BinarySecurityTokenProcesso
                     WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, 
                     returnedCredential.getTransformedToken()
                 );
-                SAMLTokenPrincipal samlPrincipal = 
-                    new SAMLTokenPrincipal(credential.getTransformedToken());
-                result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
samlPrincipal);
+                if (credential.getPrincipal() != null) {
+                    result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
+                } else {
+                    SAMLTokenPrincipal samlPrincipal =
+                        new 
SAMLTokenPrincipal(credential.getTransformedToken());
+                    result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
samlPrincipal);
+                }
             } else if (credential.getPrincipal() != null) {
                 result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
             } else if (certs != null && certs[0] != null) {

Modified: 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java?rev=1562792&r1=1562791&r2=1562792&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
 (original)
+++ 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SAMLTokenProcessor.java
 Thu Jan 30 12:03:02 2014
@@ -110,9 +110,13 @@ public class SAMLTokenProcessor implemen
                 result.put(
                     WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, 
credential.getTransformedToken()
                 );
-                SAMLTokenPrincipal samlPrincipal = 
-                    new SAMLTokenPrincipal(credential.getTransformedToken());
-                result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
samlPrincipal);
+                if (credential.getPrincipal() != null) {
+                    result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
+                } else {
+                    SAMLTokenPrincipal samlPrincipal =
+                        new 
SAMLTokenPrincipal(credential.getTransformedToken());
+                    result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
samlPrincipal);
+                }
             } else if (credential.getPrincipal() != null) {
                 result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
             } else {

Modified: 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java
URL: 
http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java?rev=1562792&r1=1562791&r2=1562792&view=diff
==============================================================================
--- 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java
 (original)
+++ 
webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/UsernameTokenProcessor.java
 Thu Jan 30 12:03:02 2014
@@ -86,9 +86,15 @@ public class UsernameTokenProcessor impl
                 result.put(
                     WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, 
credential.getTransformedToken()
                 );
-                SAMLTokenPrincipal samlPrincipal = 
-                    new SAMLTokenPrincipal(credential.getTransformedToken());
-                result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
samlPrincipal);
+                if (credential.getPrincipal() != null) {
+                    result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
+                } else {
+                    SAMLTokenPrincipal samlPrincipal =
+                        new 
SAMLTokenPrincipal(credential.getTransformedToken());
+                    result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
samlPrincipal);
+                }
+            } else if (credential.getPrincipal() != null) {
+                result.put(WSSecurityEngineResult.TAG_PRINCIPAL, 
credential.getPrincipal());
             } else {
                 WSUsernameTokenPrincipal principal = 
                     new WSUsernameTokenPrincipal(token.getName(), 
token.isHashed());

Reply via email to