Skip to content

feat(jans-lock): update integration with jans-lock and add integration tests #14169

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
yurem wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

feat(jans-lock): update integration with jans-lock and add integration tests #14169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
39ee563
feat(jans-lock): update to conform new binding API
yurem May 4, 2026
217ce6a
fix(setup): fix ProxyPass in mako template
yurem May 12, 2026
c0a5358
feat(jans-lock): update store to conform new Cedarling cjar policy store
yurem May 19, 2026
f4ff847
feat(jans-lock): add low level Cedarling integration tests
yurem May 20, 2026
8b33019
feat(jans-lock): handle Cedarling https requests in integration tests
yurem May 28, 2026
e61e411
Merge branch 'main' into lock_cedarling_update
yurem May 28, 2026
74b80ed
feat(jans-lock): dump boostrap properties
yurem May 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 37 additions & 22 deletions jans-bom/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,9 @@
<jackrabbit.version>2.22.2</jackrabbit.version>

<bc.version>1.79</bc.version>
<junit.jupiter.version>5.9.2</junit.jupiter.version>
<mockito.version>5.1.1</mockito.version>
<junit.version>5.11.4</junit.version>
<mockito.version>5.23.0</mockito.version>
<wiremock.version>4.0.0-beta.34</wiremock.version>

<jetty.version>11.0.24</jetty.version>
</properties>
Expand Down Expand Up @@ -923,42 +924,56 @@
<version>4.0.0.Final</version>
<scope>test</scope>
</dependency>
<!-- JUnit Jupiter -->

<!-- Test dependecies -->
<dependency>
<groupId>org.junit</groupId>
<artifactId>junit-bom</artifactId>
<version>${junit.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-bom</artifactId>
<version>${mockito.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-api</artifactId>
<version>${junit.jupiter.version}</version>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<version>${junit.jupiter.version}</version>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<version>6.0.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-params</artifactId>
<version>${junit.jupiter.version}</version>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-junit5</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
<!-- Mockito -->
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>${mockito.version}</version>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-inline</artifactId>
<version>${mockito.version}</version>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-httpclient-apache5</artifactId>
<version>${wiremock.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<version>${mockito.version}</version>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-grpc-extension</artifactId>
<version>0.11.0</version>
<scope>test</scope>
</dependency>

Expand Down
2 changes: 1 addition & 1 deletion jans-linux-setup/jans_setup/templates/apache/https_jans.conf.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
ProxyPass /device-code http://localhost:${jans_auth_port}/jans-auth/device_authorization.htm

% if context.get('install_jans_lock') in ('true', True):
ProxyPass /.well-known/lock-server-configuration http://localhost:${lock_host_port}/${lock_host_suffix}/api/v1/configuration'
ProxyPass /.well-known/lock-server-configuration http://localhost:${lock_host_port}/${lock_host_suffix}/api/v1/configuration
<Location /jans-lock>
Header edit Set-Cookie ^((?!opbs|session_state).*)$ $1;HttpOnly
ProxyPass http://localhost:${lock_host_port}/${lock_host_suffix} retry=5 connectiontimeout=60 timeout=60
Expand Down
1 change: 0 additions & 1 deletion jans-lock/lock-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ tags:
- name: Lock - Audit Health
- name: Lock - Audit Log
- name: Lock - Audit Telemetry
- name: Lock - SSE
paths:
/api/v1/configuration:
get:
Expand Down
53 changes: 53 additions & 0 deletions jans-lock/lock-server/cedarling/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
<version>0.0.0-nightly</version>
</parent>

<properties>
<maven.compiler.source>15</maven.compiler.source>
<maven.compiler.target>15</maven.compiler.target>
<maven.compiler.release>15</maven.compiler.release>
</properties>

<build>
<resources>
<resource>
Expand Down Expand Up @@ -83,6 +89,53 @@
<artifactId>swagger-core-jakarta</artifactId>
</dependency>

<!-- Tests -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-junit-jupiter</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.rest-assured</groupId>
<artifactId>rest-assured</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-junit5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-jetty</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.wiremock</groupId>
<artifactId>wiremock-httpclient-apache5</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>6.0.0</version>
<scope>test</scope>
</dependency>
<!-- Documentation -->
<dependency>
<groupId>io.jans</groupId>
Expand Down
Loading
Loading