Skip to content
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

Jump to bottom

fix(docker-jans): add missing dynamic config #7672

Merged
merged 2 commits into from
Feb 7, 2024
Merged

fix(docker-jans): add missing dynamic config #7672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0c3e465
fix(docker-jans): add missing dynamic config
iromli Feb 7, 2024
9e3e94b
chore: update jans-fido2-server
iromli Feb 7, 2024
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
2 changes: 1 addition & 1 deletion docker-jans-auth-server/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ RUN /opt/jython/bin/pip uninstall -y pip setuptools
# ===========

ENV CN_VERSION=1.0.22
ENV CN_BUILD_DATE='2024-01-30 15:47'
ENV CN_BUILD_DATE='2024-02-07 08:30'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-server/${CN_VERSION}/jans-auth-server-${CN_VERSION}.war

# Install Jans Auth
Expand Down
4 changes: 2 additions & 2 deletions docker-jans-fido2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ RUN wget -q https://maven.jans.io/maven/io/jans/jython-installer/${JYTHON_VERSIO
# =====

ENV CN_VERSION=1.0.22
ENV CN_BUILD_DATE='2024-01-22 12:49'
ENV CN_BUILD_DATE='2024-02-07 12:01'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-fido2-server/${CN_VERSION}/jans-fido2-server-${CN_VERSION}.war

# Install FIDO2
Expand All @@ -59,7 +59,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-fido2/webapps \
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=d1be3487234a2f369f07a0105d15e451eae7048d
ENV JANS_SOURCE_VERSION=ce6582f4cd01ec2ff5b06b1e78e3e0a8a76bc6ef
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup

# note that as we're pulling from a monorepo (with multiple project in it)
Expand Down
1 change: 1 addition & 0 deletions docker-jans-fido2/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ def _transform_fido2_dynamic_config(conf):
("skipDownloadMdsEnabled", False),
("skipValidateMdsInAttestationEnabled", False),
("sessionIdPersistInCache", False),
("assertionOptionsGenerateEndpointEnabled", True),
]:
# dont update if key exists
if k in conf:
Expand Down
2 changes: 1 addition & 1 deletion docker-jans-persistence-loader/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ RUN python3 -m ensurepip \
# =====================

# janssenproject/jans SHA commit
ENV JANS_SOURCE_VERSION=892e35894c64d12f5c141b831e2e730f3abc77d1
ENV JANS_SOURCE_VERSION=ce6582f4cd01ec2ff5b06b1e78e3e0a8a76bc6ef
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_SCRIPT_CATALOG_DIR=docs/script-catalog
ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources
Expand Down
1 change: 1 addition & 0 deletions docker-jans-persistence-loader/scripts/hooks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,7 @@ def transform_auth_dynamic_config_hook(conf, manager):
"A256GCM"
]),
("txTokenLifetime", 180),
("sessionIdCookieLifetime", 86400),
]:
if missing_key not in conf:
conf[missing_key] = value
Expand Down