build(update images): update my and mycron to current debian and node versions (#674)

* build(update images): update my and mycron to current debian and node versions

- Allows to fix numerous security issues
- Allows to rely upon an offical node image with known build steps
- Allows to fix the test env that was not usable locally

* fix(upgrade images): Adapt templates for ldap-utils compatibility

- The new ldap-utils versions disable the usage of ldapadd -h and replace it by ldapadd -H. This commit adapt the templates to use the new argument.
- Facilitates local usage of the repo for dev and test by allowing the usage of newer ldap-utils versions.

* docs(upgrade images): Update dev env manual setup instructions for new LDAP templates

* ops(upgrade images): Standardize my and mycron image name

Author: mitaahs

.github/workflows/test.yml

@@ -24,8 +24,8 @@ jobs:
         npm install
         eslint routes
         eslint core
-        sudo docker build -t osallou/my .
-        cd $GITHUB_WORKSPACE/cron && sudo docker build -f Dockerfile-cron -t osallou/mycron .
+        sudo docker build -t quay.io/genouest/my .
+        cd $GITHUB_WORKSPACE/cron && sudo docker build -f Dockerfile-cron -t genouest/mycron .
         cd $GITHUB_WORKSPACE/tests && sudo docker-compose up -d
         cd $GITHUB_WORKSPACE/tests && for i in {10..0}; do echo Try $i; sleep 30; sudo docker-compose logs my-app | grep "Server listening on port 3000"; if [ $? -eq 0 ] ; then  echo Server is started; nb_done=$(sudo docker-compose exec -T my-app ls -l /opt/my/scripts/ | grep admin | grep 'update.done' | wc -l); if [ $nb_done -eq 2 ] ; then echo Admin user created; break; fi; fi;  if [ $i -eq 0 ]; then echo Server does not start; exit 1; fi; done
         cd $GITHUB_WORKSPACE && sudo docker ps && mocha -b -t 20000 --full-trace

.travis.yml

@@ -1,19 +1,20 @@
-FROM quay.io/genouest/node:16.13-buster
+FROM node:jod-trixie
 RUN npm install -g @angular/cli@10.2.0
 ARG APIURL
 ARG SENTRY
 ARG UITHEME=cerulean
+# This line is used because the project use old version of Angular.
+# If someday the Angular version is updated, please delete this line.
+ENV NODE_OPTIONS='--openssl-legacy-provider --no-experimental-fetch'
 COPY manager2 /root/genouestaccountmanager/manager2
 RUN cd /root/genouestaccountmanager/manager2/src/assets/css && cp ${UITHEME}.min.css theme.css
 RUN cd /root/genouestaccountmanager/manager2/src/environments && sed -i 's;apiUrl: "";apiUrl: "'"$SAPIURL"'";' environment.prod.ts
 RUN cd /root/genouestaccountmanager/manager2/src/environments && sed -i 's;sentry: "";sentry: "'"$SENTRY"'";' environment.prod.ts
 RUN cd /root/genouestaccountmanager/manager2 && npm ci && ng build --base-href /manager2/ --prod --source-map && rm -rf src && rm -rf node_modules && rm -f dist/my-ui/*.gz &&  npm run compress || true
 
-
-FROM quay.io/osallou/node:16.13-buster
-RUN apt-get update && apt-get install -y ldap-utils vim openssh-client putty-tools
+FROM node:jod-trixie
+RUN apt-get update && apt-get install -y ldap-utils vim openssh-client putty-tools libldap2-dev uuid-dev
 COPY cron/gomngr.sh /opt/gomngr.sh
-
 RUN mkdir -p /root/genouestaccountmanager
 WORKDIR /root/genouestaccountmanager
 

Dockerfile

@@ -27,8 +27,8 @@ Genouestaccountmanager is fairly modular, so it will not fit a deployment for pr
 
 * Install node > 18.0 (using nvm, or by hand)
 * Install ldap-utils
-  * /!\ Depending on your ldap-utils version, the '-h' option might not exists anymore. (Check the `ldapadd` command)
-  * If that's the case, you'll need to edit the scripts in templates/default/user/, and remplace `-h {{ CONFIG.ldap.host }}` by `-H ldap://{{ CONFIG.ldap.host }}`
+  * /!\ If you use an old ldap-utils version, the '-H' option might not exists. (Check the `ldapadd` command)
+  * If that's the case, you'll need to edit the scripts in templates/default/user/, and remplace `-H ldap://{{ CONFIG.ldap.host }}` by `-h {{ CONFIG.ldap.host }}`.
 * Export the following env variables:
 
 

dev_quickstart/README.md

@@ -4,7 +4,7 @@ echo "Start add_group.sh in $0 ..."
 
 set -e
 
-ldapadd -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ group.name }}.{{ fid }}.ldif"
+ldapadd -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ group.name }}.{{ fid }}.ldif"
 
 
 echo "End add_group.sh in $0 ..."

templates/default/user/add_group.sh

@@ -4,11 +4,11 @@ echo "Start add_user.sh in $0 ..."
 
 set -e
 
-ldapadd -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ user.uid }}.{{ fid }}.ldif"
+ldapadd -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ user.uid }}.{{ fid }}.ldif"
 
 if [ -e "{{ CONFIG.general.script_dir }}/group_{{ user.group }}_{{ user.uid }}.{{ fid }}.ldif" ]
 then
-    ldapmodify -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/group_{{ user.group }}_{{ user.uid }}.{{ fid }}.ldif"
+    ldapmodify -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/group_{{ user.group }}_{{ user.uid }}.{{ fid }}.ldif"
 fi
 
 {% include "user/add_readme.sh" %}

templates/default/user/add_user.sh

@@ -4,6 +4,6 @@ echo "Start change_group.sh in $0 ..."
 
 set -e
 
-ldapmodify -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ user.uid }}.{{ fid }}.ldif"
+ldapmodify -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ user.uid }}.{{ fid }}.ldif"
 
 echo "End change_group.sh in $0 ..."

templates/default/user/change_group.sh

@@ -4,11 +4,11 @@ echo "Start create_extra_user.sh in $0 ..."
 
 set -e
 
-ldapadd -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ user.uid }}.{{ fid }}.ldif"
+ldapadd -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ user.uid }}.{{ fid }}.ldif"
 
 if [ -e "{{ CONFIG.general.script_dir }}/group_{{ user.group }}_{{ user.uid }}.{{ fid }}.ldif" ]
 then
-    ldapmodify -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/group_{{ user.group }}_{{ user.uid }}.{{ fid }}.ldif"
+    ldapmodify -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/group_{{ user.group }}_{{ user.uid }}.{{ fid }}.ldif"
 fi
 
 {% include "user/add_readme.sh" %}

templates/default/user/create_extra_user.sh

@@ -4,6 +4,6 @@ echo "Start delete_group.sh in $0 ..."
 
 set -e
 
-ldapdelete -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ group.name }}.{{ fid }}.ldif"
+ldapdelete -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ group.name }}.{{ fid }}.ldif"
 
 echo "End delete_group.sh in $0 ..."

templates/default/user/delete_group.sh

@@ -5,9 +5,9 @@ echo "Start delete_user.sh in $0 ..."
 # Allowed to fail as it may already have been deleted
 #set -e
 
-ldapmodify -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ user.uid }}.{{ fid }}.ldif"
+ldapmodify -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn }} -f "{{ CONFIG.general.script_dir }}/{{ user.uid }}.{{ fid }}.ldif"
 
-ldapdelete -h {{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn  }} "uid={{ user.uid }},ou=people,{{ CONFIG.ldap.dn }}"
+ldapdelete -H ldap://{{ CONFIG.ldap.host }} -cx -w '{{ CONFIG.ldap.admin_password }}' -D {{ CONFIG.ldap.admin_cn }},{{ CONFIG.ldap.admin_dn  }} "uid={{ user.uid }},ou=people,{{ CONFIG.ldap.dn }}"
 
 if [ -d "{{ user.home }}" ]
 then