You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2020/03/07 10:45:45 UTC

[cxf] branch 3.3.x-fixes updated (e16591f -> 181bfdb)

This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a change to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git.


    from e16591f  Recording .gitmergeinfo Changes
     new 36aa971  CXF-8229 OAuth 2.0 Dynamic Client Registration: Client Update Request (#646)
     new 2a144c1  CXF-8222 OIDC Refresh Response: ID Token iat Claim MUST represent the time that the new ID Token is issued (#645)
     new 181bfdb  Recording .gitmergeinfo Changes

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo                                      |   2 +
 .../grants/refresh/RefreshTokenGrantHandler.java   |   5 +-
 .../services/DynamicRegistrationService.java       |  50 +++++---
 .../cxf/rs/security/oauth2/utils/OAuthUtils.java   |   2 +-
 .../security/oidc/idp/IdTokenResponseFilter.java   |   7 +-
 .../oauth2/common/JCacheOAuthDataProviderImpl.java |  68 ++++------
 .../oauth2/common/JPAOAuthDataProviderImpl.java    |  68 ++++------
 .../jaxrs/security/oidc/IdTokenProviderImpl.java   |  11 +-
 .../security/oidc/OIDCDynamicRegistrationTest.java | 141 +++++++++++++--------
 .../systest/jaxrs/security/oidc/OIDCFlowTest.java  |  62 +++++++++
 .../jaxrs/security/oidc/SubjectCreatorImpl.java    |  58 +++++++++
 .../src/test/resources/META-INF/persistence.xml    |   1 +
 .../jaxrs/security/oidc/oidc-server-jpa.xml        |  14 +-
 13 files changed, 308 insertions(+), 181 deletions(-)
 create mode 100644 systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/SubjectCreatorImpl.java


[cxf] 03/03: Recording .gitmergeinfo Changes

Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 181bfdbc85ff13ff31412915e1bb32f0c97c853d
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Sat Mar 7 13:40:19 2020 +0300

    Recording .gitmergeinfo Changes
---
 .gitmergeinfo | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitmergeinfo b/.gitmergeinfo
index 331e700..cd21f53 100644
--- a/.gitmergeinfo
+++ b/.gitmergeinfo
@@ -148,6 +148,7 @@ B fca1472e021feed0b470127dc5d71f646e1406f3
 B fcd22cd026bc94a95fa19210df193df753afe4d1
 M 09ddfdeaef6f32537dba23fa6d7ef36992b3217b
 M 160f50ed9bd9391b61417716b3a67653c9e81a98
+M 169be66c11851d723e4a8d93f752e0b3dff1fa60
 M 180578d01f361d77ce7f42dd760fa8d5f245ce7e
 M 224fa741d6753053c6f47d361f8cc7e93fd34ed9
 M 2275d49772676ac72bc14ebbc3173719cd72e635
@@ -169,6 +170,7 @@ M 61aeaff2d747379c64cdad40f82cf51e3bfaecf6
 M 67643a4fe883f5d6067d4ce07f48cf4de10be9f7
 M 69b805a97fa96716c8f76278e577ba122c2727e2
 M 6b7e50b87d74dc6b7d1e830b373c7e30c04e14a2
+M 6e828d6f0fea652231d0cdc9990169c3583ad03a
 M 79466c55a2a1191df9c28a02568b82a8c3d08fbd
 M 7b50181ebc445bb84d3463b284643432399bc0f8
 M 7ef814556d727c147d6f625cbb1170edfd24a752


[cxf] 01/03: CXF-8229 OAuth 2.0 Dynamic Client Registration: Client Update Request (#646)

Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 36aa9716829eb4770df73fa02cec3df639f760a2
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri Mar 6 23:43:31 2020 +0300

    CXF-8229 OAuth 2.0 Dynamic Client Registration: Client Update Request (#646)
    
    * CXF-8229 OAuth 2.0 Dynamic Client Registration: Client Update Request
    
    * add negative test cases
    
    (cherry picked from commit 169be66c11851d723e4a8d93f752e0b3dff1fa60)
---
 .../services/DynamicRegistrationService.java       |  50 +++++---
 .../cxf/rs/security/oauth2/utils/OAuthUtils.java   |   2 +-
 .../security/oidc/OIDCDynamicRegistrationTest.java | 141 +++++++++++++--------
 3 files changed, 120 insertions(+), 73 deletions(-)

diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java
index 12155d9..9b50475 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/services/DynamicRegistrationService.java
@@ -128,8 +128,13 @@ public class DynamicRegistrationService {
     @PUT
     @Path("{clientId}")
     @Consumes("application/json")
-    public Response updateClientRegistration(@PathParam("clientId") String clientId) {
-        return Response.ok().build();
+    @Produces("application/json")
+    public ClientRegistration updateClientRegistration(@PathParam("clientId") String clientId,
+        ClientRegistration request) {
+        Client client = readClient(clientId);
+        fromClientRegistrationToClient(request, client);
+        clientProvider.setClient(client);
+        return fromClientToClientRegistration(client);
     }
 
     @DELETE
@@ -278,16 +283,35 @@ public class DynamicRegistrationService {
         // Client Registration Time
         newClient.setRegisteredAt(System.currentTimeMillis() / 1000L);
 
+        fromClientRegistrationToClient(request, newClient);
+
+        SecurityContext sc = mc.getSecurityContext();
+        if (sc != null && sc.getUserPrincipal() != null && sc.getUserPrincipal().getName() != null) {
+            UserSubject subject = new UserSubject(sc.getUserPrincipal().getName());
+            newClient.setResourceOwnerSubject(subject);
+        }
+
+        newClient.setRegisteredDynamically(true);
+        return newClient;
+    }
+
+    protected void fromClientRegistrationToClient(ClientRegistration request, Client client) {
+        final List<String> grantTypes = client.getAllowedGrantTypes();
+
         // Client Redirect URIs
         List<String> redirectUris = request.getRedirectUris();
         if (redirectUris != null) {
+            String appType = request.getApplicationType();
+            if (appType == null) {
+                appType = DEFAULT_APPLICATION_TYPE;
+            }
             for (String uri : redirectUris) {
                 validateRequestUri(uri, appType, grantTypes);
             }
-            newClient.setRedirectUris(redirectUris);
+            client.setRedirectUris(redirectUris);
         }
 
-        if (newClient.getRedirectUris().isEmpty()
+        if (client.getRedirectUris().isEmpty()
             && (grantTypes.contains(OAuthConstants.AUTHORIZATION_CODE_GRANT)
                 || grantTypes.contains(OAuthConstants.IMPLICIT_GRANT))) {
             // Throw an error as we need a redirect URI for these grants.
@@ -299,39 +323,31 @@ public class DynamicRegistrationService {
         // Client Resource Audience URIs
         List<String> resourceUris = request.getResourceUris();
         if (resourceUris != null) {
-            newClient.setRegisteredAudiences(resourceUris);
+            client.setRegisteredAudiences(resourceUris);
         }
 
         // Client Scopes
         String scope = request.getScope();
         if (!StringUtils.isEmpty(scope)) {
-            newClient.setRegisteredScopes(OAuthUtils.parseScope(scope));
+            client.setRegisteredScopes(OAuthUtils.parseScope(scope));
         }
         // Client Application URI
         String clientUri = request.getClientUri();
         if (clientUri != null) {
-            newClient.setApplicationWebUri(clientUri);
+            client.setApplicationWebUri(clientUri);
         }
         // Client Logo URI
         String clientLogoUri = request.getLogoUri();
         if (clientLogoUri != null) {
-            newClient.setApplicationLogoUri(clientLogoUri);
+            client.setApplicationLogoUri(clientLogoUri);
         }
 
         //TODO: check other properties
         // Add more typed properties like tosUri, policyUri, etc to Client
         // or set them as Client extra properties
-
-        SecurityContext sc = mc.getSecurityContext();
-        if (sc != null && sc.getUserPrincipal() != null && sc.getUserPrincipal().getName() != null) {
-            UserSubject subject = new UserSubject(sc.getUserPrincipal().getName());
-            newClient.setResourceOwnerSubject(subject);
-        }
-
-        newClient.setRegisteredDynamically(true);
-        return newClient;
     }
 
+
     protected boolean isPasswordRequired(List<String> grantTypes, String tokenEndpointAuthMethod) {
         if (grantTypes.contains(OAuthConstants.IMPLICIT_GRANT)) {
             return false;
diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
index 356f599..6a2ca81 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java
@@ -443,6 +443,6 @@ public final class OAuthUtils {
     }
 
     public static String convertListOfScopesToString(List<String> registeredScopes) {
-        return String.join(", ", registeredScopes);
+        return String.join(" ", registeredScopes);
     }
 }
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCDynamicRegistrationTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCDynamicRegistrationTest.java
index 74ff6bd..ea5393f 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCDynamicRegistrationTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCDynamicRegistrationTest.java
@@ -23,6 +23,7 @@ import java.net.URL;
 import java.util.Collections;
 
 import javax.ws.rs.core.Response;
+import javax.ws.rs.core.Response.Status;
 
 import org.apache.cxf.jaxrs.client.WebClient;
 import org.apache.cxf.jaxrs.provider.json.JsonMapObjectProvider;
@@ -76,16 +77,13 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
     public void testRegisterClientInitialAccessTokenCodeGrant() throws Exception {
         URL busFile = OIDCDynamicRegistrationTest.class.getResource("client.xml");
         String address = "https://localhost:" + DYNREG_SERVER.getPort() + "/services/dynamicWithAt/register";
-        WebClient wc = WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()),
-                         busFile.toString());
+        WebClient wc =
+            WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()), busFile.toString())
+            .accept("application/json").type("application/json")
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
 
-        wc.accept("application/json").type("application/json");
         ClientRegistration reg = newClientRegistrationCodeGrant();
-        ClientRegistrationResponse resp = null;
-        assertEquals(401, wc.post(reg).getStatus());
-
-        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
-        resp = wc.post(reg, ClientRegistrationResponse.class);
+        ClientRegistrationResponse resp = wc.post(reg, ClientRegistrationResponse.class);
 
         assertNotNull(resp.getClientId());
         assertNotNull(resp.getClientSecret());
@@ -94,12 +92,12 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
         String regAccessToken = resp.getRegistrationAccessToken();
         assertNotNull(regAccessToken);
 
-        wc.reset();
         wc.path(resp.getClientId());
         assertEquals(401, wc.get().getStatus());
 
-        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken));
-        ClientRegistration clientRegResp = wc.get(ClientRegistration.class);
+        ClientRegistration clientRegResp = wc
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken))
+            .get(ClientRegistration.class);
         testCommonRegCodeGrantProperties(clientRegResp);
 
         assertNull(clientRegResp.getTokenEndpointAuthMethod());
@@ -111,16 +109,15 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
     public void testRegisterClientPasswordGrant() throws Exception {
         URL busFile = OIDCDynamicRegistrationTest.class.getResource("client.xml");
         String address = "https://localhost:" + DYNREG_SERVER.getPort() + "/services/dynamicWithAt/register";
-        WebClient wc = WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()),
-                         busFile.toString());
-
-        wc.accept("application/json").type("application/json");
+        WebClient wc =
+            WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()), busFile.toString())
+            .accept("application/json").type("application/json")
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
 
         ClientRegistration reg = new ClientRegistration();
         reg.setClientName("dynamic_client");
         reg.setGrantTypes(Collections.singletonList(OAuthConstants.RESOURCE_OWNER_GRANT));
 
-        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
         ClientRegistrationResponse resp = wc.post(reg, ClientRegistrationResponse.class);
 
         assertNotNull(resp.getClientId());
@@ -130,11 +127,10 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
         String regAccessToken = resp.getRegistrationAccessToken();
         assertNotNull(regAccessToken);
 
-        wc.reset();
-        wc.path(resp.getClientId());
+        ClientRegistration clientRegResp = wc.path(resp.getClientId())
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken))
+            .get(ClientRegistration.class);
 
-        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken));
-        ClientRegistration clientRegResp = wc.get(ClientRegistration.class);
         assertEquals("web", clientRegResp.getApplicationType());
         assertEquals("dynamic_client", clientRegResp.getClientName());
         assertEquals(Collections.singletonList(OAuthConstants.RESOURCE_OWNER_GRANT),
@@ -150,16 +146,15 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
     public void testRegisterClientPasswordGrantPublic() throws Exception {
         URL busFile = OIDCDynamicRegistrationTest.class.getResource("client.xml");
         String address = "https://localhost:" + DYNREG_SERVER.getPort() + "/services/dynamicWithAt/register";
-        WebClient wc = WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()),
-                         busFile.toString());
-
-        wc.accept("application/json").type("application/json");
+        WebClient wc =
+            WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()), busFile.toString())
+            .accept("application/json").type("application/json")
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
 
         ClientRegistration reg = new ClientRegistration();
         reg.setClientName("dynamic_client");
         reg.setGrantTypes(Collections.singletonList(OAuthConstants.RESOURCE_OWNER_GRANT));
         reg.setTokenEndpointAuthMethod(OAuthConstants.TOKEN_ENDPOINT_AUTH_NONE);
-        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
         ClientRegistrationResponse resp = wc.post(reg, ClientRegistrationResponse.class);
 
         assertNotNull(resp.getClientId());
@@ -168,11 +163,10 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
         String regAccessToken = resp.getRegistrationAccessToken();
         assertNotNull(regAccessToken);
 
-        wc.reset();
-        wc.path(resp.getClientId());
+        ClientRegistration clientRegResp = wc.path(resp.getClientId())
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken))
+            .get(ClientRegistration.class);
 
-        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken));
-        ClientRegistration clientRegResp = wc.get(ClientRegistration.class);
         assertEquals("native", clientRegResp.getApplicationType());
         assertEquals("dynamic_client", clientRegResp.getClientName());
         assertEquals(Collections.singletonList(OAuthConstants.RESOURCE_OWNER_GRANT),
@@ -184,37 +178,21 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
         assertEquals(200, wc.delete().getStatus());
     }
 
-    private void testCommonRegCodeGrantProperties(ClientRegistration clientRegResp) {
-        assertNotNull(clientRegResp);
-        assertEquals("web", clientRegResp.getApplicationType());
-        assertEquals("dynamic_client", clientRegResp.getClientName());
-        assertEquals("openid", clientRegResp.getScope());
-        assertEquals(Collections.singletonList(OAuthConstants.AUTHORIZATION_CODE_GRANT),
-                     clientRegResp.getGrantTypes());
-        assertEquals(Collections.singletonList("https://a/b/c"),
-                     clientRegResp.getRedirectUris());
-        assertEquals(Collections.singletonList("https://rp/logout"),
-                     clientRegResp.getListStringProperty("post_logout_redirect_uris"));
-    }
-
     @org.junit.Test
     public void testRegisterClientInitialAccessTokenCodeGrantTls() throws Exception {
         URL busFile = OIDCDynamicRegistrationTest.class.getResource("client.xml");
         String address = "https://localhost:" + DYNREG_SERVER.getPort() + "/services/dynamicWithAt/register";
-        WebClient wc = WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()),
-                         busFile.toString());
+        WebClient wc =
+            WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()), busFile.toString())
+            .accept("application/json").type("application/json")
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
 
-        wc.accept("application/json").type("application/json");
         ClientRegistration reg = newClientRegistrationCodeGrant();
         reg.setTokenEndpointAuthMethod(OAuthConstants.TOKEN_ENDPOINT_AUTH_TLS);
         reg.setProperty(OAuthConstants.TLS_CLIENT_AUTH_SUBJECT_DN,
                         "CN=whateverhost.com,OU=Morpit,O=ApacheTest,L=Syracuse,C=US");
 
-        ClientRegistrationResponse resp = null;
-        assertEquals(401, wc.post(reg).getStatus());
-
-        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
-        resp = wc.post(reg, ClientRegistrationResponse.class);
+        ClientRegistrationResponse resp = wc.post(reg, ClientRegistrationResponse.class);
 
         assertNotNull(resp.getClientId());
         assertNull(resp.getClientSecret());
@@ -223,12 +201,10 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
         String regAccessToken = resp.getRegistrationAccessToken();
         assertNotNull(regAccessToken);
 
-        wc.reset();
-        wc.path(resp.getClientId());
-        assertEquals(401, wc.get().getStatus());
+        ClientRegistration clientRegResp = wc.path(resp.getClientId())
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken))
+            .get(ClientRegistration.class);
 
-        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken));
-        ClientRegistration clientRegResp = wc.get(ClientRegistration.class);
         testCommonRegCodeGrantProperties(clientRegResp);
         assertEquals(OAuthConstants.TOKEN_ENDPOINT_AUTH_TLS, clientRegResp.getTokenEndpointAuthMethod());
         assertEquals("CN=whateverhost.com,OU=Morpit,O=ApacheTest,L=Syracuse,C=US",
@@ -237,12 +213,52 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
         assertEquals(200, wc.delete().getStatus());
     }
 
+    @org.junit.Test
+    public void testUpdateClient() throws Exception {
+        URL busFile = OIDCDynamicRegistrationTest.class.getResource("client.xml");
+        String address = "https://localhost:" + DYNREG_SERVER.getPort() + "/services/dynamicWithAt/register";
+        WebClient wc =
+            WebClient.create(address, Collections.singletonList(new JsonMapObjectProvider()), busFile.toString())
+            .accept("application/json").type("application/json")
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, ACCESS_TOKEN));
+
+        final ClientRegistration reg = newClientRegistrationCodeGrant();
+        final ClientRegistrationResponse clientRegistrationResponse = wc
+            .post(reg, ClientRegistrationResponse.class);
+
+        final String regAccessToken = clientRegistrationResponse.getRegistrationAccessToken();
+        assertNotNull(regAccessToken);
+
+        reg.setScope(OidcUtils.getEmailScope());
+        final ClientRegistration updatedClientRegistration = wc.path(clientRegistrationResponse.getClientId())
+            .authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken))
+            .put(reg, ClientRegistration.class);
+
+        assertEquals(OidcUtils.getEmailScope(), updatedClientRegistration.getScope());
+        // https://tools.ietf.org/html/rfc7592#section-2.2
+        assertNull(updatedClientRegistration.getProperty("registration_access_token"));
+        assertNull(updatedClientRegistration.getProperty("registration_client_uri"));
+        assertNull(updatedClientRegistration.getProperty("client_secret_expires_at"));
+        assertNull(updatedClientRegistration.getProperty("client_id_issued_at"));
+
+        wc.authorization(null);
+
+        assertEquals(Status.UNAUTHORIZED.getStatusCode(),
+            wc.put(reg).getStatus());
+        assertEquals(Status.UNAUTHORIZED.getStatusCode(),
+            wc.delete().getStatus());
+
+        wc.authorization(new ClientAccessToken(OAuthConstants.BEARER_AUTHORIZATION_SCHEME, regAccessToken));
+        assertEquals(200, wc.delete().getStatus());
+    }
+
     private static ClientRegistration newClientRegistrationCodeGrant() {
         final ClientRegistration reg = new ClientRegistration();
         reg.setApplicationType("web");
         reg.setScope(OidcUtils.getOpenIdScope());
         reg.setClientName("dynamic_client");
         reg.setGrantTypes(Collections.singletonList(OAuthConstants.AUTHORIZATION_CODE_GRANT));
+//        reg.setResponseTypes(Collections.singletonList(OAuthConstants.CODE_RESPONSE_TYPE));
         reg.setRedirectUris(Collections.singletonList("https://a/b/c"));
 
         reg.setProperty("post_logout_redirect_uris",
@@ -250,4 +266,19 @@ public class OIDCDynamicRegistrationTest extends AbstractBusClientServerTestBase
         return reg;
     }
 
+    private static void testCommonRegCodeGrantProperties(ClientRegistration clientRegResp) {
+        assertNotNull(clientRegResp);
+        assertEquals("web", clientRegResp.getApplicationType());
+        assertEquals("openid", clientRegResp.getScope());
+        assertEquals("dynamic_client", clientRegResp.getClientName());
+        assertEquals(Collections.singletonList(OAuthConstants.AUTHORIZATION_CODE_GRANT),
+                     clientRegResp.getGrantTypes());
+//        assertEquals(Collections.singletonList(OAuthConstants.CODE_RESPONSE_TYPE),
+//                     clientRegResp.getResponseTypes());
+        assertEquals(Collections.singletonList("https://a/b/c"),
+                     clientRegResp.getRedirectUris());
+        assertEquals(Collections.singletonList("https://rp/logout"),
+                     clientRegResp.getListStringProperty("post_logout_redirect_uris"));
+    }
+
 }


[cxf] 02/03: CXF-8222 OIDC Refresh Response: ID Token iat Claim MUST represent the time that the new ID Token is issued (#645)

Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

buhhunyx pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git

commit 2a144c1aeb92a627ef73a692ef731f3b4196f10c
Author: Alexey Markevich <bu...@gmail.com>
AuthorDate: Fri Mar 6 23:44:58 2020 +0300

    CXF-8222 OIDC Refresh Response: ID Token iat Claim MUST represent the time that the new ID Token is issued (#645)
    
    * CXF-8222 OIDC Refresh Response: ID Token iat Claim MUST represent the
    time that the new ID Token is issued
    
    * adjust test
    
    * set "refresh_token" grantType in RefreshTokenGrantHandler
    
    (cherry picked from commit 6e828d6f0fea652231d0cdc9990169c3583ad03a)
    
    # Conflicts:
    #	systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
---
 .../grants/refresh/RefreshTokenGrantHandler.java   |  5 +-
 .../security/oidc/idp/IdTokenResponseFilter.java   |  7 ++-
 .../oauth2/common/JCacheOAuthDataProviderImpl.java | 68 +++++++---------------
 .../oauth2/common/JPAOAuthDataProviderImpl.java    | 68 +++++++---------------
 .../jaxrs/security/oidc/IdTokenProviderImpl.java   | 11 +---
 .../systest/jaxrs/security/oidc/OIDCFlowTest.java  | 62 ++++++++++++++++++++
 .../jaxrs/security/oidc/SubjectCreatorImpl.java    | 58 ++++++++++++++++++
 .../src/test/resources/META-INF/persistence.xml    |  1 +
 .../jaxrs/security/oidc/oidc-server-jpa.xml        | 14 +++--
 9 files changed, 186 insertions(+), 108 deletions(-)

diff --git a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrantHandler.java b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrantHandler.java
index 2037ba0..ac6714d 100644
--- a/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrantHandler.java
+++ b/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/grants/refresh/RefreshTokenGrantHandler.java
@@ -52,8 +52,9 @@ public class RefreshTokenGrantHandler implements AccessTokenGrantHandler {
                                             params.getFirst(OAuthConstants.SCOPE),
                                             useAllClientScopes,
                                             partialMatchScopeValidation);
-
-        return dataProvider.refreshAccessToken(client, refreshToken, requestedScopes);
+        final ServerAccessToken st = dataProvider.refreshAccessToken(client, refreshToken, requestedScopes);
+        st.setGrantType(OAuthConstants.REFRESH_TOKEN_GRANT);
+        return st;
     }
 
     public void setPartialMatchScopeValidation(boolean partialMatchScopeValidation) {
diff --git a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
index cbbc892..56eb46c 100644
--- a/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
+++ b/rt/rs/security/sso/oidc/src/main/java/org/apache/cxf/rs/security/oidc/idp/IdTokenResponseFilter.java
@@ -78,7 +78,12 @@ public class IdTokenResponseFilter extends OAuthServerJoseJwtProducer implements
                 idToken.setAudience(st.getClient().getClientId());
                 idToken.setAuthorizedParty(st.getClient().getClientId());
                 // if this token was refreshed then the cloned IDToken might need to have its
-                // issuedAt and expiry time properties adjusted if it proves to be necessary
+                // issuedAt and expiry time properties adjusted
+                if (OAuthConstants.REFRESH_TOKEN_GRANT.equals(st.getGrantType())) {
+                    final Long iat = st.getIssuedAt();
+                    idToken.setExpiryTime(iat + (idToken.getExpiryTime() - idToken.getIssuedAt()));
+                    idToken.setIssuedAt(iat);
+                }
                 setAtHashAndNonce(idToken, st);
                 return processJwt(new JwtToken(idToken), st.getClient());
             }
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JCacheOAuthDataProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JCacheOAuthDataProviderImpl.java
index 378529d..03e0021 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JCacheOAuthDataProviderImpl.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JCacheOAuthDataProviderImpl.java
@@ -21,6 +21,7 @@ package org.apache.cxf.systest.jaxrs.security.oauth2.common;
 import java.io.InputStream;
 import java.security.cert.Certificate;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -100,13 +101,15 @@ public class JCacheOAuthDataProviderImpl extends JCacheCodeDataProvider {
         // OIDC filters test client
         client = createPublicClients ? new Client("consumer-id-oidc", null, false)
             : new Client("consumer-id-oidc", "this-is-a-secret", true);
-        client.setRedirectUris(Collections.singletonList("https://localhost:" + servicePort
-                                                         + "/secured/bookstore/books"));
+        client.setRedirectUris(Arrays.asList(
+            "https://localhost:" + servicePort + "/secured/bookstore/books",
+            "http://www.blah.apache.org"));
 
         client.getAllowedGrantTypes().add("authorization_code");
         client.getAllowedGrantTypes().add("refresh_token");
 
         client.getRegisteredScopes().add("openid");
+        client.getRegisteredScopes().add(OAuthConstants.REFRESH_TOKEN_SCOPE);
 
         this.setClient(client);
 
@@ -217,66 +220,39 @@ public class JCacheOAuthDataProviderImpl extends JCacheCodeDataProvider {
 
         List<OAuthPermission> permissions = new ArrayList<>();
         for (String requestedScope : requestedScopes) {
+            final OAuthPermission permission;
             if ("read_book".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("read_book");
+                permission = new OAuthPermission("read_book");
                 permission.setHttpVerbs(Collections.singletonList("GET"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/secured/bookstore/books/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/secured/bookstore/books/*"));
             } else if ("create_book".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("create_book");
+                permission = new OAuthPermission("create_book");
                 permission.setHttpVerbs(Collections.singletonList("POST"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/secured/bookstore/books/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/secured/bookstore/books/*"));
             } else if ("create_image".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("create_image");
+                permission = new OAuthPermission("create_image");
                 permission.setHttpVerbs(Collections.singletonList("POST"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/secured/bookstore/image/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/secured/bookstore/image/*"));
             } else if ("read_balance".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("read_balance");
+                permission = new OAuthPermission("read_balance");
                 permission.setHttpVerbs(Collections.singletonList("GET"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/partners/balance/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/partners/balance/*"));
             } else if ("create_balance".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("create_balance");
+                permission = new OAuthPermission("create_balance");
                 permission.setHttpVerbs(Collections.singletonList("POST"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/partners/balance/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/partners/balance/*"));
             } else if ("read_data".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("read_data");
+                permission = new OAuthPermission("read_data");
                 permission.setHttpVerbs(Collections.singletonList("GET"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/partners/data/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/partners/data/*"));
             } else if ("openid".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("openid", "Authenticate user");
-                permissions.add(permission);
+                permission = new OAuthPermission("openid", "Authenticate user");
+            } else if (OAuthConstants.REFRESH_TOKEN_SCOPE.equals(requestedScope)) {
+                permission = new OAuthPermission(requestedScope);
             } else {
                 throw new OAuthServiceException("invalid_scope");
             }
+            permissions.add(permission);
         }
 
         return permissions;
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
index 8ed473e..2823820 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oauth2/common/JPAOAuthDataProviderImpl.java
@@ -19,6 +19,7 @@
 package org.apache.cxf.systest.jaxrs.security.oauth2.common;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
@@ -80,13 +81,15 @@ public class JPAOAuthDataProviderImpl extends JPACodeDataProvider {
 
         // OIDC filters test client
         client = new Client("consumer-id-oidc", "this-is-a-secret", true);
-        client.setRedirectUris(Collections.singletonList("https://localhost:" + servicePort
-                                                         + "/secured/bookstore/books"));
+        client.setRedirectUris(Arrays.asList(
+            "https://localhost:" + servicePort + "/secured/bookstore/books",
+            "http://www.blah.apache.org"));
 
         client.getAllowedGrantTypes().add("authorization_code");
         client.getAllowedGrantTypes().add("refresh_token");
 
         client.getRegisteredScopes().add("openid");
+        client.getRegisteredScopes().add(OAuthConstants.REFRESH_TOKEN_SCOPE);
 
         this.setClient(client);
 
@@ -175,66 +178,39 @@ public class JPAOAuthDataProviderImpl extends JPACodeDataProvider {
 
         List<OAuthPermission> permissions = new ArrayList<>();
         for (String requestedScope : requestedScopes) {
+            final OAuthPermission permission;
             if ("read_book".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("read_book");
+                permission = new OAuthPermission("read_book");
                 permission.setHttpVerbs(Collections.singletonList("GET"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/secured/bookstore/books/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/secured/bookstore/books/*"));
             } else if ("create_book".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("create_book");
+                permission = new OAuthPermission("create_book");
                 permission.setHttpVerbs(Collections.singletonList("POST"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/secured/bookstore/books/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/secured/bookstore/books/*"));
             } else if ("create_image".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("create_image");
+                permission = new OAuthPermission("create_image");
                 permission.setHttpVerbs(Collections.singletonList("POST"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/secured/bookstore/image/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/secured/bookstore/image/*"));
             } else if ("read_balance".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("read_balance");
+                permission = new OAuthPermission("read_balance");
                 permission.setHttpVerbs(Collections.singletonList("GET"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/partners/balance/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/partners/balance/*"));
             } else if ("create_balance".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("create_balance");
+                permission = new OAuthPermission("create_balance");
                 permission.setHttpVerbs(Collections.singletonList("POST"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/partners/balance/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/partners/balance/*"));
             } else if ("read_data".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("read_data");
+                permission = new OAuthPermission("read_data");
                 permission.setHttpVerbs(Collections.singletonList("GET"));
-                List<String> uris = new ArrayList<>();
-                String partnerAddress = "/partners/data/*";
-                uris.add(partnerAddress);
-                permission.setUris(uris);
-
-                permissions.add(permission);
+                permission.setUris(Collections.singletonList("/partners/data/*"));
             } else if ("openid".equals(requestedScope)) {
-                OAuthPermission permission = new OAuthPermission("openid", "Authenticate user");
-                permissions.add(permission);
+                permission = new OAuthPermission("openid", "Authenticate user");
+            } else if (OAuthConstants.REFRESH_TOKEN_SCOPE.equals(requestedScope)) {
+                permission = new OAuthPermission(requestedScope);
             } else {
                 throw new OAuthServiceException("invalid_scope");
             }
+            permissions.add(permission);
         }
 
         return permissions;
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/IdTokenProviderImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/IdTokenProviderImpl.java
index d9fcdd0..05d70b8f 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/IdTokenProviderImpl.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/IdTokenProviderImpl.java
@@ -18,26 +18,21 @@
  */
 package org.apache.cxf.systest.jaxrs.security.oidc;
 
-import java.time.Instant;
 import java.util.List;
 
 import org.apache.cxf.rs.security.oauth2.common.UserSubject;
+import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
 import org.apache.cxf.rs.security.oidc.common.IdToken;
 import org.apache.cxf.rs.security.oidc.idp.IdTokenProvider;
 
 public class IdTokenProviderImpl implements IdTokenProvider {
 
-    public IdTokenProviderImpl() {
-
-    }
-
     @Override
     public IdToken getIdToken(String clientId, UserSubject authenticatedUser, List<String> scopes) {
         IdToken token = new IdToken();
 
-        Instant now = Instant.now();
-        token.setIssuedAt(now.getEpochSecond());
-        token.setExpiryTime(now.plusSeconds(60L).getEpochSecond());
+        token.setIssuedAt(OAuthUtils.getIssuedAt());
+        token.setExpiryTime(token.getIssuedAt() + 60L);
         token.setAudience(clientId);
         token.setSubject(authenticatedUser.getLogin());
         token.setIssuer("OIDC IdP");
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java
index dcbed83..75955e5 100644
--- a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/OIDCFlowTest.java
@@ -28,11 +28,14 @@ import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;
 import java.time.Instant;
 import java.util.Collections;
+import java.util.concurrent.TimeUnit;
 
 import javax.ws.rs.core.Form;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 import org.apache.cxf.jaxrs.client.WebClient;
+import org.apache.cxf.rs.security.jose.jaxrs.JsonWebKeysProvider;
 import org.apache.cxf.rs.security.jose.jwa.SignatureAlgorithm;
 import org.apache.cxf.rs.security.jose.jwk.JsonWebKeys;
 import org.apache.cxf.rs.security.jose.jws.JwsHeaders;
@@ -41,9 +44,13 @@ import org.apache.cxf.rs.security.jose.jws.JwsJwtCompactProducer;
 import org.apache.cxf.rs.security.jose.jwt.JwtClaims;
 import org.apache.cxf.rs.security.jose.jwt.JwtConstants;
 import org.apache.cxf.rs.security.jose.jwt.JwtToken;
+import org.apache.cxf.rs.security.oauth2.client.Consumer;
+import org.apache.cxf.rs.security.oauth2.client.OAuthClientUtils;
 import org.apache.cxf.rs.security.oauth2.common.ClientAccessToken;
 import org.apache.cxf.rs.security.oauth2.common.OAuthAuthorizationData;
+import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
 import org.apache.cxf.rs.security.oidc.common.IdToken;
+import org.apache.cxf.rs.security.oidc.rp.IdTokenReader;
 import org.apache.cxf.rs.security.oidc.utils.OidcUtils;
 import org.apache.cxf.systest.jaxrs.security.SecurityTestUtil;
 import org.apache.cxf.systest.jaxrs.security.oauth2.common.OAuth2TestUtils;
@@ -58,6 +65,7 @@ import org.junit.runners.Parameterized.Parameters;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -935,6 +943,47 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
                                                           SignatureAlgorithm.RS256));
     }
 
+    @org.junit.Test
+    public void testAuthorizationCodeFlowRefreshToken() throws Exception {
+        URL busFile = OIDCFlowTest.class.getResource("client.xml");
+
+        String address = "https://localhost:" + port + "/services/";
+        WebClient client = WebClient.create(address, OAuth2TestUtils.setupProviders(),
+                                            "alice", "security", busFile.toString());
+        // Save the Cookie for the second request...
+        WebClient.getConfig(client).getRequestContext().put(
+            org.apache.cxf.message.Message.MAINTAIN_SESSION, Boolean.TRUE);
+
+        // Get Authorization Code
+        String code = OAuth2TestUtils.getAuthorizationCode(client,
+            String.join(" ", OidcUtils.getOpenIdScope(), OAuthConstants.REFRESH_TOKEN_SCOPE),
+            "consumer-id-oidc");
+        assertNotNull(code);
+
+        // Now get the access token
+        client = WebClient.create(address, OAuth2TestUtils.setupProviders(),
+            "consumer-id-oidc", "this-is-a-secret", busFile.toString());
+
+        ClientAccessToken accessToken =
+            OAuth2TestUtils.getAccessTokenWithAuthorizationCode(client, code, "consumer-id-oidc", null);
+        assertNotNull(accessToken.getTokenKey());
+        assertTrue(accessToken.getApprovedScope().contains("openid"));
+
+        IdToken idToken = getIdToken(accessToken, address + "keys/", "consumer-id-oidc");
+        assertNotNull(idToken);
+        Long issuedAt = idToken.getIssuedAt();
+
+        TimeUnit.SECONDS.sleep(1L);
+
+        accessToken = OAuthClientUtils.refreshAccessToken(
+            client,
+            new Consumer("consumer-id-oidc"),
+            accessToken);
+        idToken = getIdToken(accessToken, address + "keys/", "consumer-id-oidc");
+
+        assertNotEquals(issuedAt, idToken.getIssuedAt());
+    }
+
     private void validateIdToken(String idToken, String nonce)
         throws KeyStoreException, NoSuchAlgorithmException, CertificateException, IOException {
         JwsJwtCompactConsumer jwtConsumer = new JwsJwtCompactConsumer(idToken);
@@ -980,6 +1029,19 @@ public class OIDCFlowTest extends AbstractBusClientServerTestBase {
                                                           SignatureAlgorithm.RS256));
     }
 
+    private static IdToken getIdToken(ClientAccessToken accessToken, String jwksUri, String clientId) {
+        WebClient c = WebClient.create(jwksUri,
+            Collections.singletonList(new JsonWebKeysProvider()),
+            "alice", "security",
+            OIDCFlowTest.class.getResource("client.xml").toString())
+            .accept(MediaType.APPLICATION_JSON);
+        IdTokenReader idTokenReader = new IdTokenReader();
+        idTokenReader.setJwkSetClient(c);
+        idTokenReader.setIssuerId("OIDC IdP");
+
+        return idTokenReader.getIdToken(accessToken, new Consumer(clientId));
+    }
+
     private boolean isAccessTokenInJWTFormat() {
         return JWT_JCACHE_SERVER.getPort().equals(port) || JWT_NON_PERSIST_JCACHE_SERVER.getPort().equals(port);
     }
diff --git a/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/SubjectCreatorImpl.java b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/SubjectCreatorImpl.java
new file mode 100644
index 0000000..0915d42
--- /dev/null
+++ b/systests/rs-security/src/test/java/org/apache/cxf/systest/jaxrs/security/oidc/SubjectCreatorImpl.java
@@ -0,0 +1,58 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.systest.jaxrs.security.oidc;
+
+import java.util.Collections;
+import java.util.List;
+
+import javax.ws.rs.core.MultivaluedMap;
+
+import org.apache.cxf.jaxrs.ext.MessageContext;
+import org.apache.cxf.rs.security.oauth2.provider.SubjectCreator;
+import org.apache.cxf.rs.security.oauth2.utils.OAuthConstants;
+import org.apache.cxf.rs.security.oauth2.utils.OAuthUtils;
+import org.apache.cxf.rs.security.oidc.idp.IdTokenProvider;
+import org.apache.cxf.rs.security.oidc.idp.OidcUserSubject;
+import org.apache.cxf.rs.security.oidc.utils.OidcUtils;
+import org.apache.cxf.security.SecurityContext;
+
+
+public class SubjectCreatorImpl implements SubjectCreator {
+
+    private static final IdTokenProvider ID_TOKEN_PROVIDER = new IdTokenProviderImpl();
+
+    @Override
+    public OidcUserSubject createUserSubject(MessageContext mc, MultivaluedMap<String, String> params) {
+        OidcUserSubject oidcSub = new OidcUserSubject(OAuthUtils.createSubject(mc,
+            (SecurityContext)mc.get(SecurityContext.class.getName())));
+
+        final List<String> scopes;
+        String requestedScope = params.getFirst(OAuthConstants.SCOPE);
+        if (requestedScope != null && !requestedScope.isEmpty()) {
+            scopes = OidcUtils.getScopeClaims(requestedScope.split(" "));
+        } else {
+            scopes = Collections.emptyList();
+        }
+
+        oidcSub.setIdToken(ID_TOKEN_PROVIDER.getIdToken(null, oidcSub, scopes));
+
+        return oidcSub;
+    }
+
+}
diff --git a/systests/rs-security/src/test/resources/META-INF/persistence.xml b/systests/rs-security/src/test/resources/META-INF/persistence.xml
index ca34221..ddab4c4 100644
--- a/systests/rs-security/src/test/resources/META-INF/persistence.xml
+++ b/systests/rs-security/src/test/resources/META-INF/persistence.xml
@@ -14,6 +14,7 @@
         <class>org.apache.cxf.rs.security.oauth2.common.AccessToken</class>
         <class>org.apache.cxf.rs.security.oauth2.common.OAuthPermission</class>
         <class>org.apache.cxf.rs.security.oauth2.tokens.refresh.RefreshToken</class>
+        <class>org.apache.cxf.rs.security.oidc.idp.OidcUserSubject</class>
         <exclude-unlisted-classes>true</exclude-unlisted-classes>
         <shared-cache-mode>ENABLE_SELECTIVE</shared-cache-mode>
         <properties>
diff --git a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
index cc14c61..7066ab2 100644
--- a/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
+++ b/systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/oidc/oidc-server-jpa.xml
@@ -81,22 +81,25 @@ under the License.
    
    <bean id="authorizationService" class="org.apache.cxf.rs.security.oidc.idp.OidcAuthorizationCodeService">
       <property name="dataProvider" ref="oauthProvider"/>
+      <property name="subjectCreator" ref="subjectCreator"/>
    </bean>
    
    <bean id="implicitService" class="org.apache.cxf.rs.security.oidc.idp.OidcImplicitService">
       <property name="dataProvider" ref="oauthProvider"/>
       <property name="responseFilter" ref="idTokenFilter"/>
-      <property name="idTokenProvider" ref="idTokenProviderImpl"/>
+      <!-- <property name="idTokenProvider" ref="idTokenProviderImpl"/> -->
+      <property name="subjectCreator" ref="subjectCreator"/>
    </bean>
    
    <bean id="refreshGrantHandler" class="org.apache.cxf.rs.security.oauth2.grants.refresh.RefreshTokenGrantHandler">
       <property name="dataProvider" ref="oauthProvider"/>
    </bean>
-   
-   <bean id="idTokenProviderImpl" class="org.apache.cxf.systest.jaxrs.security.oidc.IdTokenProviderImpl"/>
+
+   <!-- <bean id="idTokenProviderImpl" class="org.apache.cxf.systest.jaxrs.security.oidc.IdTokenProviderImpl"/> -->
+    <bean id="subjectCreator" class="org.apache.cxf.systest.jaxrs.security.oidc.SubjectCreatorImpl" />
 
    <bean id="idTokenFilter" class="org.apache.cxf.rs.security.oidc.idp.IdTokenResponseFilter">
-       <property name="idTokenProvider" ref="idTokenProviderImpl"/>
+       <!-- <property name="idTokenProvider" ref="idTokenProviderImpl"/> -->
    </bean>
    
    <bean id="tokenService" class="org.apache.cxf.rs.security.oauth2.services.AccessTokenService">
@@ -112,7 +115,8 @@ under the License.
    <bean id="hybridService" class="org.apache.cxf.rs.security.oidc.idp.OidcHybridService">
       <property name="dataProvider" ref="oauthProvider"/>
       <property name="responseFilter" ref="idTokenFilter"/>
-      <property name="idTokenProvider" ref="idTokenProviderImpl"/>
+      <!-- <property name="idTokenProvider" ref="idTokenProviderImpl"/> -->
+      <property name="subjectCreator" ref="subjectCreator"/>
       <property name="codeService" ref="authorizationService"/>
    </bean>