Merge pull request #249 from silinternational/develop

Release 10.0.0-alpha.5 -- more fixes for SimpleSAMLphp 2
silinternational · Jul 10, 2024 · 653686c · 653686c
2 parents 8915092 + 095efeb
commit 653686c
Show file tree

Hide file tree

Showing 37 changed files with 168 additions and 166 deletions.
diff --git a/development/logo_idp1.png b/development/logo_idp1.png
diff --git a/development/logo_idp2.png b/development/logo_idp2.png
diff --git a/development/logo_idp3.png b/development/logo_idp3.png
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -128,6 +128,7 @@ services:
       - ./development/idp-local/config/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
       - ./development/announcement.php:/data/vendor/simplesamlphp/simplesamlphp/announcement/announcement.php
       - ./development/enable-exampleauth.sh:/data/enable-exampleauth.sh
+      - ./development/logo_idp1.png:/data/vendor/simplesamlphp/simplesamlphp/public/logo.png
 
       # Utilize custom metadata
       - ./development/idp-local/metadata/saml20-idp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-hosted.php
@@ -177,6 +178,7 @@ services:
       MYSQL_PASSWORD: "silauth"
       BASE_URL_PATH: "http://ssp-idp1.local/" # change this to "http://ssp-idp1.local:8085" for manual browser testing
       HELP_CENTER_URL: "https://example.org/help"
+      THEME_COLOR_SCHEME: "blue_grey-teal"
 
   ssp-idp2.local:
     build: .
@@ -190,6 +192,7 @@ services:
       # Utilize custom configs
       - ./development/idp2-local/config/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
       - ./development/enable-exampleauth.sh:/data/enable-exampleauth.sh
+      - ./development/logo_idp2.png:/data/vendor/simplesamlphp/simplesamlphp/public/logo.png
 
       # Utilize custom metadata
       - ./development/idp2-local/metadata/saml20-idp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-hosted.php
@@ -223,6 +226,7 @@ services:
       MYSQL_PASSWORD: "silauth"
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
+      THEME_COLOR_SCHEME: "red-teal"
 
   ssp-idp3.local:
     build: .
@@ -232,6 +236,7 @@ services:
 
       # Utilize custom configs
       - ./development/idp3-local/config/authsources.php:/data/vendor/simplesamlphp/simplesamlphp/config/authsources.php
+      - ./development/logo_idp3.png:/data/vendor/simplesamlphp/simplesamlphp/public/logo.png
 
       # Utilize custom metadata
       - ./development/idp3-local/metadata/saml20-idp-hosted.php:/data/vendor/simplesamlphp/simplesamlphp/metadata/saml20-idp-hosted.php
@@ -254,6 +259,7 @@ services:
       SECURE_COOKIE: "false"
       SHOW_SAML_ERRORS: "true"
       IDP_NAME: "IdP3"
+      THEME_COLOR_SCHEME: "orange-light_blue"
 
   ssp-sp1.local:
     image: silintl/ssp-base:9.3.0

diff --git a/modules/expirychecker/public/about2expire.php b/modules/expirychecker/public/about2expire.php
@@ -55,12 +55,11 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'expirychecker:about2expire');
-$t->data['formTarget'] = Module::getModuleURL('expirychecker/about2expire.php');
-$t->data['formData'] = ['StateId' => $stateId];
-$t->data['daysLeft'] = $state['daysLeft'];
-$t->data['dayOrDays'] = (intval($state['daysLeft']) === 1 ? 'day' : 'days');
-$t->data['expiresAtTimestamp'] = $state['expiresAtTimestamp'];
-$t->data['accountName'] = $state['accountName'];
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', null);
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
+$t->data['form_target'] = Module::getModuleURL('expirychecker/about2expire.php');
+$t->data['form_data'] = ['StateId' => $stateId];
+$t->data['days_left'] = $state['daysLeft'];
 $t->send();
 
 Logger::info('expirychecker - User has been warned that their password will expire soon.');
diff --git a/modules/expirychecker/public/expired.php b/modules/expirychecker/public/expired.php
@@ -48,10 +48,10 @@
 $globalConfig = Configuration::getInstance();
 
 $t = new Template($globalConfig, 'expirychecker:expired');
-$t->data['formTarget'] = Module::getModuleURL('expirychecker/expired.php');
-$t->data['formData'] = ['StateId' => $stateId];
-$t->data['expiresAtTimestamp'] = $state['expiresAtTimestamp'];
-$t->data['accountName'] = $state['accountName'];
+$t->data['theme_color_scheme'] = $globalConfig->getOptionalString('theme.color-scheme', null);
+$t->data['analytics_tracking_id'] = $globalConfig->getOptionalString('analytics.trackingId', '');
+$t->data['form_target'] = Module::getModuleURL('expirychecker/expired.php');
+$t->data['form_data'] = ['StateId' => $stateId];
 $t->send();
 
 Logger::info('expirychecker - User has been told that their password has expired.');
diff --git a/modules/expirychecker/src/Auth/Process/ExpiryDate.php b/modules/expirychecker/src/Auth/Process/ExpiryDate.php
@@ -242,8 +242,6 @@ public function redirect2PasswordChange(
     ): void {
         $sessionType = 'expirychecker';
         /* Save state and redirect. */
-        $state['expiresAtTimestamp'] = $expiryTimestamp;
-        $state['accountName'] = $accountName;
         $id = State::saveState(
             $state,
             'expirychecker:redirected_to_password_change_url'
@@ -359,8 +357,6 @@ public function redirectToExpiredPage(array &$state, string $accountName, int $e
         ]));
 
         /* Save state and redirect. */
-        $state['expiresAtTimestamp'] = $expiryTimestamp;
-        $state['accountName'] = $accountName;
         $state['passwordChangeUrl'] = $this->passwordChangeUrl;
         $state['originalUrlParam'] = $this->originalUrlParam;
 
@@ -396,8 +392,6 @@ protected function redirectToWarningPage(array &$state, string $accountName, int
         }
 
         /* Save state and redirect. */
-        $state['expiresAtTimestamp'] = $expiryTimestamp;
-        $state['accountName'] = $accountName;
         $state['passwordChangeUrl'] = $this->passwordChangeUrl;
         $state['originalUrlParam'] = $this->originalUrlParam;
 

diff --git a/modules/material/themes/material/default/header.twig b/modules/material/themes/material/default/header.twig
@@ -5,9 +5,9 @@
 
 <base href="{{ baseurlpath }}/module.php/material/">
 
-{% if analyticsTrackingId is defined and analyticsTrackingId is not empty %}
+{% if analytics_tracking_id is defined and analytics_tracking_id is not empty %}
   <!-- Google tag (gtag.js) -->
-  <script async src="https://www.googletagmanager.com/gtag/js?id={{ analyticsTrackingId }}"></script>
+  <script async src="https://www.googletagmanager.com/gtag/js?id={{ analytics_tracking_id }}"></script>
   <script>
     window.dataLayer = window.dataLayer || [];
 
@@ -17,12 +17,11 @@
 
     gtag('js', new Date());
 
-    gtag('config', '{{ analyticsTrackingId }}');
+    gtag('config', '{{ analytics_tracking_id }}');
   </script>
 {% endif %}
 
-{# FIXME: <link rel="stylesheet" href="material.{{ theme.color-scheme | e ?: 'indigo-purple' }}.1.2.1.min.css"> #}
-<link rel="stylesheet" href="material.indigo-purple.1.2.1.min.css">
+<link rel="stylesheet" href="material.{{ (theme_color_scheme ?? 'indigo-purple')|e }}.1.2.1.min.css">
 <link rel="stylesheet" href="styles.2.3.6.css">
 
 <script async src="material.1.2.1.min.js"></script>

diff --git a/modules/material/themes/material/default/other_mfas.twig b/modules/material/themes/material/default/other_mfas.twig
@@ -1,4 +1,4 @@
-{% if otherOptions|length > 0 %}
+{% if other_options|length > 0 %}
   <div layout-children="column" child-spacing="center">
     {# used type=button to avoid form submission on click since this is just used to display the ul #}
     <button id="others" type="button" class="mdl-button mdl-js-button">
@@ -7,7 +7,7 @@
       </span>
     </button>
     <ul class="mdl-menu mdl-js-menu mdl-menu--top-left" data-mdl-for="others">
-      {% for option in otherOptions %}
+      {% for option in other_options %}
         {# TODO: Non-interactive elements should not be assigned mouse or keyboard event listeners. #}
         <li class="mdl-menu__item" onclick="location.href = '{{ option.callback|raw }}'">
           <span class="mdl-list__item-primary-content">

diff --git a/modules/material/themes/material/default/selectidp-links.twig b/modules/material/themes/material/default/selectidp-links.twig
@@ -37,9 +37,9 @@
 
       <div class="mdl-layout-spacer"></div>
 
-      {% if helpCenterUrl is defined and helpCenterUrl is not empty %}
+      {% if help_center_url is defined and help_center_url is not empty %}
         <nav class="mdl-navigation">
-          <a href="{{ helpCenterUrl|e(html_attr) }}" target="_blank" rel="noopener" class="mdl-navigation__link">
+          <a href="{{ help_center_url|e(html_attr) }}" target="_blank" rel="noopener" class="mdl-navigation__link">
             {{ '{selectidp-links:help}'|trans }}
           </a>
         </nav>

diff --git a/modules/material/themes/material/expirychecker/about2expire.twig b/modules/material/themes/material/expirychecker/about2expire.twig
@@ -16,15 +16,15 @@
   </header>
   <main class="mdl-layout__content" layout-children="column">
     <form layout-children="column">
-      {% for name, value in formData %}
+      {% for name, value in form_data %}
         <input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
       {% endfor %}
 
       <p class="mdl-typography--title margin">
-        {% if daysLeft < 2 %}
+        {% if days_left < 2 %}
           {{ '{about2expire:expiring_in_a_day}'|trans }}
         {% else %}
-          {{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': daysLeft}) }}
+          {{ '{about2expire:expiring_soon}'|trans({'%daysLeft%': days_left}) }}
         {% endif %}
       </p>
 

diff --git a/modules/material/themes/material/expirychecker/expired.twig b/modules/material/themes/material/expirychecker/expired.twig
@@ -16,7 +16,7 @@
   </header>
   <main class="mdl-layout__content" layout-children="column">
     <form layout-children="column">
-      {% for name, value in formData %}
+      {% for name, value in form_data %}
         <input type="hidden" name="{{ name|e }}" value="{{ value|e }}">
       {% endfor %}
 

diff --git a/modules/material/themes/material/mfa/low-on-backup-codes.twig b/modules/material/themes/material/mfa/low-on-backup-codes.twig
@@ -29,7 +29,7 @@
 
         <div class="mdl-card__title center">
           <p class="mdl-card__subtitle-text">
-            {{ '{mfa:running_out_info}'|trans({'%numBackupCodesRemaining%':numBackupCodesRemaining}) }}
+            {{ '{mfa:running_out_info}'|trans({'%numBackupCodesRemaining%': num_backup_codes_remaining}) }}
           </p>
         </div>
 

diff --git a/modules/material/themes/material/mfa/new-backup-codes.twig b/modules/material/themes/material/mfa/new-backup-codes.twig
@@ -40,7 +40,7 @@
   </header>
   <main class="mdl-layout__content" layout-children="column">
     <form layout-children="column" method="post">
-      {% if newBackupCodes is not empty %}
+      {% if new_backup_codes is not empty %}
         <h1 class="mdl-typography--display-1">
           {{ '{mfa:new_codes_header}'|trans }}
         </h1>
@@ -57,12 +57,12 @@
         <div class="mdl-card mdl-shadow--8dp" style="min-height: 17em">
           <div class="mdl-card__supporting-text ff-temp-flexbug-fix" layout-children="column" id="code-card">
             <p class="fill-parent" layout-children="row">
-              <span flex>{{ '{mfa:account}'|trans({'%idpName%':idpName}) }}</span>
+              <span flex>{{ '{mfa:account}'|trans({'%idpName%': idp_name}) }}</span>
               <em class="mdl-typography--caption">{{ "now"|date("M j, Y") }}</em>
             </p>
 
             <div class="code-container">
-              {% for newCode in newBackupCodes %}
+              {% for newCode in new_backup_codes %}
                 <code>☐ {{ newCode }}</code>
               {% endfor %}
             </div>
@@ -90,8 +90,8 @@
             </button>
 
             <a
-              href="data:text/plain,{{ codesForDownload }}"
-              download="{{ idpName }}-printable-codes.txt"
+              href="data:text/plain,{{ codes_for_download }}"
+              download="{{ idp_name }}-printable-codes.txt"
               class="mdl-button mdl-button--primary"
             >
               {{ '{mfa:button_download}'|trans }}
@@ -112,7 +112,7 @@
             </script>
             <button class="mdl-button mdl-button--primary" type="button" onclick="copyCodesToClipboard(this)">
               {{ '{mfa:button_copy}'|trans }}
-              <textarea class="out-of-sight">{{ codesForClipboard }}</textarea>
+              <textarea class="out-of-sight">{{ codes_for_clipboard }}</textarea>
             </button>
           </div>
         </div>
@@ -131,7 +131,7 @@
           <div class="mdl-card__supporting-text">
             <p>
               {{ '{mfa:new_codes_failed}'|trans }}
-              <a href="{{ mfaSetupUrl }}" target="_blank" rel="noopener">{{ mfaSetupUrl }}</a>
+              <a href="{{ mfa_setup_url }}" target="_blank" rel="noopener">{{ mfa_setup_url }}</a>
             </p>
           </div>
         </div>

diff --git a/modules/material/themes/material/mfa/out-of-backup-codes.twig b/modules/material/themes/material/mfa/out-of-backup-codes.twig
@@ -29,7 +29,7 @@
 
         <div class="mdl-card__title center">
           <p class="mdl-card__subtitle-text">
-            {% if hasOtherMfaOptions %}
+            {% if has_other_mfa_options %}
               {{ '{mfa:has_options_besides_codes}'|trans }}
             {% else %}
               {{ '{mfa:has_no_more_options}'|trans }}
@@ -38,7 +38,7 @@
         </div>
 
         <div class="mdl-card__actions" layout-children="row">
-          {% if hasOtherMfaOptions %}
+          {% if has_other_mfa_options %}
             <button name="continue" type="submit" class="mdl-button">
               {{ '{mfa:button_later}'|trans }}
             </button>

diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig b/modules/material/themes/material/mfa/prompt-for-mfa-backupcode.twig
@@ -42,19 +42,19 @@
           </div>
         </div>
 
-        {% if errorMessage is not empty %}
+        {% if error_message is not empty %}
           <div class="mdl-card__supporting-text" layout-children="column">
             <p class="mdl-color-text--red error">
               <i class="material-icons">error</i>
 
               <span class="mdl-typography--caption">
-                {{ errorMessage|e }}
+                {{ error_message|e }}
               </span>
             </p>
           </div>
 
           <script>
-            ga('send', 'event', 'error', 'backupcode', '{{ errorMessage|e('js')|raw }}');
+            ga('send', 'event', 'error', 'backupcode', '{{ error_message|e('js')|raw }}');
           </script>
         {% endif %}
 

diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig b/modules/material/themes/material/mfa/prompt-for-mfa-manager.twig
@@ -29,7 +29,7 @@
 
         <div class="mdl-card__title center">
           <p class="mdl-card__subtitle-text">
-            {{ '{mfa:manager_sent}'|trans({'%managerEmail%': managerEmail}) }}
+            {{ '{mfa:manager_sent}'|trans({'%managerEmail%': manager_email}) }}
           </p>
         </div>
 
@@ -42,19 +42,19 @@
           </div>
         </div>
 
-        {% if errorMessage is not empty %}
+        {% if error_message is not empty %}
           <div class="mdl-card__supporting-text" layout-children="column">
             <p class="mdl-color-text--red error">
               <i class="material-icons">error</i>
 
               <span class="mdl-typography--caption">
-                {{ errorMessage|e }}
+                {{ error_message|e }}
               </span>
             </p>
           </div>
 
           <script>
-            ga('send', 'event', 'error', 'managercode', '{{ errorMessage|e('js')|raw }}');
+            ga('send', 'event', 'error', 'managercode', '{{ error_message|e('js')|raw }}');
           </script>
         {% endif %}
 

diff --git a/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig b/modules/material/themes/material/mfa/prompt-for-mfa-totp.twig
@@ -28,7 +28,7 @@
         </div>
 
         <div class="mdl-card__title center">
-          {{ '{mfa:account}'|trans({'%idpName%': idpName}) }}
+          {{ '{mfa:account}'|trans({'%idpName%': idp_name}) }}
         </div>
 
         <div class="mdl-card__supporting-text" layout-children="column">
@@ -40,19 +40,19 @@
           </div>
         </div>
 
-        {% if errorMessage is not empty %}
+        {% if error_message is not empty %}
           <div class="mdl-card__supporting-text" layout-children="column">
             <p class="mdl-color-text--red error">
               <i class="material-icons">error</i>
 
               <span class="mdl-typography--caption">
-                {{ errorMessage|e }}
+                {{ error_message|e }}
               </span>
             </p>
           </div>
 
           <script>
-            ga('send', 'event', 'error', 'totp', '{{ errorMessage|e('js')|raw }}');
+            ga('send', 'event', 'error', 'totp', '{{ error_message|e('js')|raw }}');
           </script>
         {% endif %}