Merge branch 'master' into stable

guimard · Aug 29, 2024 · 3e892e9 · 3e892e9
2 parents 7c4cb2b + e7e8a84
commit 3e892e9
Show file tree

Hide file tree

Showing 22 changed files with 1,879 additions and 5 deletions.
diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml
@@ -4,7 +4,7 @@ env:
   VERSION: 2.19.1
   PGVERSION: 15
   DEBIANRELEASE: bookworm
-  DOCKERREVISION: 4
+  DOCKERREVISION: 5
 
 on:
   push:

diff --git a/Changes.md b/Changes.md
@@ -1,6 +1,12 @@
 # Changes
 
-* 2024-08-19:
+* 2024-08-29:
+  * Add security patch
+  * Add `_ldapsearch` command
+* 2024-08-22:
+  * Add Mauritian Creole translation
+  * Add `LANGUAGES` variable
+* 2024-08-19 (v2.19.1-4):
   * add `libconvert-pem-perl` package into portal
   * add `FORWARDED_BY`
 * 2024-08-18:

diff --git a/base-no-s6/README.md b/base-no-s6/README.md
@@ -42,6 +42,7 @@ LemonLDAP::NG.
 * `LOGGER` = `syslog` _(possible values: stderr, syslog)_
 * `USERLOGGER` = `syslog` _(possible values: stderr, syslog)_
 * `FORCE_KEY_REGENERATION` = `no`
+* `LANGUAGES` = default LLNG list _(set here the wanted languages separated by comma. Example: `fr,en`)_
 * Configuration and persistent session storage
   * `PG_SERVER` =
   * `PG_DATABASE` = `lemonldapng`

diff --git a/base-no-s6/docker-compose.yml b/base-no-s6/docker-compose.yml
@@ -6,7 +6,11 @@ services:
     environment:
       - POSTGRES_PASSWORD=zz
     healthcheck:
-      test: "exit 0"
+      test: ["CMD-SHELL", "pg_isready"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+
   base:
     image: yadd/lemonldap-ng-base-no-s6
     build:
@@ -20,6 +24,7 @@ services:
       - OVERRIDE_authChoiceModules={"1_LDAP":"Demo;Demo;Null;;;{}","2_SAML":"SAML;SAML;Null;;;{}"}
       - OVERRIDE_applicationList_1sample_catname="Some applications"
       - OVERRIDE_exportedVars_aa=bb
+      - LANGUAGES=en,fr
     volumes:
       - ./test-over:/over
     depends_on:

diff --git a/base-no-s6/install/etc/cont-init.d/update-llng-conf b/base-no-s6/install/etc/cont-init.d/update-llng-conf
@@ -165,3 +165,7 @@ for key in `(env | grep OVERRIDE || true) | sed -e 's/=.*$//'`; do
     echo "Set $KEYNAME to $VAL"
     /usr/share/docker-llng/updateConf set `echo $KEYNAME|perl -pe 's/_/\n/g'` "$VAL"
 done
+
+if test "$LANGUAGES" != ''; then
+	perl -i -pe "s/^(languages\s*=\s*).*\$/\$1$LANGUAGES/" /etc/lemonldap-ng/lemonldap-ng.ini
+fi
diff --git a/base-no-s6/test b/base-no-s6/test
@@ -18,4 +18,5 @@ $COMPOSE run base /usr/share/docker-llng/updateConf get applicationList 1sample
 $COMPOSE run base /usr/share/docker-llng/updateConf get exportedVars aa | grep bb
 $COMPOSE run base /usr/share/docker-llng/updateConf get macros | grep ZZ
 $COMPOSE run base /usr/share/docker-llng/updateConf get portal | grep dockertest.com
+$COMPOSE run base grep languages /etc/lemonldap-ng/lemonldap-ng.ini | perl -pe 's/\r//g' | grep -E '^languages *= *en,fr$'
 $COMPOSE down
diff --git a/base/README.md b/base/README.md
@@ -42,6 +42,7 @@ LemonLDAP::NG.
 * `LOGGER` = `syslog` _(possible values: stderr, syslog)_
 * `USERLOGGER` = `syslog` _(possible values: stderr, syslog)_
 * `FORCE_KEY_REGENERATION` = `no`
+* `LANGUAGES` = default LLNG list _(set here the wanted languages separated by comma. Example: `fr,en`)_
 * Configuration and persistent session storage
   * `PG_SERVER` =
   * `PG_DATABASE` = `lemonldapng`

diff --git a/base/docker-compose.yml b/base/docker-compose.yml
@@ -24,6 +24,7 @@ services:
       - OVERRIDE_authChoiceModules={"1_LDAP":"Demo;Demo;Null;;;{}","2_SAML":"SAML;SAML;Null;;;{}"}
       - OVERRIDE_applicationList_1sample_catname="Some applications"
       - OVERRIDE_exportedVars_aa=bb
+      - LANGUAGES=en,fr
     volumes:
       - ./test-over:/over
     depends_on:

diff --git a/base/install/etc/cont-init.d/update-llng-conf b/base/install/etc/cont-init.d/update-llng-conf
@@ -165,3 +165,7 @@ for key in `(env | grep OVERRIDE || true) | sed -e 's/=.*$//'`; do
     echo "Set $KEYNAME to $VAL"
     /usr/share/docker-llng/updateConf set `echo $KEYNAME|perl -pe 's/_/\n/g'` "$VAL"
 done
+
+if test "$LANGUAGES" != ''; then
+	perl -i -pe "s/^(languages\s*=\s*).*\$/\$1$LANGUAGES/" /etc/lemonldap-ng/lemonldap-ng.ini
+fi
diff --git a/base/test b/base/test
@@ -18,4 +18,5 @@ $COMPOSE run base /usr/share/docker-llng/updateConf get applicationList 1sample
 $COMPOSE run base /usr/share/docker-llng/updateConf get exportedVars aa | grep bb
 $COMPOSE run base /usr/share/docker-llng/updateConf get macros | grep ZZ
 $COMPOSE run base /usr/share/docker-llng/updateConf get portal | grep dockertest.com
+$COMPOSE run base grep languages /etc/lemonldap-ng/lemonldap-ng.ini | perl -pe 's/\r//g' | grep -E '^languages *= *en,fr$'
 $COMPOSE down
diff --git a/portal/Dockerfile b/portal/Dockerfile
@@ -37,7 +37,7 @@ COPY *.patch /
 RUN for p in appgrid.patch jwt-type.patch app-scope.patch ignorepollers.patch \
     fixedLogout.patch more-logs.patch introspec-for-public-clients.patch \
     token-exchange.patch redirect-ajax.patch back-channel-debug.patch \
-    crowdsec.patch recaptcha.patch msg-broker.patch \
+    crowdsec.patch recaptcha.patch msg-broker.patch mfe.patch security.patch \
     ; do echo patch $p && patch -p1 < $p; done && \
     rm -f /*.patch && \
     echo "# Install nginx configuration files" && \