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 2023/07/07 09:52:00 UTC

[sling-whiteboard] branch master updated (3751f553 -> 69f4b030)

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 3751f553 oidc-rp: Rename the OidcConnectionFinder to OidcTokenStore and clarify some APIs/docs
     new 86eb9d33 oidc-rp: change artifact id and package
     new 69f4b030 oidc-rp: refresh documentation

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:
 org.apache.sling.servlets.oidc-rp/README.md        | 140 ++++++++++++---------
 org.apache.sling.servlets.oidc-rp/pom.xml          |   4 +-
 .../oidc_rp/OidcClient.java                        |   2 +-
 .../oidc_rp/OidcConnection.java                    |   2 +-
 .../oidc_rp/OidcException.java                     |   2 +-
 .../oidc_rp/OidcToken.java                         |   2 +-
 .../oidc_rp/OidcTokenState.java                    |   2 +-
 .../oidc_rp/OidcTokenStore.java                    |   2 +-
 .../oidc_rp/OidcTokens.java                        |   2 +-
 .../oidc_rp/impl/Converter.java                    |   4 +-
 .../oidc_rp/impl/JcrUserHomeOidcTokenStore.java    |  14 +--
 .../oidc_rp/impl/OidcCallbackServlet.java          |   4 +-
 .../oidc_rp/impl/OidcClientImpl.java               |  14 +--
 .../oidc_rp/impl/OidcConnectionImpl.java           |   4 +-
 .../oidc_rp/impl/OidcEntryPointServlet.java        |   6 +-
 .../oidc_rp/impl/OidcProviderMetadataRegistry.java |   4 +-
 .../oidc_rp/impl/OidcStateManager.java             |   2 +-
 .../oidc_rp/package-info.java                      |   2 +-
 .../sling/servlets/oidc_rp/impl/ConverterTest.java |   3 +-
 .../servlets/oidc_rp/impl/MockOidcConnection.java  |   2 +-
 .../servlets/oidc_rp/impl/OidcClientImplTest.java  |   2 +
 .../oidc_rp/impl/OidcConnectionFinderImplTest.java |   7 +-
 22 files changed, 128 insertions(+), 98 deletions(-)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/OidcClient.java (98%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/OidcConnection.java (95%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/OidcException.java (96%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/OidcToken.java (97%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/OidcTokenState.java (95%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/OidcTokenStore.java (98%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/OidcTokens.java (95%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/impl/Converter.java (95%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/impl/JcrUserHomeOidcTokenStore.java (95%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/impl/OidcCallbackServlet.java (98%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/impl/OidcClientImpl.java (93%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/impl/OidcConnectionImpl.java (95%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/impl/OidcEntryPointServlet.java (95%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/impl/OidcProviderMetadataRegistry.java (94%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/impl/OidcStateManager.java (98%)
 rename org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/{servlets => extensions}/oidc_rp/package-info.java (95%)


[sling-whiteboard] 02/02: oidc-rp: refresh documentation

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 69f4b030c27d55386f331d40886c7b8c316c2c26
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Jul 7 12:51:45 2023 +0300

    oidc-rp: refresh documentation
---
 org.apache.sling.servlets.oidc-rp/README.md | 135 +++++++++++++++++-----------
 1 file changed, 81 insertions(+), 54 deletions(-)

diff --git a/org.apache.sling.servlets.oidc-rp/README.md b/org.apache.sling.servlets.oidc-rp/README.md
index 911d034d..9a10d947 100644
--- a/org.apache.sling.servlets.oidc-rp/README.md
+++ b/org.apache.sling.servlets.oidc-rp/README.md
@@ -3,52 +3,103 @@
 > **Warning**
 > This bundle is under development, do not use in production.
 
-## Introduction
+## Usage
 
 This bundle add support for Sling-based applications to function as
 [Open ID connect](https://openid.net/developers/how-connect-works/) relying parties. Its main
-objective is to simplify access to user and access tokens in a secure manner.
-
-## Whiteboard graduation TODO 
-
-- allow use of refresh tokens
-- extract the token exchange code from the OidcCallbackServlet and move it to the OauthClientImpl
-- document usage for the supported OIDC providers; make sure to explain this is _not_ an authentication handler
-- provide a sample content package and instructions how to use
-- review security best practices
-- investigate whether the OIDC entry point servlet is really needed
-
-## Prerequisites
+objective is to simplify access to user and access id in a secure manner. It currently supports
+the Authorization Code flow.
+
+The bundle offers the following entry points
+
+- and `OidcClient` service that communicates with the remote Open ID connect provider
+- a `TokenStore` service that allows storage and retrieval of persisted tokens.
+
+Basic usage is as follows
+
+```java
+
+import org.apache.sling.extensions.oidc_rp.*;
+
+@Component(service = { Servlet.class })
+@SlingServletPaths(value = "/bin/myservlet")
+public class MySlingServlet {
+
+  @Reference private OidcTokenStore tokenStore;
+  @Reference private OidcClient oidcClient;
+
+  public void accessRemoteResource(SlingHttpServletRequest request, SlingHttpServletResponse response) {
+    OidcConnection connection = getConnection();
+    OidcToken tokenResponse = tokenStore.getAccessToken(connection, request.getResourceResolver());
+    
+    switch ( tokenResponse.getState() ) {
+      case VALID:
+        doStuffWithToken(tokenResponse.getValue());
+        break;
+      case MISSING:
+        response.sendRedirect(oidcClient.getOidcEntryPointUri(connection, request, "/bin/myservlet").toString());
+        break;
+      case EXPIRED:
+        OidcToken refreshToken = tokenStore.getRefreshToken(connection, request.getResourceResolver());
+        if ( refreshToken.getState() != OidcTokenState.VALID )
+            throw new ServletException(String.format("access token is expired but refresh token not found ( state = %s)", refreshToken.getState()));
+        
+        OidcTokens oidcTokens = oidcClient.refreshTokens(connection, refreshToken.getValue());
+        tokenStore.persistTokens(connection, request.getResourceResolver(), oidcTokens);
+        doStuffWithToken(tokenResponse.getValue());
+        break;
+    }
+  }
+}
+```
 
 ### Client registration
 
-An OpenID Connect client must be registrered with an authorization server, and a callback URL of $HOST/system/sling/oidc/callback registered. This is typically http://localhost:8080/system/sling/oidc/callback .
+Client registration is specific to each provider. When registering, note the following:
+
+- the redirect URL must be set to $HOST/system/sling/oidc/callback registered. For development this is typically http://localhost:8080/system/sling/oidc/callback
+- write down the client id, client secret obtained from the OIDC provider
+- you may need to provide in advance the set of scopes accessible to your client
 
 Validated providers:
 
 - Google, with base URL of https://accounts.google.com , see [Google OIDC documentation](https://developers.google.com/identity/protocols/oauth2/openid-connect)
+- KeyCloak ( see [#keycloak] )
 
-## Sling Starter Prerequisites
+### Deployment
+
+A set of dependencies required by this bundle, on top of the Sling Starter ones, is available at `src/main/features/main.json`.
+In addition, the following OSGi configuration must be added
+
+```json
+"org.apache.sling.servlets.oidc_rp.impl.OidcConnectionImpl~provider": {
+    "name": "provider",
+    "baseUrl": "https://.example.com",
+    "clientId": "$[secret:provider/clientId]",
+    "clientSecret": "$[secret:provider/clientSecret]",
+    "scopes": ["openid"]
+}
+```
 
-A number of additional bundles need to be added to the Sling Starter, see the feature model definition at src/main/features/main.json .
+At this point, the OIDC process can be kicked of by navigating to http://localhost:8080/system/sling/oidc/entry-point?c=provider
 
-### Deployment and configuration
+### Token storage
 
-After deploying the bundle using `mvn package sling:install` go to http://localhost:8080/system/console/configMgr and create a new configuration factory instance for _OpenID Connect connection details_. Write down the name property, we'll refer to it as `$CONNECTION_NAME`.
+The tokens are stored under the user's home, under the `oidc-tokens/$PROVIDER_NAME` node.
 
-### Kicking off the process
 
-Ensure you are logged in.
+## Whiteboard graduation TODO 
 
-- navigate to http://localhost:8080/system/sling/oidc/entry-point?c=$CONNECTION_NAME&redirect=/bin/browser.html
-- you will be redirect to the identity provider, where you will need authenticate yourself and authorize the connection
-- you will be redirected to the composum browser
+- allow use of refresh tokens
+- extract the token exchange code from the OidcCallbackServlet and move it to the OauthClientImpl
+- provide a sample content package
+- review security best practices
+- investigate whether the OIDC entry point servlet is really needed
 
-At this point you can navigate to /home/users/${USERNAME}/oidc-tokens/${CONNECTION_NAME} and you will see the stored access token.
 
-### Local development setup
+## Local development setup
 
-#### tl;dr
+### tl;dr
 
 - run the keycloak container using the instructions for 'use existing test files'
 - build the bundle once with `mvn clean install`
@@ -74,9 +125,9 @@ Now you can
 - access Sling on http://localhost:8080
 - start the OIDC login process on http://localhost:8080/system/sling/oidc/entry-point?c=keycloak-dev
 
-#### Keycloak
+### Keycloak
 
-##### Use existing test files
+#### Use existing test files
 
 Note that this imports the test setup with a single user with a _redirect_uri_ set to _http://localhost*_, which can be a security issue.
 
@@ -84,7 +135,7 @@ Note that this imports the test setup with a single user with a _redirect_uri_ s
 $ docker run --rm  --volume $(pwd)/src/test/resources/keycloak-import:/opt/keycloak/data/import -p 8081:8080 -e KEYCLOAK_ADMIN=admin -e KEYCLOAK_ADMIN_PASSWORD=admin quay.io/keycloak/keycloak:20.0.3 start-dev --import-realm
 ```
 
-##### Manual setup
+#### Manual setup
 
 1. Launch Keycloak locally
 
@@ -122,32 +173,8 @@ $ docker run --rm --volume $(pwd)/keycloak-data:/opt/keycloak/data -p 8081:8080
 - in the dialog, use 'test' for the password and password confirmation fields and then press 'save'
 - confirm by pressing 'save password' in the new dialog
 
-#### Sling
- 
-1. OSGi bundles
-
-TODO
-
-2. OSGi config
-
-```
-org.apache.sling.extensions.oidc_rp.impl.OidcConnectionImpl
-name: keycloak
-baseUrl: http://localhost:8081/realms/sling
-clientId: oidc-test
-clientSecret: ( copied from above)
-scopes: openid 
-
-```
-
-#### Obtaining the tokens
-
-- navigate to http://localhost:8080/system/sling/login and login as admin/admin
-- go to http://localhost:8080/system/sling/oidc/entry-point?c=keycloak&redirect=/bin/browser.html/home/users
-- complete the login flow
-- navigate in composum to the user name of the admin user and verify that the 'oidc-tokens' node contains a keycloak node with the respective access_token and refresh_token properties 
 
-#### Exporting the test realm
+### Exporting the test realm
 
 ```
 $ docker run --rm --volume (pwd)/keycloak-data:/opt/keycloak/data -p 8081:8080 -e KEYCLOAK_ADMIN=admin -e KEYCLOAK_ADMIN_PASSWORD=admin quay.io/keycloak/keycloak:20.0.3 export --realm sling --users realm_file --file /opt/keycloak/data/export/sling.json


[sling-whiteboard] 01/02: oidc-rp: change artifact id and package

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 86eb9d33e80f327e4ebb94ac64d51f23a9aae5b8
Author: Robert Munteanu <ro...@apache.org>
AuthorDate: Fri Jul 7 12:32:19 2023 +0300

    oidc-rp: change artifact id and package
---
 org.apache.sling.servlets.oidc-rp/README.md                |  7 +++----
 org.apache.sling.servlets.oidc-rp/pom.xml                  |  4 ++--
 .../sling/{servlets => extensions}/oidc_rp/OidcClient.java |  2 +-
 .../{servlets => extensions}/oidc_rp/OidcConnection.java   |  2 +-
 .../{servlets => extensions}/oidc_rp/OidcException.java    |  2 +-
 .../sling/{servlets => extensions}/oidc_rp/OidcToken.java  |  2 +-
 .../{servlets => extensions}/oidc_rp/OidcTokenState.java   |  2 +-
 .../{servlets => extensions}/oidc_rp/OidcTokenStore.java   |  2 +-
 .../sling/{servlets => extensions}/oidc_rp/OidcTokens.java |  2 +-
 .../{servlets => extensions}/oidc_rp/impl/Converter.java   |  4 ++--
 .../oidc_rp/impl/JcrUserHomeOidcTokenStore.java            | 14 +++++++-------
 .../oidc_rp/impl/OidcCallbackServlet.java                  |  4 ++--
 .../oidc_rp/impl/OidcClientImpl.java                       | 14 +++++++-------
 .../oidc_rp/impl/OidcConnectionImpl.java                   |  4 ++--
 .../oidc_rp/impl/OidcEntryPointServlet.java                |  6 +++---
 .../oidc_rp/impl/OidcProviderMetadataRegistry.java         |  4 ++--
 .../oidc_rp/impl/OidcStateManager.java                     |  2 +-
 .../{servlets => extensions}/oidc_rp/package-info.java     |  2 +-
 .../apache/sling/servlets/oidc_rp/impl/ConverterTest.java  |  3 ++-
 .../sling/servlets/oidc_rp/impl/MockOidcConnection.java    |  2 +-
 .../sling/servlets/oidc_rp/impl/OidcClientImplTest.java    |  2 ++
 .../oidc_rp/impl/OidcConnectionFinderImplTest.java         |  7 ++++---
 22 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/org.apache.sling.servlets.oidc-rp/README.md b/org.apache.sling.servlets.oidc-rp/README.md
index 2664b06d..911d034d 100644
--- a/org.apache.sling.servlets.oidc-rp/README.md
+++ b/org.apache.sling.servlets.oidc-rp/README.md
@@ -11,7 +11,6 @@ objective is to simplify access to user and access tokens in a secure manner.
 
 ## Whiteboard graduation TODO 
 
-- bundle/package should probably be org.apache.sling.extensions.oidc, as the primary entry point is the Java API
 - allow use of refresh tokens
 - extract the token exchange code from the OidcCallbackServlet and move it to the OauthClientImpl
 - document usage for the supported OIDC providers; make sure to explain this is _not_ an authentication handler
@@ -65,8 +64,8 @@ $ curl -u admin:admin -X POST -d "apply=true" -d "propertylist=name,baseUrl,clie
     -d "clientId=oidc-test"\
     -d "clientSecret=$CLIENT_SECRET" \
     -d "scopes=openid" \
-    -d "factoryPid=org.apache.sling.servlets.oidc_rp.impl.OidcConnectionImpl" \
-    http://localhost:8080/system/console/configMgr/org.apache.sling.servlets.oidc_rp.impl.OidcConnectionImpl~keycloak-dev
+    -d "factoryPid=org.apache.sling.extensions.oidc_rp.impl.OidcConnectionImpl" \
+    http://localhost:8080/system/console/configMgr/org.apache.sling.extensions.oidc_rp.impl.OidcConnectionImpl~keycloak-dev
 ```
 
 Now you can 
@@ -132,7 +131,7 @@ TODO
 2. OSGi config
 
 ```
-org.apache.sling.servlets.oidc_rp.impl.OidcConnectionImpl
+org.apache.sling.extensions.oidc_rp.impl.OidcConnectionImpl
 name: keycloak
 baseUrl: http://localhost:8081/realms/sling
 clientId: oidc-test
diff --git a/org.apache.sling.servlets.oidc-rp/pom.xml b/org.apache.sling.servlets.oidc-rp/pom.xml
index 1e0e992e..d0a721b8 100644
--- a/org.apache.sling.servlets.oidc-rp/pom.xml
+++ b/org.apache.sling.servlets.oidc-rp/pom.xml
@@ -26,10 +26,10 @@
         <relativePath/>
     </parent>
 
-	<artifactId>org.apache.sling.servlets.oidc-rp</artifactId>
+	<artifactId>org.apache.sling.extensions.oidc-rp</artifactId>
 	<version>0.1-SNAPSHOT</version>
 
-	<name>Apache Sling Servlets OIDC Relying Party</name>
+	<name>Apache Sling Extensions OIDC Relying Party</name>
 
     <properties>
         <sling.java.version>17</sling.java.version>
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcClient.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcClient.java
similarity index 98%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcClient.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcClient.java
index 47967b00..12cbd33d 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcClient.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcClient.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp;
+package org.apache.sling.extensions.oidc_rp;
 
 import java.net.URI;
 
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcConnection.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcConnection.java
similarity index 95%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcConnection.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcConnection.java
index 50e836d9..8a9bdaf3 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcConnection.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcConnection.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp;
+package org.apache.sling.extensions.oidc_rp;
 
 // TODO - bad name
 public interface OidcConnection {
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcException.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcException.java
similarity index 96%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcException.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcException.java
index d50cb00f..060201c7 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcException.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcException.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp;
+package org.apache.sling.extensions.oidc_rp;
 
 public class OidcException extends RuntimeException {
 
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcToken.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcToken.java
similarity index 97%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcToken.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcToken.java
index 203ed185..906dffcc 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcToken.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcToken.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp;
+package org.apache.sling.extensions.oidc_rp;
 
 /**
  * Information about an OIDC token
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokenState.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenState.java
similarity index 95%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokenState.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenState.java
index 0615f498..5f65851e 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokenState.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenState.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp;
+package org.apache.sling.extensions.oidc_rp;
 
 public enum OidcTokenState {
     VALID, EXPIRED, MISSING;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokenStore.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenStore.java
similarity index 98%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokenStore.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenStore.java
index 992e93b7..603ddc52 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokenStore.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokenStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp;
+package org.apache.sling.extensions.oidc_rp;
 
 import org.apache.sling.api.resource.ResourceResolver;
 
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokens.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokens.java
similarity index 95%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokens.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokens.java
index 3f08a038..c780d3b0 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/OidcTokens.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/OidcTokens.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp;
+package org.apache.sling.extensions.oidc_rp;
 
 public record OidcTokens(String accessToken, long expiresAt, String refreshToken, String idToken) {
     
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/Converter.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/Converter.java
similarity index 95%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/Converter.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/Converter.java
index fc89b24e..449a2380 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/Converter.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/Converter.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp.impl;
+package org.apache.sling.extensions.oidc_rp.impl;
 
-import org.apache.sling.servlets.oidc_rp.OidcTokens;
+import org.apache.sling.extensions.oidc_rp.OidcTokens;
 
 import com.nimbusds.oauth2.sdk.token.BearerAccessToken;
 import com.nimbusds.oauth2.sdk.token.RefreshToken;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/JcrUserHomeOidcTokenStore.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/JcrUserHomeOidcTokenStore.java
similarity index 95%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/JcrUserHomeOidcTokenStore.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/JcrUserHomeOidcTokenStore.java
index 15aff7aa..70d59a8e 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/JcrUserHomeOidcTokenStore.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/JcrUserHomeOidcTokenStore.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp.impl;
+package org.apache.sling.extensions.oidc_rp.impl;
 
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -30,12 +30,12 @@ import javax.jcr.Value;
 
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.sling.api.resource.ResourceResolver;
-import org.apache.sling.servlets.oidc_rp.OidcConnection;
-import org.apache.sling.servlets.oidc_rp.OidcException;
-import org.apache.sling.servlets.oidc_rp.OidcToken;
-import org.apache.sling.servlets.oidc_rp.OidcTokenState;
-import org.apache.sling.servlets.oidc_rp.OidcTokenStore;
-import org.apache.sling.servlets.oidc_rp.OidcTokens;
+import org.apache.sling.extensions.oidc_rp.OidcConnection;
+import org.apache.sling.extensions.oidc_rp.OidcException;
+import org.apache.sling.extensions.oidc_rp.OidcToken;
+import org.apache.sling.extensions.oidc_rp.OidcTokenState;
+import org.apache.sling.extensions.oidc_rp.OidcTokenStore;
+import org.apache.sling.extensions.oidc_rp.OidcTokens;
 import org.osgi.service.component.annotations.Component;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcCallbackServlet.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcCallbackServlet.java
similarity index 98%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcCallbackServlet.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcCallbackServlet.java
index c186bc31..ca19944f 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcCallbackServlet.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcCallbackServlet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp.impl;
+package org.apache.sling.extensions.oidc_rp.impl;
 
 import static org.osgi.service.component.annotations.ReferencePolicyOption.GREEDY;
 
@@ -38,8 +38,8 @@ 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.OidcConnection;
 import org.apache.sling.servlets.annotations.SlingServletPaths;
-import org.apache.sling.servlets.oidc_rp.OidcConnection;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcClientImpl.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcClientImpl.java
similarity index 93%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcClientImpl.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcClientImpl.java
index 8e297e41..7c1f2a58 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcClientImpl.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcClientImpl.java
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp.impl;
+package org.apache.sling.extensions.oidc_rp.impl;
 
-import static org.apache.sling.servlets.oidc_rp.impl.OidcStateManager.PARAMETER_NAME_CONNECTION;
-import static org.apache.sling.servlets.oidc_rp.impl.OidcStateManager.PARAMETER_NAME_REDIRECT;
+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;
@@ -25,10 +25,10 @@ import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
 
 import org.apache.sling.api.SlingHttpServletRequest;
-import org.apache.sling.servlets.oidc_rp.OidcClient;
-import org.apache.sling.servlets.oidc_rp.OidcConnection;
-import org.apache.sling.servlets.oidc_rp.OidcException;
-import org.apache.sling.servlets.oidc_rp.OidcTokens;
+import org.apache.sling.extensions.oidc_rp.OidcClient;
+import org.apache.sling.extensions.oidc_rp.OidcConnection;
+import org.apache.sling.extensions.oidc_rp.OidcException;
+import org.apache.sling.extensions.oidc_rp.OidcTokens;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionImpl.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcConnectionImpl.java
similarity index 95%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionImpl.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcConnectionImpl.java
index 147b5976..454cd002 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcConnectionImpl.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcConnectionImpl.java
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp.impl;
+package org.apache.sling.extensions.oidc_rp.impl;
 
-import org.apache.sling.servlets.oidc_rp.OidcConnection;
+import org.apache.sling.extensions.oidc_rp.OidcConnection;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.metatype.annotations.AttributeDefinition;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServlet.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcEntryPointServlet.java
similarity index 95%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServlet.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcEntryPointServlet.java
index 30bea9bc..2daa0698 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcEntryPointServlet.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcEntryPointServlet.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp.impl;
+package org.apache.sling.extensions.oidc_rp.impl;
 
 import static org.osgi.service.component.annotations.ReferencePolicyOption.GREEDY;
 
@@ -33,9 +33,9 @@ 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.apache.sling.servlets.oidc_rp.OidcClient;
-import org.apache.sling.servlets.oidc_rp.OidcConnection;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
 import org.osgi.service.component.annotations.Reference;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcProviderMetadataRegistry.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcProviderMetadataRegistry.java
similarity index 94%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcProviderMetadataRegistry.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcProviderMetadataRegistry.java
index 81ed5490..6a147a5d 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcProviderMetadataRegistry.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcProviderMetadataRegistry.java
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp.impl;
+package org.apache.sling.extensions.oidc_rp.impl;
 
 import java.io.IOException;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.apache.sling.servlets.oidc_rp.OidcException;
+import org.apache.sling.extensions.oidc_rp.OidcException;
 import org.osgi.service.component.annotations.Component;
 
 import com.nimbusds.oauth2.sdk.GeneralException;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcStateManager.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcStateManager.java
similarity index 98%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcStateManager.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcStateManager.java
index 685d01af..aa06ad5c 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/impl/OidcStateManager.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/impl/OidcStateManager.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.sling.servlets.oidc_rp.impl;
+package org.apache.sling.extensions.oidc_rp.impl;
 
 import java.util.HashMap;
 import java.util.Map;
diff --git a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/package-info.java b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/package-info.java
similarity index 95%
rename from org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/package-info.java
rename to org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/package-info.java
index 632d6dfd..8a44a1f4 100644
--- a/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/servlets/oidc_rp/package-info.java
+++ b/org.apache.sling.servlets.oidc-rp/src/main/java/org/apache/sling/extensions/oidc_rp/package-info.java
@@ -15,6 +15,6 @@
  * limitations under the License.
  */
 @Version("0.1.0")
-package org.apache.sling.servlets.oidc_rp;
+package org.apache.sling.extensions.oidc_rp;
 
 import org.osgi.annotation.versioning.Version;
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/ConverterTest.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/ConverterTest.java
index 1f44fef2..3622c2b3 100644
--- a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/ConverterTest.java
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/ConverterTest.java
@@ -18,7 +18,8 @@ package org.apache.sling.servlets.oidc_rp.impl;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.apache.sling.servlets.oidc_rp.OidcTokens;
+import org.apache.sling.extensions.oidc_rp.OidcTokens;
+import org.apache.sling.extensions.oidc_rp.impl.Converter;
 import org.junit.jupiter.api.Test;
 
 import com.nimbusds.oauth2.sdk.token.AccessToken;
diff --git a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/MockOidcConnection.java b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/MockOidcConnection.java
index 874ca875..cfd3b2b3 100644
--- a/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/MockOidcConnection.java
+++ b/org.apache.sling.servlets.oidc-rp/src/test/java/org/apache/sling/servlets/oidc_rp/impl/MockOidcConnection.java
@@ -16,7 +16,7 @@
  */
 package org.apache.sling.servlets.oidc_rp.impl;
 
-import org.apache.sling.servlets.oidc_rp.OidcConnection;
+import org.apache.sling.extensions.oidc_rp.OidcConnection;
 
 record MockOidcConnection(String[] scopes, String name, String clientId, String clientSecret, String baseUrl) implements OidcConnection { 
     static MockOidcConnection DEFAULT_CONNECTION = new MockOidcConnection(new String[] {"openid"}, "mock-oidc", "client-id", "client-secret", "http://example.com");
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/OidcClientImplTest.java
index 1a6a8531..92e97c42 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/OidcClientImplTest.java
@@ -21,6 +21,8 @@ import static org.assertj.core.api.Assertions.assertThat;
 import java.net.URI;
 import java.util.Collections;
 
+import org.apache.sling.extensions.oidc_rp.impl.OidcClientImpl;
+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.junit.jupiter.api.Test;
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 ecba6dce..5d26a5e7 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
@@ -26,10 +26,11 @@ 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.JcrUserHomeOidcTokenStore;
 import org.apache.sling.jackrabbit.usermanager.impl.AuthorizableAdapterFactory;
-import org.apache.sling.servlets.oidc_rp.OidcConnection;
-import org.apache.sling.servlets.oidc_rp.OidcToken;
-import org.apache.sling.servlets.oidc_rp.OidcTokenState;
 import org.apache.sling.testing.mock.sling.ResourceResolverType;
 import org.apache.sling.testing.mock.sling.junit5.SlingContext;
 import org.apache.sling.testing.mock.sling.junit5.SlingContextExtension;