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

chore(docker): sync assets and config #8295

Merged
merged 1 commit into from
Apr 14, 2024
Merged

chore(docker): sync assets and config #8295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions 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.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 17:00'
ENV CN_BUILD_DATE='2024-04-14 08:29'
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 Expand Up @@ -102,7 +102,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-auth/agama/fl \
/app/static/rdbm \
/app/schema

ENV JANS_SOURCE_VERSION=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
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
4 changes: 2 additions & 2 deletions docker-jans-casa/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ RUN wget -q https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-home/${JETTY_
# ====

ENV CN_VERSION=1.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 17:25'
ENV CN_BUILD_DATE='2024-04-14 08:53'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/casa/${CN_VERSION}/casa-${CN_VERSION}.war

# Install Casa
Expand All @@ -55,7 +55,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-casa/plugins \
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_CASA_EXTRAS_DIR=jans-casa/extras

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-certmanager/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apk update \

# JAR files required to generate OpenID Connect keys
ENV CN_VERSION=1.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 16:57'
ENV CN_BUILD_DATE='2024-04-14 08:26'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-client/${CN_VERSION}/jans-auth-client-${CN_VERSION}-jar-with-dependencies.jar

RUN wget -q ${CN_SOURCE_URL} -P /app/javalibs/
Expand Down
4 changes: 2 additions & 2 deletions docker-jans-config-api/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.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 17:16'
ENV CN_BUILD_DATE='2024-04-14 08:43'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-config-api-server/${CN_VERSION}/jans-config-api-server-${CN_VERSION}.war

# Install Jans Config API
Expand Down Expand Up @@ -77,7 +77,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-config-api/_plugins \
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources

Expand Down
11 changes: 10 additions & 1 deletion docker-jans-config-api/scripts/upgrade.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ def _transform_api_dynamic_config(conf):
("userMandatoryAttributes", [
"mail",
"displayName",
"jansStatus",
"status",
"userPassword",
"givenName",
]),
Expand Down Expand Up @@ -118,6 +118,15 @@ def _transform_api_dynamic_config(conf):
conf["plugins"].append(supported_plugin)
should_update = True

# userMandatoryAttributes.jansStatus is changed to userMandatoryAttributes.status
if "jansStatus" in conf["userMandatoryAttributes"]:
conf["userMandatoryAttributes"].remove("jansStatus")
should_update = True

if "status" not in conf["userMandatoryAttributes"]:
conf["userMandatoryAttributes"].append("status")
should_update = True

# finalized conf and flag to determine update process
return conf, should_update

Expand Down
2 changes: 1 addition & 1 deletion docker-jans-configurator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ RUN apk update \

# JAR files required to generate OpenID Connect keys
ENV CN_VERSION=1.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 16:57'
ENV CN_BUILD_DATE='2024-04-14 08:26'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-auth-client/${CN_VERSION}/jans-auth-client-${CN_VERSION}-jar-with-dependencies.jar

RUN mkdir -p /opt/jans/configurator/javalibs \
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.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 17:07'
ENV CN_BUILD_DATE='2024-04-14 08:35'
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=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
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
4 changes: 2 additions & 2 deletions docker-jans-keycloak-link/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.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 17:13'
ENV CN_BUILD_DATE='2024-04-14 08:41'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-keycloak-link-server/${CN_VERSION}/jans-keycloak-link-server-${CN_VERSION}.war

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

ENV JANS_SOURCE_VERSION=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
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
4 changes: 2 additions & 2 deletions docker-jans-link/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.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 17:05'
ENV CN_BUILD_DATE='2024-04-14 08:33'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-link-server/${CN_VERSION}/jans-link-server-${CN_VERSION}.war

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

ENV JANS_SOURCE_VERSION=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
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
2 changes: 1 addition & 1 deletion docker-jans-monolith/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EXPOSE 443 8080 1636
# jans-linux-setup
# =====================

ENV JANS_SOURCE_VERSION=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97

# cleanup
RUN rm -rf /tmp/jans
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=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
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
32 changes: 23 additions & 9 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 @@ -234,15 +234,6 @@ def transform_auth_dynamic_config_hook(conf, manager):
conf["agamaConfiguration"]["defaultResponseHeaders"].pop("Content-Type", None)
should_update = True

for grant_type in [
"urn:ietf:params:oauth:grant-type:device_code",
"urn:ietf:params:oauth:grant-type:token-exchange",
"tx_token",
]:
if grant_type not in conf["dynamicGrantTypeDefault"]:
conf["dynamicGrantTypeDefault"].append(grant_type)
should_update = True

# ensure agama_flow listed in authorizationRequestCustomAllowedParameters
if "agama_flow" not in [
p["paramName"] for p in conf["authorizationRequestCustomAllowedParameters"]
Expand Down Expand Up @@ -276,6 +267,29 @@ def transform_auth_dynamic_config_hook(conf, manager):
conf["lockMessageConfig"].pop(old_attr, None)
should_update = True

# dynamicGrantTypeDefault changed to grantTypesSupportedByDynamicRegistration
if "grantTypesSupportedByDynamicRegistration" not in conf:
conf["grantTypesSupportedByDynamicRegistration"] = conf.pop("dynamicGrantTypeDefault", [
"urn:ietf:params:oauth:grant-type:uma-ticket",
"implicit",
"urn:ietf:params:oauth:grant-type:token-exchange",
"urn:ietf:params:oauth:grant-type:device_code",
"client_credentials",
"refresh_token",
"authorization_code",
"tx_token",
])
should_update = True

for grant_type in [
"urn:ietf:params:oauth:grant-type:device_code",
"urn:ietf:params:oauth:grant-type:token-exchange",
"tx_token",
]:
if grant_type not in conf["grantTypesSupportedByDynamicRegistration"]:
conf["grantTypesSupportedByDynamicRegistration"].append(grant_type)
should_update = True

# return the conf and flag to determine whether it needs update or not
return conf, should_update

Expand Down
4 changes: 2 additions & 2 deletions docker-jans-saml/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN mkdir -p /opt/keycloak/logs \
# ==============

ENV CN_VERSION=1.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 17:24'
ENV CN_BUILD_DATE='2024-04-14 08:51'

RUN wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-storage-plugin/${CN_VERSION}/kc-jans-storage-plugin-${CN_VERSION}.jar -P /opt/keycloak/providers \
&& wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-storage-plugin/${CN_VERSION}/kc-jans-storage-plugin-${CN_VERSION}-deps.zip -O /tmp/kc-storage-deps.zip \
Expand All @@ -40,7 +40,7 @@ RUN wget -q https://jenkins.jans.io/maven/io/jans/kc-jans-authn-plugin/${CN_VERS
# jans-linux-setup sync
# =====================

ENV JANS_SOURCE_VERSION=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
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
4 changes: 2 additions & 2 deletions docker-jans-scim/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.1.1-SNAPSHOT
ENV CN_BUILD_DATE='2024-04-08 17:11'
ENV CN_BUILD_DATE='2024-04-14 08:39'
ENV CN_SOURCE_URL=https://jenkins.jans.io/maven/io/jans/jans-scim-server/${CN_VERSION}/jans-scim-server-${CN_VERSION}.war

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

ENV JANS_SOURCE_VERSION=58f8fff55c6ba0a61d8053fb32a79700f44f41d0
ENV JANS_SOURCE_VERSION=392a1e9a55c3526aff21dcf094fe7825063d4d97
ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
ARG JANS_SCIM_RESOURCE_DIR=jans-scim/server/src/main/resources

Expand Down