From d75ecf68d121760421bd0732749a87fa272079a5 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Fri, 8 Mar 2024 11:57:39 -0700
Subject: [PATCH 1/3] IDP-892 - enable modules using module.enable in
 config.php

---
 development/idp-local/config/config.php  | 6 ++++++
 development/idp2-local/config/config.php | 6 ++++++
 development/sp-local/config/config.php   | 6 ++++++
 development/sp2-local/config/config.php  | 6 ++++++
 dockerbuild/ssp-overrides/config.php     | 6 ++++++
 5 files changed, 30 insertions(+)

diff --git a/development/idp-local/config/config.php b/development/idp-local/config/config.php
index 4dcfac9d..5494f11a 100644
--- a/development/idp-local/config/config.php
+++ b/development/idp-local/config/config.php
@@ -595,6 +595,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
 
diff --git a/development/idp2-local/config/config.php b/development/idp2-local/config/config.php
index 4d3aeb1a..51596669 100644
--- a/development/idp2-local/config/config.php
+++ b/development/idp2-local/config/config.php
@@ -327,6 +327,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
     /*
diff --git a/development/sp-local/config/config.php b/development/sp-local/config/config.php
index 2470d2ab..c5815a99 100644
--- a/development/sp-local/config/config.php
+++ b/development/sp-local/config/config.php
@@ -297,6 +297,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
     /*
diff --git a/development/sp2-local/config/config.php b/development/sp2-local/config/config.php
index 52102c46..d26855df 100644
--- a/development/sp2-local/config/config.php
+++ b/development/sp2-local/config/config.php
@@ -297,6 +297,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
     /*
diff --git a/dockerbuild/ssp-overrides/config.php b/dockerbuild/ssp-overrides/config.php
index 6f630d70..2702bc17 100644
--- a/dockerbuild/ssp-overrides/config.php
+++ b/dockerbuild/ssp-overrides/config.php
@@ -595,6 +595,12 @@
     'module.enable' => [
         // Setting to TRUE enables.
         'authgoogle' => $GOOGLE_ENABLE,
+        'expirychecker' => true,
+        'material' => true,
+        'mfa' => true,
+        'profilereview' => true,
+        'silauth' => true,
+        'sildisco' => true,
     ],
 
 

From d0f45902e6f38d50e19eb4d874029b4cb3dd2139 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Fri, 8 Mar 2024 12:06:23 -0700
Subject: [PATCH 2/3] set COMPOSER_ALLOW_SUPERUSER=1 in Dockerfile

---
 Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index ed25a14e..9027aca3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get update -y \
         php-gmp \
         php-memcached \
     && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*    
+    && rm -rf /var/lib/apt/lists/*
 
 # Create required directories
 RUN mkdir -p /data
@@ -41,7 +41,7 @@ COPY composer.lock /data/
 # It is not well understood what changed in composer, but since the overrides will need to be redesigned during
 # the SimpleSAMLphp 2.x upgrade, this issue is deferred until then.
 #RUN composer self-update --no-interaction
-RUN composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader --no-scripts --no-progress
+RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader --no-scripts --no-progress
 
 # Copy in SSP override files
 ENV SSP_PATH /data/vendor/simplesamlphp/simplesamlphp

From e4502ff7852ed4e202ba64db09e8e8549a5a8e21 Mon Sep 17 00:00:00 2001
From: briskt <3172830+briskt@users.noreply.github.com>
Date: Fri, 8 Mar 2024 12:14:15 -0700
Subject: [PATCH 3/3] re-enable the composer self-update in Dockerfile

---
 Dockerfile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9027aca3..95e011f4 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -36,11 +36,7 @@ WORKDIR /data
 # Install/cleanup composer dependencies
 COPY composer.json /data/
 COPY composer.lock /data/
-# TODO/FIXME: Disabled the self-update due to a breaking change between composer 2.6.6 and 2.7.1 that affects the
-# loading of the simplesamlphp/simplesamlphp/modules folder. The Docker build fails on the sildisco/sspoverrides line.
-# It is not well understood what changed in composer, but since the overrides will need to be redesigned during
-# the SimpleSAMLphp 2.x upgrade, this issue is deferred until then.
-#RUN composer self-update --no-interaction
+RUN composer self-update --no-interaction
 RUN COMPOSER_ALLOW_SUPERUSER=1 composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader --no-scripts --no-progress
 
 # Copy in SSP override files