Repository: cxf
Updated Branches:
  refs/heads/master 8e41f31c8 -> 67bc842ff


[CXF-7003] - Allow STS Tokens to have an optional ID


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/67bc842f
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/67bc842f
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/67bc842f

Branch: refs/heads/master
Commit: 67bc842ff4f8c704a0596dee61a8177387669d9b
Parents: 8e41f31
Author: Colm O hEigeartaigh <[email protected]>
Authored: Tue Aug 9 10:48:50 2016 +0100
Committer: Colm O hEigeartaigh <[email protected]>
Committed: Tue Aug 9 10:48:50 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/67bc842f/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
----------------------------------------------------------------------
diff --git 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
index 813f1ab..f91d539 100755
--- 
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
+++ 
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/trust/AbstractSTSClient.java
@@ -1456,7 +1456,8 @@ public abstract class AbstractSTSClient implements 
Configurable, InterceptorProv
         Element rstDec = rst;
         String id = findID(rar, rur, rstDec);
         if (StringUtils.isEmpty(id)) {
-            throw new TrustException("NO_ID", LOG);
+            LOG.fine("No ID extracted from token, so just making one up");
+            id = 
WSSConfig.getNewInstance().getIdAllocator().createSecureId("_", null);
         }
         SecurityToken token = new SecurityToken(id, rstDec, lte);
         token.setAttachedReference(rar);

Reply via email to