You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2024/09/18 21:29:23 UTC

(sling-whiteboard) branch master updated (a5cfc3f6 -> c5552407)

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

rombert pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git


    from a5cfc3f6 Fix markup and encode title
     new 6f6061bf oidc-rp: remove id token persistence, that should never happen
     new c5552407 oidc-rp: split up OidcClient into separate classes

The 2 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:
 ...idcConnection.java => OAuthTokenRefresher.java} | 20 +++---
 .../apache/sling/extensions/oidc_rp/OAuthUris.java | 58 ++++++++++++++++
 .../sling/extensions/oidc_rp/OidcClient.java       | 70 -------------------
 .../sling/extensions/oidc_rp/OidcTokenStore.java   |  2 -
 .../oidc_rp/impl/JcrUserHomeOidcTokenStore.java    | 62 +++--------------
 ...lientImpl.java => OAuthTokenRefresherImpl.java} | 77 ++------------------
 .../oidc_rp/impl/OidcCallbackServlet.java          | 12 ++--
 .../oidc_rp/impl/OidcEntryPointServlet.java        | 60 ++++++++++++++--
 .../oidc_rp/impl/OidcProviderMetadataRegistry.java | 12 +++-
 .../oidc_rp/support/OAuthEnabledSlingServlet.java  | 11 +--
 .../servlets/oidc_rp/AuthorizationCodeFlowIT.java  |  4 --
 .../sling/servlets/oidc_rp/impl/OAuthUrisTest.java | 59 ++++++++++++++++
 .../oidc_rp/impl/OidcConnectionFinderImplTest.java | 43 +++---------
 ...mplTest.java => OidcEntryPointServletTest.java} | 81 ++++++++++------------
 14 files changed, 269 insertions(+), 302 deletions(-)
 copy org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/{OidcConnection.java => OAuthTokenRefresher.java} (61%)
 create mode 100644 org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OAuthUris.java
 delete mode 100644 org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcClient.java
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/{OidcClientImpl.java => OAuthTokenRefresherImpl.java} (51%)
 create mode 100644 org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OAuthUrisTest.java
 rename org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/{OidcClientImplTest.java => OidcEntryPointServletTest.java} (56%)


(sling-whiteboard) 02/02: oidc-rp: split up OidcClient into separate classes

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

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git

commit c55524077d1663528847f657140e242d9f8f8549
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Sep 18 23:26:32 2024 +0200

    oidc-rp: split up OidcClient into separate classes
    
    Clumping those concerns together did not make sense and the name of the interface gave the impression
    that this is an entry point to the API - which it was not.
---
 .../extensions/oidc_rp/OAuthTokenRefresher.java    | 32 +++++++++
 .../apache/sling/extensions/oidc_rp/OAuthUris.java | 58 ++++++++++++++++
 .../sling/extensions/oidc_rp/OidcClient.java       | 70 -------------------
 ...lientImpl.java => OAuthTokenRefresherImpl.java} | 77 ++------------------
 .../oidc_rp/impl/OidcEntryPointServlet.java        | 60 ++++++++++++++--
 .../oidc_rp/impl/OidcProviderMetadataRegistry.java | 12 +++-
 .../oidc_rp/support/OAuthEnabledSlingServlet.java  | 11 +--
 .../sling/servlets/oidc_rp/impl/OAuthUrisTest.java | 59 ++++++++++++++++
 ...mplTest.java => OidcEntryPointServletTest.java} | 81 ++++++++++------------
 9 files changed, 262 insertions(+), 198 deletions(-)

diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OAuthTokenRefresher.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OAuthTokenRefresher.java
new file mode 100644
index 00000000..3b00215f
--- /dev/null
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OAuthTokenRefresher.java
@@ -0,0 +1,32 @@
+/*
+ * 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.sling.extensions.oidc_rp;
+
+public interface OAuthTokenRefresher {
+
+    /**
+     * Refreshes the OIDC tokens based on the supplied refresh token
+     * 
+     * <p>It is the responsibility of the invoker to persist the returned tokens.</p> 
+     * 
+     * @param connection The connection to start the OIDC flow for
+     * @param refreshToken An existing refresh token
+     * @return OIDC tokens
+     * @throws OidcException in case anything goes wrong
+     */
+    OidcTokens refreshTokens(OidcConnection connection, String refreshToken) throws OidcException;
+}
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OAuthUris.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OAuthUris.java
new file mode 100644
index 00000000..e3b7fbf4
--- /dev/null
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OAuthUris.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.sling.extensions.oidc_rp;
+
+import java.net.URI;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+
+import org.apache.sling.api.SlingHttpServletRequest;
+import org.apache.sling.extensions.oidc_rp.impl.OidcEntryPointServlet;
+
+public abstract class OAuthUris {
+
+    /**
+     * Generates a local URI to the OIDC entry point servlet
+     * 
+     * <p>The URI can be used as-is to send a redirect to the user and start the OIDC flow.</p>
+     * 
+     * @param connection The connection to start the OIDC flow for
+     * @param request The current request
+     * @param redirectPath The local redirect path to use after completing the OIDC flow
+     * @return a local URI
+     * @throws OidcException in case anything goes wrong
+     */
+    public static URI getOidcEntryPointUri(OidcConnection connection, SlingHttpServletRequest request, String redirectPath) throws OidcException {
+        StringBuilder uri = new StringBuilder();
+        uri.append(request.getScheme()).append("://").append(request.getServerName());
+        boolean needsExplicitPort = ( "https".equals(request.getScheme()) && request.getServerPort() != 443 )
+                || ( "http".equals(request.getScheme()) && request.getServerPort() != 80 ) ;
+                
+        if ( needsExplicitPort ) {
+            uri.append(':').append(request.getServerPort());
+        }
+        uri.append(OidcEntryPointServlet.PATH).append("?c=").append(connection.name());
+        if ( redirectPath != null )
+            uri.append("&redirect=").append(URLEncoder.encode(redirectPath, StandardCharsets.UTF_8));
+
+        return URI.create(uri.toString());
+    }
+    
+    private OAuthUris() {
+        // prevent instantiation
+    }
+}
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcClient.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcClient.java
deleted file mode 100644
index 12cbd33d..00000000
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcClient.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * 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.sling.extensions.oidc_rp;
-
-import java.net.URI;
-
-import org.apache.sling.api.SlingHttpServletRequest;
-
-/**
- * A client for dealing with over-the-network OIDC concerns
- * 
- * <p>This client is able to generate URLs and make network calls related to OIDC.</p>
- * 
- */
-public interface OidcClient {
-
-    /**
-     * Generates a local URI to the OIDC entry point servlet
-     * 
-     * <p>The URI can be used as-is to send a redirect to the user and start the OIDC flow.</p>
-     * 
-     * @param connection The connection to start the OIDC flow for
-     * @param request The current request
-     * @param redirectPath The local redirect path to use after completing the OIDC flow
-     * @return a local URI
-     * @throws OidcException in case anything goes wrong
-     */
-    URI getOidcEntryPointUri(OidcConnection connection, SlingHttpServletRequest request, String redirectPath) throws OidcException;
-    
-    /**
-     * Generates a URI to the OIDC provider's authorization endpoint
-     * 
-     * <p>The URI can be used as-is to start the OIDC flow directly on the identity provider's side.</p>
-     * 
-     * @param connection The connection to start the OIDC flow for
-     * @param request The current request
-     * @param redirectUri The redirect path to use after completing the OIDC flow
-     * @return a remote URI
-     * @throws OidcException in case anything goes wrong
-     */
-    URI getAuthenticationRequestUri(OidcConnection connection, SlingHttpServletRequest request, URI redirectUri) throws OidcException;
-    
-    // OidcTokens getOidcTokens(OidcConnection connection, String authenticationCode) throws OidcException;
-    
-    /**
-     * Refreshes the OIDC tokens based on the supplied refresh token
-     * 
-     * <p>It is the responsibility of the invoker to persist the returned tokens.</p> 
-     * 
-     * @param connection The connection to start the OIDC flow for
-     * @param refreshToken An existing refresh token
-     * @return OIDC tokens
-     * @throws OidcException in case anything goes wrong
-     */
-    OidcTokens refreshTokens(OidcConnection connection, String refreshToken) throws OidcException;
-}
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcClientImpl.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OAuthTokenRefresherImpl.java
similarity index 51%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcClientImpl.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OAuthTokenRefresherImpl.java
index ee8cc394..47b25bbf 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcClientImpl.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OAuthTokenRefresherImpl.java
@@ -16,17 +16,10 @@
  */
 package org.apache.sling.extensions.oidc_rp.impl;
 
-import static org.apache.sling.extensions.oidc_rp.impl.OidcStateManager.PARAMETER_NAME_CONNECTION;
-import static org.apache.sling.extensions.oidc_rp.impl.OidcStateManager.PARAMETER_NAME_REDIRECT;
-
 import java.io.IOException;
 import java.net.URI;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
 
-import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.extensions.oidc_rp.OidcClient;
+import org.apache.sling.extensions.oidc_rp.OAuthTokenRefresher;
 import org.apache.sling.extensions.oidc_rp.OidcConnection;
 import org.apache.sling.extensions.oidc_rp.OidcException;
 import org.apache.sling.extensions.oidc_rp.OidcTokens;
@@ -37,29 +30,23 @@ import org.osgi.service.component.annotations.Reference;
 import com.nimbusds.oauth2.sdk.AuthorizationGrant;
 import com.nimbusds.oauth2.sdk.ParseException;
 import com.nimbusds.oauth2.sdk.RefreshTokenGrant;
-import com.nimbusds.oauth2.sdk.ResponseType;
-import com.nimbusds.oauth2.sdk.Scope;
 import com.nimbusds.oauth2.sdk.TokenErrorResponse;
 import com.nimbusds.oauth2.sdk.TokenRequest;
 import com.nimbusds.oauth2.sdk.auth.ClientAuthentication;
 import com.nimbusds.oauth2.sdk.auth.ClientSecretBasic;
 import com.nimbusds.oauth2.sdk.auth.Secret;
 import com.nimbusds.oauth2.sdk.id.ClientID;
-import com.nimbusds.oauth2.sdk.id.State;
 import com.nimbusds.oauth2.sdk.token.RefreshToken;
-import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
-import com.nimbusds.openid.connect.sdk.Nonce;
 import com.nimbusds.openid.connect.sdk.OIDCTokenResponse;
-import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
 
-@Component(service = { OidcClientImpl.class, OidcClient.class })
-public class OidcClientImpl implements OidcClient {
+@Component
+public class OAuthTokenRefresherImpl implements OAuthTokenRefresher {
 
     private final OidcProviderMetadataRegistry providerMetadataRegistry;
 
     @Activate
-    public OidcClientImpl(@Reference OidcProviderMetadataRegistry providerMetadataRegistry) {
+    public OAuthTokenRefresherImpl(@Reference OidcProviderMetadataRegistry providerMetadataRegistry) {
         this.providerMetadataRegistry = providerMetadataRegistry;
     }
     
@@ -102,60 +89,4 @@ public class OidcClientImpl implements OidcClient {
         throw new OidcException(e);
     }
     }
-    
-    @Override
-    public URI getOidcEntryPointUri(OidcConnection connection, SlingHttpServletRequest request, String redirectPath) {
-        
-        StringBuilder uri = new StringBuilder();
-        uri.append(request.getScheme()).append("://").append(request.getServerName());
-        boolean needsExplicitPort = ( "https".equals(request.getScheme()) && request.getServerPort() != 443 )
-                || ( "http".equals(request.getScheme()) && request.getServerPort() != 80 ) ;
-                
-        if ( needsExplicitPort ) {
-            uri.append(':').append(request.getServerPort());
-        }
-        uri.append(OidcEntryPointServlet.PATH).append("?c=").append(connection.name());
-        if ( redirectPath != null )
-            uri.append("&redirect=").append(URLEncoder.encode(redirectPath, StandardCharsets.UTF_8));
-
-        return URI.create(uri.toString());
-    }
-
-    @Override
-    public URI getAuthenticationRequestUri(OidcConnection connection, SlingHttpServletRequest request, URI redirectUri) {
-        OIDCProviderMetadata providerMetadata = providerMetadataRegistry.getProviderMetadata(connection.baseUrl());
-
-        // The client ID provisioned by the OpenID provider when
-        // the client was registered
-        ClientID clientID = new ClientID(connection.clientId());
-
-        // Generate random state string to securely pair the callback to this request
-        State state = new State();
-        OidcStateManager stateManager = OidcStateManager.stateFor(request);
-        stateManager.registerState(state);
-        stateManager.putAttribute(state, PARAMETER_NAME_CONNECTION, connection.name());
-        if ( request.getParameter(PARAMETER_NAME_REDIRECT) != null )
-            stateManager.putAttribute(state, PARAMETER_NAME_REDIRECT, request.getParameter(PARAMETER_NAME_REDIRECT));
-
-        // Generate nonce for the ID token
-        Nonce nonce = new Nonce();
-
-        // Compose the OpenID authentication request (for the code flow)
-        AuthenticationRequest.Builder authRequestBuilder = new AuthenticationRequest.Builder(
-                new ResponseType("code"),
-                new Scope(connection.scopes()),
-                clientID, URI.create(OidcCallbackServlet.getCallbackUri(request)))
-            .endpointURI(providerMetadata.getAuthorizationEndpointURI())
-            .state(state)
-            .nonce(nonce);
-        
-        if ( connection.additionalAuthorizationParameters() != null ) {
-            Arrays.stream(connection.additionalAuthorizationParameters())
-                .map( s -> s.split("=") )
-                .filter( p -> p.length == 2 )
-                .forEach( p -> authRequestBuilder.customParameter(p[0], p[1]));
-        }
-        
-        return authRequestBuilder.build().toURI();
-    }
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcEntryPointServlet.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcEntryPointServlet.java
index 2daa0698..cdf856c0 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcEntryPointServlet.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcEntryPointServlet.java
@@ -16,10 +16,13 @@
  */
 package org.apache.sling.extensions.oidc_rp.impl;
 
+import static org.apache.sling.extensions.oidc_rp.impl.OidcStateManager.PARAMETER_NAME_CONNECTION;
+import static org.apache.sling.extensions.oidc_rp.impl.OidcStateManager.PARAMETER_NAME_REDIRECT;
 import static org.osgi.service.component.annotations.ReferencePolicyOption.GREEDY;
 
 import java.io.IOException;
 import java.net.URI;
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.function.Function;
@@ -33,7 +36,6 @@ import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.apache.sling.auth.core.AuthConstants;
-import org.apache.sling.extensions.oidc_rp.OidcClient;
 import org.apache.sling.extensions.oidc_rp.OidcConnection;
 import org.apache.sling.servlets.annotations.SlingServletPaths;
 import org.osgi.service.component.annotations.Activate;
@@ -42,6 +44,14 @@ import org.osgi.service.component.annotations.Reference;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.nimbusds.oauth2.sdk.ResponseType;
+import com.nimbusds.oauth2.sdk.Scope;
+import com.nimbusds.oauth2.sdk.id.ClientID;
+import com.nimbusds.oauth2.sdk.id.State;
+import com.nimbusds.openid.connect.sdk.AuthenticationRequest;
+import com.nimbusds.openid.connect.sdk.Nonce;
+import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
+
 @Component(service = { Servlet.class },
     property = { AuthConstants.AUTH_REQUIREMENTS +"=" + OidcEntryPointServlet.PATH }
 )
@@ -49,21 +59,22 @@ import org.slf4j.LoggerFactory;
 public class OidcEntryPointServlet extends SlingAllMethodsServlet {
     private static final long serialVersionUID = 1L;
 
-    static final String PATH = "/system/sling/oidc/entry-point"; // NOSONAR
+    public static final String PATH = "/system/sling/oidc/entry-point"; // NOSONAR
     
     private final Logger logger = LoggerFactory.getLogger(getClass());
     
     private final Map<String, OidcConnection> connections;
 
-    private final OidcClient oidcClient;
+    private final OidcProviderMetadataRegistry oidcRegistry;
 
     @Activate
     public OidcEntryPointServlet(@Reference(policyOption = GREEDY) List<OidcConnection> connections,
-            @Reference OidcClient oidcClient) {
+            @Reference OidcProviderMetadataRegistry oidcRegistry) {
         this.connections = connections.stream()
                 .collect(Collectors.toMap( OidcConnection::name, Function.identity()));
-        this.oidcClient = oidcClient;
+        this.oidcRegistry = oidcRegistry;
     }
+
     @Override
     protected void doGet(SlingHttpServletRequest request, SlingHttpServletResponse response)
             throws ServletException, IOException {
@@ -85,6 +96,43 @@ public class OidcEntryPointServlet extends SlingAllMethodsServlet {
         if ( connection.baseUrl() == null )
             throw new ServletException("Misconfigured baseUrl");
             
-        response.sendRedirect(oidcClient.getAuthenticationRequestUri(connection, request, URI.create(OidcCallbackServlet.getCallbackUri(request))).toString());
+        response.sendRedirect(getAuthenticationRequestUri(connection, request, URI.create(OidcCallbackServlet.getCallbackUri(request))).toString());
+    }
+    
+    private URI getAuthenticationRequestUri(OidcConnection connection, SlingHttpServletRequest request, URI redirectUri) {
+        OIDCProviderMetadata providerMetadata = oidcRegistry.getProviderMetadata(connection.baseUrl());
+
+        // The client ID provisioned by the OpenID provider when
+        // the client was registered
+        ClientID clientID = new ClientID(connection.clientId());
+
+        // Generate random state string to securely pair the callback to this request
+        State state = new State();
+        OidcStateManager stateManager = OidcStateManager.stateFor(request);
+        stateManager.registerState(state);
+        stateManager.putAttribute(state, PARAMETER_NAME_CONNECTION, connection.name());
+        if ( request.getParameter(PARAMETER_NAME_REDIRECT) != null )
+            stateManager.putAttribute(state, PARAMETER_NAME_REDIRECT, request.getParameter(PARAMETER_NAME_REDIRECT));
+
+        // Generate nonce for the ID token
+        Nonce nonce = new Nonce();
+
+        // Compose the OpenID authentication request (for the code flow)
+        AuthenticationRequest.Builder authRequestBuilder = new AuthenticationRequest.Builder(
+                new ResponseType("code"),
+                new Scope(connection.scopes()),
+                clientID, URI.create(OidcCallbackServlet.getCallbackUri(request)))
+            .endpointURI(providerMetadata.getAuthorizationEndpointURI())
+            .state(state)
+            .nonce(nonce);
+        
+        if ( connection.additionalAuthorizationParameters() != null ) {
+            Arrays.stream(connection.additionalAuthorizationParameters())
+                .map( s -> s.split("=") )
+                .filter( p -> p.length == 2 )
+                .forEach( p -> authRequestBuilder.customParameter(p[0], p[1]));
+        }
+        
+        return authRequestBuilder.build().toURI();
     }
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcProviderMetadataRegistry.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcProviderMetadataRegistry.java
index 6a147a5d..66a2c4c3 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcProviderMetadataRegistry.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcProviderMetadataRegistry.java
@@ -17,6 +17,7 @@
 package org.apache.sling.extensions.oidc_rp.impl;
 
 import java.io.IOException;
+import java.net.URI;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -40,7 +41,8 @@ import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 public class OidcProviderMetadataRegistry {
     private final ConcurrentMap<String, OIDCProviderMetadata> cache = new ConcurrentHashMap<>();
 
-    public OIDCProviderMetadata getProviderMetadata(String base) {
+    // visible for testing
+    protected OIDCProviderMetadata getProviderMetadata(String base) {
         return cache.computeIfAbsent(base, s -> {
             try {
                 return OIDCProviderMetadata.resolve(new Issuer(s));
@@ -49,4 +51,12 @@ public class OidcProviderMetadataRegistry {
             }
         });
     }
+    
+    public URI getTokenEndpoint(String base) {
+        return getProviderMetadata(base).getTokenEndpointURI();
+    }
+    
+    public URI getAuthorizationEndpoint(String base) {
+        return getProviderMetadata(base).getAuthorizationEndpointURI();
+    }
 }
\ No newline at end of file
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/support/OAuthEnabledSlingServlet.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/support/OAuthEnabledSlingServlet.java
index a4d38506..9693e60a 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/support/OAuthEnabledSlingServlet.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/support/OAuthEnabledSlingServlet.java
@@ -25,7 +25,8 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.servlets.SlingSafeMethodsServlet;
-import org.apache.sling.extensions.oidc_rp.OidcClient;
+import org.apache.sling.extensions.oidc_rp.OAuthUris;
+import org.apache.sling.extensions.oidc_rp.OAuthTokenRefresher;
 import org.apache.sling.extensions.oidc_rp.OidcConnection;
 import org.apache.sling.extensions.oidc_rp.OidcToken;
 import org.apache.sling.extensions.oidc_rp.OidcTokenState;
@@ -45,9 +46,9 @@ public abstract class OAuthEnabledSlingServlet extends SlingSafeMethodsServlet {
 
     private final OidcTokenStore tokenStore;
 
-    private final OidcClient oidcClient;
+    private final OAuthTokenRefresher oidcClient;
 	
-    protected OAuthEnabledSlingServlet(OidcConnection connection, OidcTokenStore tokenStore, OidcClient oidcClient) {
+    protected OAuthEnabledSlingServlet(OidcConnection connection, OidcTokenStore tokenStore, OAuthTokenRefresher oidcClient) {
         this.connection = Objects.requireNonNull(connection, "connection may not null");
         this.tokenStore = Objects.requireNonNull(tokenStore, "tokenStore may not null");
         this.oidcClient = Objects.requireNonNull(oidcClient, "oidcClient may not null");
@@ -74,12 +75,12 @@ public abstract class OAuthEnabledSlingServlet extends SlingSafeMethodsServlet {
 	        doGetWithToken(request, response, tokenResponse);
 	        break;
 	      case MISSING:
-	        response.sendRedirect(oidcClient.getOidcEntryPointUri(connection, request, redirectPath).toString());
+	        response.sendRedirect(OAuthUris.getOidcEntryPointUri(connection, request, redirectPath).toString());
 	        break;
 	      case EXPIRED:
 	        OidcToken refreshToken = tokenStore.getRefreshToken(connection, request.getResourceResolver());
 	        if ( refreshToken.getState() != OidcTokenState.VALID ) {
-	          response.sendRedirect(oidcClient.getOidcEntryPointUri(connection, request, redirectPath).toString());
+	          response.sendRedirect(OAuthUris.getOidcEntryPointUri(connection, request, redirectPath).toString());
 	          return;
 	        }
 	        
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OAuthUrisTest.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OAuthUrisTest.java
new file mode 100644
index 00000000..27ba7325
--- /dev/null
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OAuthUrisTest.java
@@ -0,0 +1,59 @@
+/*
+ * 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.sling.servlets.oidc_rp.impl;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.net.URI;
+
+import org.apache.sling.extensions.oidc_rp.OAuthUris;
+import org.apache.sling.testing.mock.sling.junit5.SlingContext;
+import org.apache.sling.testing.mock.sling.junit5.SlingContextExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+
+@ExtendWith(SlingContextExtension.class)
+class OAuthUrisTest {
+
+    private final SlingContext context = new SlingContext();
+    
+    @Test
+    void testRedirectUri() {
+        URI redirectUri = OAuthUris.getOidcEntryPointUri(MockOidcConnection.DEFAULT_CONNECTION, context.request(), "/foo");
+        
+        assertThat(redirectUri).as("redirect uri")
+            .hasScheme("http")    
+            .hasHost("localhost")
+            .hasNoPort()
+            .hasPath("/system/sling/oidc/entry-point")
+            .hasQuery("c=mock-oidc&redirect=/foo");
+    }
+
+    @Test
+    void testRedirectUri_customPort_noRedirect() {
+        context.request().setServerPort(8080);
+        URI redirectUri = OAuthUris.getOidcEntryPointUri(MockOidcConnection.DEFAULT_CONNECTION, context.request(), null);
+        
+        assertThat(redirectUri).as("redirect uri")
+            .hasScheme("http")    
+            .hasHost("localhost")
+            .hasPort(8080)
+            .hasPath("/system/sling/oidc/entry-point")
+            .hasQuery("c=mock-oidc");
+    }
+
+}
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcClientImplTest.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServletTest.java
similarity index 56%
rename from org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcClientImplTest.java
rename to org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServletTest.java
index 23c01814..10c0f413 100644
--- a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcClientImplTest.java
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServletTest.java
@@ -18,14 +18,21 @@ package org.apache.sling.servlets.oidc_rp.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.io.IOException;
 import java.net.URI;
+import java.util.Arrays;
 import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+
+import javax.servlet.ServletException;
 
 import org.apache.sling.extensions.oidc_rp.OidcConnection;
-import org.apache.sling.extensions.oidc_rp.impl.OidcClientImpl;
+import org.apache.sling.extensions.oidc_rp.impl.OidcEntryPointServlet;
 import org.apache.sling.extensions.oidc_rp.impl.OidcProviderMetadataRegistry;
 import org.apache.sling.testing.mock.sling.junit5.SlingContext;
 import org.apache.sling.testing.mock.sling.junit5.SlingContextExtension;
+import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -35,17 +42,23 @@ import com.nimbusds.openid.connect.sdk.SubjectType;
 import com.nimbusds.openid.connect.sdk.op.OIDCProviderMetadata;
 
 @ExtendWith(SlingContextExtension.class)
-class OidcClientImplTest {
+class OidcEntryPointServletTest {
 
-    private final SlingContext context = new SlingContext();
+    private static final String MOCK_OIDC_PARAM = "mock-oidc-param";
     
-    private OidcClientImpl clientImpl;
+    private final SlingContext context = new SlingContext();
+    private List<OidcConnection> connections;
+    private OidcEntryPointServlet servlet;
     
     @BeforeEach
-    void initClient() {
-        clientImpl =  new OidcClientImpl(new OidcProviderMetadataRegistry() {
+    void initServlet() {
+        connections = Arrays.asList(
+                MockOidcConnection.DEFAULT_CONNECTION,
+                new MockOidcConnection(new String[] {"openid"}, MOCK_OIDC_PARAM, "client-id", "client-secret", "http://example.com", new String[] { "access_type=offline" } )
+            );
+        servlet =  new OidcEntryPointServlet(connections, new OidcProviderMetadataRegistry() {
             @Override
-            public OIDCProviderMetadata getProviderMetadata(String base) {
+            protected OIDCProviderMetadata getProviderMetadata(String base) {
                 return new OIDCProviderMetadata(new Issuer(base), Collections.singletonList(SubjectType.PUBLIC), URI.create("https://foo.example/jwks")) {
                     @Override
                     public URI getAuthorizationEndpointURI() {
@@ -57,36 +70,16 @@ class OidcClientImplTest {
     }
     
     @Test
-    void testRedirectUri() {
-        URI redirectUri = clientImpl.getOidcEntryPointUri(MockOidcConnection.DEFAULT_CONNECTION, context.request(), "/foo");
-        
-        assertThat(redirectUri).as("redirect uri")
-            .hasScheme("http")    
-            .hasHost("localhost")
-            .hasNoPort()
-            .hasPath("/system/sling/oidc/entry-point")
-            .hasQuery("c=mock-oidc&redirect=/foo");
-    }
+    void testRedirectWithValidConnection() throws ServletException, IOException {
 
-    @Test
-    void testRedirectUri_customPort_noRedirect() {
-        context.request().setServerPort(8080);
-        URI redirectUri = clientImpl.getOidcEntryPointUri(MockOidcConnection.DEFAULT_CONNECTION, context.request(), null);
+        context.request().setQueryString("c=" + MockOidcConnection.DEFAULT_CONNECTION.name());
+        MockSlingHttpServletResponse response = context.response();
         
-        assertThat(redirectUri).as("redirect uri")
-            .hasScheme("http")    
-            .hasHost("localhost")
-            .hasPort(8080)
-            .hasPath("/system/sling/oidc/entry-point")
-            .hasQuery("c=mock-oidc");
-    }
-    
-    @Test
-    void testGetAuthenticationRequestUri() {
-    
-        URI requestUri = clientImpl.getAuthenticationRequestUri(MockOidcConnection.DEFAULT_CONNECTION, context.request(), URI.create("http://localhost/callback"));
-
-        assertThat(requestUri).as("authentication request uri")
+        servlet.service(context.request(), response);
+        
+        URI location = URI.create(Objects.requireNonNull(response.getHeader("Location"), "location header"));
+        
+        assertThat(location).as("authentication request uri")
             .hasScheme("https")
             .hasHost("foo.example")
             .hasPath("/authz")
@@ -95,18 +88,20 @@ class OidcClientImplTest {
             .hasParameter("client_id", "client-id")
             .hasParameter("redirect_uri", "http://localhost/system/sling/oidc/callback")
             .hasParameter("nonce")
-            .hasParameter("state");
+            .hasParameter("state");        
     }
     
     @Test
-    void testGetAuthenticationRequestUri_customParam() {
-    
-        OidcConnection connection = new MockOidcConnection(new String[] {"openid"}, "mock-oidc", "client-id", "client-secret", "http://example.com", new String[] { "access_type=offline" } );
+    void redirectWithValidConnectionAndCustomParameter() throws ServletException, IOException {
+     
+        context.request().setQueryString("c=" + MOCK_OIDC_PARAM);
+        MockSlingHttpServletResponse response = context.response();
         
-        URI requestUri = clientImpl.getAuthenticationRequestUri(connection, context.request(), URI.create("http://localhost/callback"));
-
-        assertThat(requestUri).as("authentication request uri")
+        servlet.service(context.request(), response);
+        
+        URI location = URI.create(Objects.requireNonNull(response.getHeader("Location"), "location header"));
+        
+        assertThat(location).as("authentication request uri")
             .hasParameter("access_type", "offline");
     }
-
 }


(sling-whiteboard) 01/02: oidc-rp: remove id token persistence, that should never happen

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

rombert pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-whiteboard.git

commit 6f6061bf50a684199210203bbf01eca5513f994b
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Wed Sep 18 17:41:12 2024 +0200

    oidc-rp: remove id token persistence, that should never happen
    
    Additionally, make the OidcCallbackServlet use the token store API rather than requiring the JCR impl.
---
 .../sling/extensions/oidc_rp/OidcTokenStore.java   |  2 -
 .../oidc_rp/impl/JcrUserHomeOidcTokenStore.java    | 62 ++++------------------
 .../oidc_rp/impl/OidcCallbackServlet.java          | 12 +++--
 .../servlets/oidc_rp/AuthorizationCodeFlowIT.java  |  4 --
 .../oidc_rp/impl/OidcConnectionFinderImplTest.java | 43 ++++-----------
 5 files changed, 27 insertions(+), 96 deletions(-)

diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenStore.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenStore.java
index 603ddc52..b5a56297 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenStore.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenStore.java
@@ -43,7 +43,5 @@ public interface OidcTokenStore {
     
     OidcToken getRefreshToken(OidcConnection connection, ResourceResolver resolver) throws OidcException;
     
-    OidcToken getIdToken(OidcConnection connection, ResourceResolver resolver) throws OidcException;
-    
     void persistTokens(OidcConnection connection, ResourceResolver resolver, OidcTokens tokens) throws OidcException;
 }
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/JcrUserHomeOidcTokenStore.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/JcrUserHomeOidcTokenStore.java
index 70d59a8e..f4c578d3 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/JcrUserHomeOidcTokenStore.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/JcrUserHomeOidcTokenStore.java
@@ -16,10 +16,9 @@
  */
 package org.apache.sling.extensions.oidc_rp.impl;
 
-import java.time.LocalDateTime;
+import java.time.Instant;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 
@@ -40,19 +39,13 @@ import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
-import com.nimbusds.oauth2.sdk.token.RefreshToken;
-import com.nimbusds.oauth2.sdk.token.Tokens;
-import com.nimbusds.openid.connect.sdk.token.OIDCTokens;
-
-@Component(service = { OidcTokenStore.class, JcrUserHomeOidcTokenStore.class } )
+@Component(service = { OidcTokenStore.class } )
 public class JcrUserHomeOidcTokenStore implements OidcTokenStore {
 
     // TODO - expires_at
     private static final String PROPERTY_NAME_EXPIRES_AT = "expiresAt";
     private static final String PROPERTY_NAME_ACCESS_TOKEN = "access_token";
     private static final String PROPERTY_NAME_REFRESH_TOKEN = "refresh_token";
-    private static final String PROPERTY_NAME_ID_TOKEN = "id_token";
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
 
@@ -102,32 +95,18 @@ public class JcrUserHomeOidcTokenStore implements OidcTokenStore {
     }
     
     @Override
-    public OidcToken getIdToken(OidcConnection connection, ResourceResolver resolver) {
-        try {
-            User user = resolver.adaptTo(User.class);
-            
-            return getToken(connection, user, PROPERTY_NAME_ID_TOKEN);
-        } catch (RepositoryException e) {
-            throw new OidcException(e);
-        }
-    }
-    
-    public void persistTokens(OidcConnection connection, ResourceResolver resolver, OIDCTokens tokens) {
-        persistTokens0(connection, resolver, tokens);
-    }
-
-    private void persistTokens0(OidcConnection connection, ResourceResolver resolver, Tokens tokens) {
+    public void persistTokens(OidcConnection connection, ResourceResolver resolver, OidcTokens tokens) {
         try {
             User currentUser = resolver.adaptTo(User.class);
             Session session = resolver.adaptTo(Session.class);
 
             ZonedDateTime expiry = null;
-            long expiresIn = tokens.getAccessToken().getLifetime();
-            if ( expiresIn > 0 ) {
-                expiry = LocalDateTime.now().plus(expiresIn, ChronoUnit.SECONDS).atZone(ZoneId.systemDefault());
+            long expiresAt = tokens.expiresAt();
+            if ( expiresAt > 0 ) {
+                expiry = ZonedDateTime.ofInstant(Instant.ofEpochMilli(expiresAt), ZoneId.systemDefault());
             }
 
-            String accessToken = tokens.getAccessToken().getValue();
+            String accessToken = tokens.accessToken();
             currentUser.setProperty(propertyPath(connection, PROPERTY_NAME_ACCESS_TOKEN), session.getValueFactory().createValue(accessToken));
             if ( expiry != null ) {
                 Calendar cal = GregorianCalendar.from(expiry);
@@ -135,42 +114,19 @@ public class JcrUserHomeOidcTokenStore implements OidcTokenStore {
             } else
                 currentUser.removeProperty(propertyPath(connection, PROPERTY_NAME_EXPIRES_AT));
 
-            if ( tokens.getRefreshToken() != null ) {
-                String refreshToken = tokens.getRefreshToken().getValue();
+            if ( tokens.refreshToken() != null ) {
+                String refreshToken = tokens.refreshToken();
                 if ( refreshToken != null )
                     currentUser.setProperty(propertyPath(connection, PROPERTY_NAME_REFRESH_TOKEN), session.getValueFactory().createValue(refreshToken));
                 else
                     currentUser.removeProperty(propertyPath(connection, PROPERTY_NAME_REFRESH_TOKEN));
             }
 
-            if ( tokens instanceof OIDCTokens oidcTokens) {
-                // don't touch the id token if we don't have an OIDC token, e.g. when refreshing the access token
-                String idToken = oidcTokens.getIDTokenString();
-                if ( idToken != null )
-                    currentUser.setProperty(propertyPath(connection, PROPERTY_NAME_ID_TOKEN), session.getValueFactory().createValue(idToken));
-                else
-                    currentUser.removeProperty(propertyPath(connection, PROPERTY_NAME_ID_TOKEN));
-            }
-
             session.save();
         } catch (RepositoryException e) {
             throw new OidcException(e);
         }
     }
-    
-    @Override
-    public void persistTokens(OidcConnection connection, ResourceResolver resolver, OidcTokens tokenPair) {
-        OIDCTokens nimbusTokens;
-        RefreshToken nimbusRefreshToken = new RefreshToken(tokenPair.refreshToken());
-        BearerAccessToken nimbusAccessToken = new BearerAccessToken(tokenPair.accessToken(), tokenPair.expiresAt(), null);
-        if ( tokenPair.idToken() != null ) {
-            nimbusTokens = new OIDCTokens(tokenPair.idToken(), nimbusAccessToken, nimbusRefreshToken); 
-        } else {
-            nimbusTokens = new OIDCTokens(nimbusAccessToken, nimbusRefreshToken);
-        }
-        
-        persistTokens(connection, resolver, nimbusTokens);
-    }
 
     private String propertyPath(OidcConnection connection, String propertyName) {
         return nodePath(connection) + "/" + propertyName;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcCallbackServlet.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcCallbackServlet.java
index e1635ae3..565058ce 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcCallbackServlet.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcCallbackServlet.java
@@ -39,6 +39,8 @@ import org.apache.sling.api.SlingHttpServletResponse;
 import org.apache.sling.api.servlets.SlingAllMethodsServlet;
 import org.apache.sling.auth.core.AuthConstants;
 import org.apache.sling.extensions.oidc_rp.OidcConnection;
+import org.apache.sling.extensions.oidc_rp.OidcTokenStore;
+import org.apache.sling.extensions.oidc_rp.OidcTokens;
 import org.apache.sling.servlets.annotations.SlingServletPaths;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -72,7 +74,7 @@ public class OidcCallbackServlet extends SlingAllMethodsServlet {
 
     private final Logger logger = LoggerFactory.getLogger(getClass());
     private final Map<String, OidcConnection> connections;
-    private final JcrUserHomeOidcTokenStore tokenStore;
+    private final OidcTokenStore tokenStore;
     private final OidcProviderMetadataRegistry metadataRegistry;
 
     static String getCallbackUri(HttpServletRequest request) {
@@ -86,7 +88,7 @@ public class OidcCallbackServlet extends SlingAllMethodsServlet {
     }
 
     @Activate
-    public OidcCallbackServlet(@Reference(policyOption = GREEDY) List<OidcConnection> connections, @Reference JcrUserHomeOidcTokenStore tokenStore,
+    public OidcCallbackServlet(@Reference(policyOption = GREEDY) List<OidcConnection> connections, @Reference OidcTokenStore tokenStore,
             @Reference OidcProviderMetadataRegistry metadataRegistry) {
         this.connections = connections.stream()
                 .collect(Collectors.toMap( OidcConnection::name, Function.identity()));
@@ -159,8 +161,10 @@ public class OidcCallbackServlet extends SlingAllMethodsServlet {
             // - does the 'aud' claim match the client id of our connection
             // - nonce validation (?)
             // - iat/exp validation (?)
-
-            tokenStore.persistTokens(connection, request.getResourceResolver(), tokenResponse.getOIDCTokens());
+            
+            OidcTokens tokens = Converter.toApiOidcTokens(tokenResponse.getOIDCTokens());
+            
+            tokenStore.persistTokens(connection, request.getResourceResolver(), tokens);
 
             if ( redirect.isEmpty() ) {
                 response.setStatus(HttpServletResponse.SC_OK);
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/AuthorizationCodeFlowIT.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/AuthorizationCodeFlowIT.java
index c3543319..8396215d 100644
--- a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/AuthorizationCodeFlowIT.java
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/AuthorizationCodeFlowIT.java
@@ -182,10 +182,6 @@ class AuthorizationCodeFlowIT {
         // validate that the JWT is valid; we trust what keycloak has returned but just want to ensure that
         // the token was stored correctly
         SignedJWT.parse(accesToken);
-
-        // in a similar manner, validate the id_token
-        String idToken = keycloakToken.get("id_token").asText();
-        SignedJWT.parse(idToken);
     }
 
     private String getUserPath(SlingClient sling, String authorizableId) throws ClientException {
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImplTest.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImplTest.java
index 5d26a5e7..54de7f7c 100644
--- a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImplTest.java
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionFinderImplTest.java
@@ -23,12 +23,12 @@ import java.util.concurrent.TimeUnit;
 import javax.jcr.RepositoryException;
 
 import org.apache.jackrabbit.api.security.user.User;
-import org.apache.sling.api.resource.LoginException;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.extensions.oidc_rp.OidcConnection;
 import org.apache.sling.extensions.oidc_rp.OidcToken;
 import org.apache.sling.extensions.oidc_rp.OidcTokenState;
+import org.apache.sling.extensions.oidc_rp.impl.Converter;
 import org.apache.sling.extensions.oidc_rp.impl.JcrUserHomeOidcTokenStore;
 import org.apache.sling.jackrabbit.usermanager.impl.AuthorizableAdapterFactory;
 import org.apache.sling.testing.mock.sling.ResourceResolverType;
@@ -56,12 +56,12 @@ class OidcConnectionFinderImplTest {
     }
 
     @Test
-    void persistTokens_accessTokenOnly() throws LoginException, RepositoryException {
+    void persistTokens_accessTokenOnly() throws RepositoryException {
 
         OIDCTokens tokens = new OIDCTokens(new BearerAccessToken(12), null);
 
         JcrUserHomeOidcTokenStore connectionFinder = new JcrUserHomeOidcTokenStore();
-        connectionFinder.persistTokens(connection, context.resourceResolver(), tokens);
+        connectionFinder.persistTokens(connection, context.resourceResolver(), Converter.toApiOidcTokens(tokens));
 
         Resource connectionResource = getConnectionResource(connection);
 
@@ -73,19 +73,20 @@ class OidcConnectionFinderImplTest {
     }
 
     @Test
-    void persistTokens_accessAndIdToken() throws LoginException, RepositoryException {
+    void persistTokens_accessAndIdToken() throws RepositoryException {
 
         OIDCTokens tokens = new OIDCTokens(new PlainJWT(new JWTClaimsSet.Builder().issuer("example.com").build()), new BearerAccessToken(12), null);
 
         JcrUserHomeOidcTokenStore connectionFinder = new JcrUserHomeOidcTokenStore();
-        connectionFinder.persistTokens(connection, context.resourceResolver(), tokens);
+        connectionFinder.persistTokens(connection, context.resourceResolver(), Converter.toApiOidcTokens(tokens));
 
         Resource connectionResource = getConnectionResource(connection);
 
+        // we explicitly do not store the id token, that is only useful if we want an authentication handler
         ValueMap connectionProps = connectionResource.getValueMap();
         assertThat(connectionProps)
             .as("stored tokens for connection")
-            .containsOnlyKeys("jcr:primaryType", "access_token", "id_token")
+            .containsOnlyKeys("jcr:primaryType", "access_token")
             .containsEntry("access_token", tokens.getAccessToken().getValue());
     }
 
@@ -109,7 +110,7 @@ class OidcConnectionFinderImplTest {
         OIDCTokens tokens = new OIDCTokens(new BearerAccessToken(12), null);
 
         JcrUserHomeOidcTokenStore connectionFinder = new JcrUserHomeOidcTokenStore();
-        connectionFinder.persistTokens(connection, context.resourceResolver(), tokens);
+        connectionFinder.persistTokens(connection, context.resourceResolver(), Converter.toApiOidcTokens(tokens));
         
         OidcToken accessToken = connectionFinder.getAccessToken(connection, context.resourceResolver());
         assertThat(accessToken).as("access token")
@@ -125,7 +126,7 @@ class OidcConnectionFinderImplTest {
         OIDCTokens tokens = new OIDCTokens(new BearerAccessToken(12, lifetimeSeconds, null), null);
         
         JcrUserHomeOidcTokenStore connectionFinder = new JcrUserHomeOidcTokenStore();
-        connectionFinder.persistTokens(connection, context.resourceResolver(), tokens);
+        connectionFinder.persistTokens(connection, context.resourceResolver(), Converter.toApiOidcTokens(tokens));
 
         // wait for the token to expire
         Thread.sleep( TimeUnit.SECONDS.toMillis( 2 * lifetimeSeconds ) );
@@ -142,7 +143,7 @@ class OidcConnectionFinderImplTest {
         OIDCTokens tokens = new OIDCTokens(new BearerAccessToken(12), new RefreshToken(12));
 
         JcrUserHomeOidcTokenStore connectionFinder = new JcrUserHomeOidcTokenStore();
-        connectionFinder.persistTokens(connection, context.resourceResolver(), tokens);
+        connectionFinder.persistTokens(connection, context.resourceResolver(), Converter.toApiOidcTokens(tokens));
         
         OidcToken refreshToken = connectionFinder.getRefreshToken(connection, context.resourceResolver());
         assertThat(refreshToken).as("refresh token")
@@ -163,30 +164,6 @@ class OidcConnectionFinderImplTest {
             .isEqualTo( OidcTokenState.MISSING);
     }
     
-    @Test
-    void getIdToken_missing() {
-        JcrUserHomeOidcTokenStore connectionFinder = new JcrUserHomeOidcTokenStore();
-        
-        OidcToken refreshToken = connectionFinder.getIdToken(connection, context.resourceResolver());
-        assertThat(refreshToken).as("id token")
-            .isNotNull()
-            .extracting( OidcToken::getState )
-            .isEqualTo( OidcTokenState.MISSING);
-    }
-
-    @Test
-    void getIdToken_valid() {
-        OIDCTokens tokens = new OIDCTokens(new PlainJWT(new JWTClaimsSet.Builder().issuer("example.com").build()), new BearerAccessToken(12), null);
-        JcrUserHomeOidcTokenStore connectionFinder = new JcrUserHomeOidcTokenStore();
-        connectionFinder.persistTokens(connection, context.resourceResolver(), tokens);
-        
-        OidcToken refreshToken = connectionFinder.getIdToken(connection, context.resourceResolver());
-        assertThat(refreshToken).as("id token")
-            .isNotNull()
-            .extracting( OidcToken::getState, OidcToken::getValue )
-            .containsExactly( OidcTokenState.VALID, tokens.getIDTokenString() );
-    }
-    
     private Resource getConnectionResource(OidcConnection connection) throws RepositoryException {
         String userPath = context.resourceResolver().adaptTo(User.class).getPath();
         Resource userHomeResource = context.resourceResolver().getResource(userPath);