cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1417887 - /cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
Date Thu, 06 Dec 2012 13:53:26 GMT
Author: coheigea
Date: Thu Dec  6 13:53:26 2012
New Revision: 1417887

URL: http://svn.apache.org/viewvc?rev=1417887&view=rev
Log:
Merged revisions 1417840 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1417840 | coheigea | 2012-12-06 13:24:58 +0000 (Thu, 06 Dec 2012) | 3 lines

  [CXF-4679] - STS onBehalfOf validation should throw exception for invalid tokens in issue
operation
   - Patch applied, thanks

........


Conflicts:

	services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java

Modified:
    cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java

Modified: cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java?rev=1417887&r1=1417886&r2=1417887&view=diff
==============================================================================
--- cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
(original)
+++ cxf/branches/2.5.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/operation/TokenIssueOperation.java
Thu Dec  6 13:53:26 2012
@@ -102,7 +102,8 @@ public class TokenIssueOperation extends
             
             if (tokenResponse == null) {
                 LOG.fine("No Token Validator has been found that can handle this token");
-
+            } else if (validateTarget.getValidationState().equals(STATE.INVALID)) {
+                throw new STSException("Incoming token is invalid", STSException.REQUEST_FAILED);
             } else if (validateTarget.getValidationState().equals(STATE.VALID)) {
                 // Map the principal (if it exists)
                 Principal responsePrincipal = tokenResponse.getPrincipal();



Mime
View raw message