Merge pull request #109 from silinternational/develop

Release 7.6.0 PHP8 Upgrade

Author: Baggerone

.gitignore

@@ -4,4 +4,4 @@ node_modules/
 composer.lock
 nbproject/
 .vagrant/
-local.env
+*local.env

.whitesource

@@ -173,6 +173,7 @@ _Note:  This nag only works once since choosing later will simply set the nag da
 1.  Goto [SP 1](http://ssp-sp1.local:8082/module.php/core/authenticate.php?as=hub-discovery)
 1.  Click **idp4** (third one)
 1.  Login as a "totp" user: `username=`**has_totp** `password=`**a**
+1.  You should see the form to enter a totp code. 
 1.  Set up an app using this secret, `JVRXKYTMPBEVKXLS`
 1.  Enter code from app to verify
 1.  Click **Logout**

README.md

@@ -14,7 +14,7 @@
     "php": ">=7.0",
     "ext-json": "*",
     "simplesamlphp/composer-module-installer": "^1.1.5",
-    "simplesamlphp/simplesamlphp": "~1.18.6",
+    "simplesamlphp/simplesamlphp": "~1.18.6 || ~1.19.0",
     "silinternational/ssp-utilities": "^1.0"
   },
   "require-dev": {

composer.json

@@ -7,4 +7,5 @@
         'core:AdminPassword',
     ],
     'silauth' => ConfigManager::getSspConfig(),
+    // Test user credentials are in the database migration m991231_235959_insert_mfa_test_users.php
 ];

development/idp4/authsources.php

@@ -9,6 +9,7 @@
     'authproc' => [
         10 => [
             'class' => 'mfa:Mfa',
+            'idpDomainName' => 'ssp-idp4.local',
             'employeeIdAttr' => 'employeeNumber',
             'idBrokerAccessToken' => Env::get('ID_BROKER_ACCESS_TOKEN'),
             'idBrokerAssertValidIp' => Env::get('ID_BROKER_ASSERT_VALID_IP'),

development/idp4/saml20-idp-hosted.php

@@ -27,9 +27,10 @@
                     </h1>
                 </div>
 
+
                 <div class="mdl-card__title center" >
                     <p class="mdl-card__subtitle-text">
-                        <?= $this->t('{material:mfa:running_out_info}', ['{numBackupCodesRemaining}' => (int)$this->data['numBackupCodesRemaining']]) ?>
+                        <?= $this->t('{material:mfa:running_out_info}', ['{numBackupCodesRemaining}' => (string)(int)$this->data['numBackupCodesRemaining']]) ?>
                     </p>
                 </div>