cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject cxf-fediz git commit: Letting the runtime set client id when clients get the tokens issued to them which will also work well when a user works with multiple clients in the same session
Date Tue, 09 Feb 2016 16:34:08 GMT
Repository: cxf-fediz
Updated Branches:
  refs/heads/master 5ee1964ab -> fddb661bd


Letting the runtime set client id when clients get the tokens issued to them which will also
work well when a user works with multiple clients in the same session


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

Branch: refs/heads/master
Commit: fddb661bdfcf03b3dda657fc5e682025fe9d7446
Parents: 5ee1964
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Tue Feb 9 16:33:54 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Tue Feb 9 16:33:54 2016 +0000

----------------------------------------------------------------------
 .../cxf/fediz/service/oidc/FedizSubjectCreator.java       | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf-fediz/blob/fddb661b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
----------------------------------------------------------------------
diff --git a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
index fb4ecb6..f134039 100644
--- a/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
+++ b/services/oidc/src/main/java/org/apache/cxf/fediz/service/oidc/FedizSubjectCreator.java
@@ -29,7 +29,6 @@ import org.apache.cxf.fediz.core.ClaimCollection;
 import org.apache.cxf.fediz.core.ClaimTypes;
 import org.apache.cxf.fediz.core.FedizPrincipal;
 import org.apache.cxf.jaxrs.ext.MessageContext;
-import org.apache.cxf.rs.security.oauth2.common.Client;
 import org.apache.cxf.rs.security.oauth2.common.UserSubject;
 import org.apache.cxf.rs.security.oauth2.provider.OAuthServiceException;
 import org.apache.cxf.rs.security.oauth2.provider.SubjectCreator;
@@ -50,7 +49,6 @@ public class FedizSubjectCreator implements SubjectCreator {
     
     @Override
     public UserSubject createUserSubject(MessageContext mc, 
-                                         Client client,
                                          MultivaluedMap<String, String> params) throws
OAuthServiceException {
         Principal principal = mc.getSecurityContext().getUserPrincipal();
         
@@ -64,8 +62,7 @@ public class FedizSubjectCreator implements SubjectCreator {
         
         IdToken idToken = convertToIdToken(fedizPrincipal.getLoginToken(),
                                            fedizPrincipal.getName(), 
-                                           fedizPrincipal.getClaims(),
-                                           client.getClientId());
+                                           fedizPrincipal.getClaims());
         
         OidcUserSubject oidcSub = new OidcUserSubject();
         oidcSub.setLogin(fedizPrincipal.getName());
@@ -77,8 +74,7 @@ public class FedizSubjectCreator implements SubjectCreator {
     
     public IdToken convertToIdToken(Element samlToken, 
             String subjectName, 
-            ClaimCollection claims,
-            String clientId) {
+            ClaimCollection claims) {
         // The current SAML Assertion represents anauthentication record.
         // It has to be translated into IdToken (JWT) so that it can be returned 
         // to client applications participating in various OIDC flows.
@@ -86,8 +82,6 @@ public class FedizSubjectCreator implements SubjectCreator {
         IdToken idToken = new IdToken();
         // Subject name is provided by FedizPrincipal which is initialized from the current
SAML token 
         idToken.setSubject(subjectName);
-        // SAML assertion audiences might be added if needed given that JWT can hold an array
of audiences
-        idToken.setAudience(clientId);
         
         Assertion saml2Assertion = getSaml2Assertion(samlToken);
         if (saml2Assertion != null) {


Mime
View raw message