ANSSI patch

guimard · Dec 26, 2023 · 8e3aadc · 8e3aadc
1 parent 2b89a0d
commit 8e3aadc
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,6 +1,6 @@
 # Changes
 
-* 2023-12-26: Add patches to authenticate via JWT on authn endpoint
+* 2023-12-26: Add patches to authenticate via JWT on authn endpoint + ANSSI patch
 * 2023-12-26: 2.18.1
 * 2023-12-06: add SAML patch to workaround Forgerock bug
 * 2023-11-28: add crowdesc in docs

diff --git a/manager/Dockerfile b/manager/Dockerfile
@@ -26,6 +26,7 @@ RUN echo "# Install nginx and manager libs" && \
 COPY *.patch /
 
 RUN echo auth-to-authn-by-jwt-manager.patch && patch -p1 < auth-to-authn-by-jwt-manager.patch && \
+    echo patch anssi.patch && patch -p1 < anssi.patch && \
     rm -f *.patch && \
     perl -MLemonldap::NG::Manager::Build -e 'Lemonldap::NG::Manager::Build->run( \
       structFile   => "/usr/share/lemonldap-ng/manager/htdocs/static/struct.json", \

diff --git a/portal/Dockerfile b/portal/Dockerfile
@@ -20,7 +20,7 @@ RUN echo "# Install nginx and portal libs" && \
         libconvert-base32-perl libio-string-perl libipc-run-perl \
         libgd-securityimage-perl libmime-tools-perl libnet-ldap-perl \
         libio-socket-timeout-perl libunicode-string-perl liblasso-perl \
-        libio-string-perl libemail-sender-perl && \
+        libio-string-perl libemail-sender-perl \
 	libcrypt-jwt-perl libdigest-hmac-perl libdata-password-zxcvbn-perl && \
     apt autoremove -y && apt clean && rm -rf /var/lib/apt/lists/*
 
@@ -29,6 +29,7 @@ COPY *.patch /
 RUN echo patch appgrid.patch && patch -p1 < appgrid.patch && \
     echo patch jwt-type.patch && patch -p1 < jwt-type.patch && \
     echo patch auth-to-authn-by-jwt-portal.patch && patch -p1 < auth-to-authn-by-jwt-portal.patch && \
+    echo patch anssi.patch && patch -p1 < anssi.patch && \
     rm -f *.patch
 
 RUN echo "# Install nginx configuration files" && \