You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ws.apache.org by co...@apache.org on 2014/01/30 12:58:49 UTC
svn commit: r1562791 - in
/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor:
BinarySecurityTokenProcessor.java SAMLTokenProcessor.java
UsernameTokenProcessor.java
Author: coheigea
Date: Thu Jan 30 11:58:48 2014
New Revision: 1562791
URL: http://svn.apache.org/r1562791
Log:
[WSS-491] - Problem storing custom Principals
Modified:
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java?rev=1562791&r1=1562790&r2=1562791&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/BinarySecurityTokenProcessor.java Thu Jan 30 11:58:48 2014
@@ -98,9 +98,13 @@ public class BinarySecurityTokenProcesso
WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN,
returnedCredential.getTransformedToken()
);
- SAMLTokenPrincipalImpl samlPrincipal =
- new SAMLTokenPrincipalImpl(credential.getTransformedToken());
- result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+ if (credential.getPrincipal() != null) {
+ result.put(WSSecurityEngineResult.TAG_PRINCIPAL, credential.getPrincipal());
+ } else {
+ SAMLTokenPrincipalImpl samlPrincipal =
+ new SAMLTokenPrincipalImpl(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/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java?rev=1562791&r1=1562790&r2=1562791&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/SAMLTokenProcessor.java Thu Jan 30 11:58:48 2014
@@ -111,9 +111,13 @@ public class SAMLTokenProcessor implemen
result.put(
WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, credential.getTransformedToken()
);
- SAMLTokenPrincipalImpl samlPrincipal =
- new SAMLTokenPrincipalImpl(credential.getTransformedToken());
- result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+ if (credential.getPrincipal() != null) {
+ result.put(WSSecurityEngineResult.TAG_PRINCIPAL, credential.getPrincipal());
+ } else {
+ SAMLTokenPrincipalImpl samlPrincipal =
+ new SAMLTokenPrincipalImpl(credential.getTransformedToken());
+ result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+ }
} else if (credential.getPrincipal() != null) {
result.put(WSSecurityEngineResult.TAG_PRINCIPAL, credential.getPrincipal());
} else {
Modified: webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java?rev=1562791&r1=1562790&r2=1562791&view=diff
==============================================================================
--- webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java (original)
+++ webservices/wss4j/trunk/ws-security-dom/src/main/java/org/apache/wss4j/dom/processor/UsernameTokenProcessor.java Thu Jan 30 11:58:48 2014
@@ -88,9 +88,15 @@ public class UsernameTokenProcessor impl
result.put(
WSSecurityEngineResult.TAG_TRANSFORMED_TOKEN, credential.getTransformedToken()
);
- SAMLTokenPrincipalImpl samlPrincipal =
- new SAMLTokenPrincipalImpl(credential.getTransformedToken());
- result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+ if (credential.getPrincipal() != null) {
+ result.put(WSSecurityEngineResult.TAG_PRINCIPAL, credential.getPrincipal());
+ } else {
+ SAMLTokenPrincipalImpl samlPrincipal =
+ new SAMLTokenPrincipalImpl(credential.getTransformedToken());
+ result.put(WSSecurityEngineResult.TAG_PRINCIPAL, samlPrincipal);
+ }
+ } else if (credential.getPrincipal() != null) {
+ result.put(WSSecurityEngineResult.TAG_PRINCIPAL, credential.getPrincipal());
} else {
WSUsernameTokenPrincipalImpl principal =
new WSUsernameTokenPrincipalImpl(token.getName(), token.isHashed());