chore(deps): sync image assets and dependencies

docker-jans-all-in-one/app/requirements.txt

@@ -1,9 +1,9 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
 click==8.1.7
-marshmallow==3.21.0
+marshmallow==3.21.1
 fqdn==1.5.1
 ruamel.yaml==0.18.6
 supervisor==4.2.5
 pluggy==1.4.0
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-auth-server/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-auth-server/scripts/bootstrap.py

@@ -1,6 +1,8 @@
 import json
 import logging.config
 import os
+import shutil
+from pathlib import Path
 from string import Template
 
 from jans.pycloudlib import get_manager
@@ -99,6 +101,8 @@ def main():
         # likely secret is not created yet
         logger.warning("Unable to pull file smtp-keys.pkcs12 from secrets")
 
+    copy_builtin_libs()
+
     if as_boolean(os.environ.get("CN_LOCK_ENABLED", "false")):
         configure_lock_logging()
 
@@ -189,5 +193,17 @@ def configure_logging():
         f.write(tmpl.safe_substitute(config))
 
 
+def copy_builtin_libs():
+    lock_enabled = as_boolean(os.environ.get("CN_LOCK_ENABLED", "false"))
+
+    for src in Path("/opt/jans/jetty/jans-auth/_libs").glob("*.jar"):
+        # skip jans-lock-service and jans-lock-model
+        if lock_enabled is False and src.name.startswith("jans-lock"):
+            continue
+
+        dst = f"/opt/jans/jetty/jans-auth/custom/libs/{src.name}"
+        shutil.copyfile(src, dst)
+
+
 if __name__ == "__main__":
     main()

docker-jans-auth-server/scripts/entrypoint.sh

@@ -15,14 +15,6 @@ get_debug_opt() {
     echo "${debug_opt}"
 }
 
-move_builtin_jars() {
-    # twilio, jsmpp, casa-config, jans-fido2-client
-    for src in /opt/jans/jetty/jans-auth/_libs/*.jar; do
-        fname=$(basename "$src")
-        cp "$src" "/opt/jans/jetty/jans-auth/custom/libs/$fname"
-    done
-}
-
 get_prometheus_opt() {
     prom_opt=""
 
@@ -76,7 +68,6 @@ get_logging_files() {
     echo $logs
 }
 
-move_builtin_jars
 get_prometheus_lib
 python3 "$basedir/wait.py"
 python3 "$basedir/bootstrap.py"

docker-jans-casa/requirements.txt

@@ -1,4 +1,4 @@
 webdavclient3>=3.14.5
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-certmanager/requirements.txt

@@ -1,4 +1,4 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
 click==8.1.7
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-config-api/Dockerfile

@@ -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-03-11 19:17'
+ENV CN_BUILD_DATE='2024-03-21 10:09'
 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
@@ -77,7 +77,7 @@ RUN mkdir -p ${JETTY_BASE}/jans-config-api/_plugins \
 # jans-linux-setup sync
 # =====================
 
-ENV JANS_SOURCE_VERSION=aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba
+ENV JANS_SOURCE_VERSION=60310a02c67aafda44cfa7640db78e790808de4c
 ARG JANS_SETUP_DIR=jans-linux-setup/jans_setup
 ARG JANS_CONFIG_API_RESOURCES=jans-config-api/server/src/main/resources
 

docker-jans-config-api/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-config-api/scripts/upgrade.py

@@ -56,6 +56,9 @@ def _transform_api_dynamic_config(conf):
             ],
         }),
         ("customAttributeValidationEnabled", True),
+        ("disableLoggerTimer", False),
+        ("disableAuditLogger", False),
+        ("assetMgtEnabled", True),
     ]:
         if missing_key not in conf:
             conf[missing_key] = value

docker-jans-configurator/requirements.txt

@@ -1,6 +1,6 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
 click==8.1.7
-marshmallow==3.21.0
+marshmallow==3.21.1
 fqdn==1.5.1
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-fido2/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-keycloak-link/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-link/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-monolith/Dockerfile

@@ -38,7 +38,7 @@ EXPOSE 443 8080 1636
 # jans-linux-setup
 # =====================
 
-ENV JANS_SOURCE_VERSION=aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba
+ENV JANS_SOURCE_VERSION=60310a02c67aafda44cfa7640db78e790808de4c
 
 # cleanup
 RUN rm -rf /tmp/jans

docker-jans-persistence-loader/Dockerfile

@@ -26,7 +26,7 @@ RUN python3 -m ensurepip \
 # =====================
 
 # janssenproject/jans SHA commit
-ENV JANS_SOURCE_VERSION=aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba
+ENV JANS_SOURCE_VERSION=60310a02c67aafda44cfa7640db78e790808de4c
 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

docker-jans-persistence-loader/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-saml/requirements.txt

@@ -1,3 +1,3 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib

docker-jans-scim/requirements.txt

@@ -1,4 +1,4 @@
 # pinned to py3-grpcio version to avoid failure on native extension build
 grpcio==1.54.2
 ruamel.yaml==0.18.6
-git+https://github.com/JanssenProject/jans@aeba80d5fb2860e1336a49bfc3cbfc80f79b08ba#egg=jans-pycloudlib&subdirectory=jans-pycloudlib
+git+https://github.com/JanssenProject/jans@9ec7177011b720a9dae85abb528f8056df20bfa8#egg=jans-pycloudlib&subdirectory=jans-pycloudlib