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/05/09 13:03:44 UTC

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

Author: coheigea
Date: Fri May  9 11:03:44 2014
New Revision: 1593515

URL: http://svn.apache.org/r1593515
Log:
Store Subject from SAML + Signature processors


Conflicts:
	src/main/java/org/apache/ws/security/processor/SignatureProcessor.java

Modified:
    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/SignatureProcessor.java

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=1593515&r1=1593514&r2=1593515&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 Fri May  9 11:03:44 2014
@@ -122,6 +122,7 @@ public class SAMLTokenProcessor implemen
             } else {
                 result.put(WSSecurityEngineResult.TAG_PRINCIPAL, new SAMLTokenPrincipal(assertion));
             }
+            result.put(WSSecurityEngineResult.TAG_SUBJECT, credential.getSubject());
         }
         wsDocInfo.addResult(result);
         return java.util.Collections.singletonList(result);

Modified: webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java
URL: http://svn.apache.org/viewvc/webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java?rev=1593515&r1=1593514&r2=1593515&view=diff
==============================================================================
--- webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java (original)
+++ webservices/wss4j/branches/1_6_x-fixes/src/main/java/org/apache/ws/security/processor/SignatureProcessor.java Fri May  9 11:03:44 2014
@@ -127,6 +127,7 @@ public class SignatureProcessor implemen
         String signatureMethod = getSignatureMethod(elem);
         REFERENCE_TYPE referenceType = null;
 
+        Credential credential = new Credential();
         Validator validator = data.getValidator(WSSecurityEngine.SIGNATURE);
         if (keyInfoElement == null) {
             certs = getDefaultCerts(data.getSigCrypto());
@@ -153,11 +154,10 @@ public class SignatureProcessor implemen
             if (strElements.isEmpty()) {
                 publicKey = parseKeyValue(keyInfoElement);
                 if (validator != null) {
-                    Credential credential = new Credential();
                     credential.setPublicKey(publicKey);
                     principal = new PublicKeyPrincipal(publicKey);
                     credential.setPrincipal(principal);
-                    validator.validate(credential, data);
+                    credential = validator.validate(credential, data);
                 }
             } else {
                 STRParser strParser = new SignatureSTRParser();
@@ -180,11 +180,10 @@ public class SignatureProcessor implemen
                     LOG.debug("Direct Trust for SAML/BST credential");
                 }
                 if (!trusted && (publicKey != null || certs != null) && (validator != null)) {
-                    Credential credential = new Credential();
                     credential.setPublicKey(publicKey);
                     credential.setCertificates(certs);
                     credential.setPrincipal(principal);
-                    validator.validate(credential, data);
+                    credential = validator.validate(credential, data);
                 }
             }
         }
@@ -257,6 +256,7 @@ public class SignatureProcessor implemen
         result.put(WSSecurityEngineResult.TAG_X509_REFERENCE_TYPE, referenceType);
         if (validator != null) {
             result.put(WSSecurityEngineResult.TAG_VALIDATED_TOKEN, Boolean.TRUE);
+            result.put(WSSecurityEngineResult.TAG_SUBJECT, credential.getSubject());
         }
         wsDocInfo.addResult(result);
         wsDocInfo.addTokenElement(elem);