Added the ability to auto-load config from metadata url

diff --git a/app/Auth/Access/Saml2Service.php b/app/Auth/Access/Saml2Service.php
index 8266c3ba3d229e8ce99d7e30a515629c7c5addbb..a5ca54c8d0734853d2983628d29084e89c820575 100644 (file)
--- a/app/Auth/Access/Saml2Service.php
+++ b/app/Auth/Access/Saml2Service.php
@@ -7,6 +7,7 @@ use BookStack\Exceptions\SamlException;
 use Illuminate\Support\Str;
 use OneLogin\Saml2\Auth;
 use OneLogin\Saml2\Error;
+use OneLogin\Saml2\IdPMetadataParser;
 
 /**
  * Class Saml2Service
@@ -103,6 +104,7 @@ class Saml2Service extends ExternalAuthService
     /**
      * Load the underlying Onelogin SAML2 toolkit.
      * @throws \OneLogin\Saml2\Error
+     * @throws \Exception
      */
     protected function getToolkit(): Auth
     {
@@ -113,8 +115,13 @@ class Saml2Service extends ExternalAuthService
             $overrides = json_decode($overrides, true);
         }
 
+        $metaDataSettings = [];
+        if ($this->config['autoload_from_metadata']) {
+            $metaDataSettings = IdPMetadataParser::parseRemoteXML($settings['idp']['entityId']);
+        }
+
         $spSettings = $this->loadOneloginServiceProviderDetails();
-        $settings = array_replace_recursive($settings, $spSettings, $overrides);
+        $settings = array_replace_recursive($settings, $spSettings, $metaDataSettings, $overrides);
         return new Auth($settings);
     }
 

diff --git a/app/Config/saml2.php b/app/Config/saml2.php
index bcfddc53481ad5dfa109e79c20b2ebea0bd5b96b..2f2ad14f1d5de4e482b7c98813ea98bf07b2fa5e 100644 (file)
--- a/app/Config/saml2.php
+++ b/app/Config/saml2.php
@@ -27,6 +27,9 @@ return [
     // When syncing groups, remove any groups that no longer match. Otherwise sync only adds new groups.
     'remove_from_groups' => env('SAML2_REMOVE_FROM_GROUPS', false),
 
+    // Autoload IDP details from the metadata endpoint
+    'autoload_from_metadata' => env('SAML2_AUTOLOAD_METADATA', false),
+
     // Overrides, in JSON format, to the configuration passed to underlying onelogin library.
     'onelogin_overrides' => env('SAML2_ONELOGIN_OVERRIDES', null),
 

diff --git a/tests/Auth/Saml2.php b/tests/Auth/Saml2.php
index 65b2ed3adb42d29681e4d23aa02f3c3388850471..90561896aded3fe507de2e8b22c1f3a80d73da4a 100644 (file)
--- a/tests/Auth/Saml2.php
+++ b/tests/Auth/Saml2.php
@@ -22,6 +22,7 @@ class Saml2 extends TestCase
             'saml2.onelogin.idp.entityId' => 'https://example.com/saml2/idp/metadata',
             'saml2.onelogin.idp.singleSignOnService.url' => 'https://example.com/saml2/idp/sso',
             'saml2.onelogin.idp.singleLogoutService.url' => 'https://example.com/saml2/idp/sls',
+            'saml2.autoload_from_metadata' => false,
             'saml2.onelogin.idp.x509cert' => 'MIIEazCCAtOgAwIBAgIUe7a088Cnr4izmrnBEnx5q3HTMvYwDQYJKoZIhvcNAQELBQAwRTELMAkGA1UEBhMCR0IxEzARBgNVBAgMClNvbWUtU3RhdGUxITAfBgNVBAoMGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZDAeFw0xOTExMTYxMjE3MTVaFw0yOTExMTUxMjE3MTVaMEUxCzAJBgNVBAYTAkdCMRMwEQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDzLe9FfdyplTxHp4SuQ9gQtZT3t+SDfvEL72ppCfFZw7+B5s5B/T73aXpoQ3S53pGI1RIWCge2iCUQ2tzm27aSNH0iu9aJYcUQZ/RITqd0ayyDks1NA2PT3TW6t3m7KV5re4P0Nb+YDeuyHdkz+jcMtpn8CmBoT0H+skha0hiqINkjkRPiHvLHVGp+tHUEA/I6mN4aB/UExSTLs79NsLUfteqqxe9+tvdUaToyDPrhPFjONs+9NKCkzIC6vcv7J6AtuKG6nET+zB9yOWgtGYQifXqQA2y5dL81BB0q5uMaBLS2pq3aPPjzU2F3+EysjySWTnCkfk7C5SsCXRu8Q+U95tunpNfwf5olE6Was48NMM+PwV7iCNMPkNzllq6PCiM+P8DrMSczzUZZQUSv6dSwPCo+YSVimEM0Og3XJTiNhQ5ANlaIn66Kw5gfoBfuiXmyIKiSDyAiDYmFaf4395wWwLkTR+cw8WfjaHswKZTomn1MR3OJsY2UJ0eRBYM+YSsCAwEAAaNTMFEwHQYDVR0OBBYEFImp2CYCGfcb7w91H/cShTCkXwR/MB8GA1UdIwQYMBaAFImp2CYCGfcb7w91H/cShTCkXwR/MA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggGBAA+g/C7uL9ln+W+qBknLW81kojYflgPK1I1MHIwnMvl/ZTHX4dRXKDrk7KcUq1KjqajNV66f1cakp03IijBiO0Xi1gXUZYLoCiNGUyyp9XloiIy9Xw2PiWnrw0+yZyvVssbehXXYJl4RihBjBWul9R4wMYLOUSJDe2WxcUBhJnxyNRs+P0xLSQX6B2n6nxoDko4p07s8ZKXQkeiZ2iwFdTxzRkGjthMUv704nzsVGBT0DCPtfSaO5KJZW1rCs3yiMthnBxq4qEDOQJFIl+/LD71KbB9vZcW5JuavzBFmkKGNro/6G1I7el46IR4wijTyNFCYUuD9dtignNmpWtN8OW+ptiL/jtTySWukjys0s+vLn83CVvjB0dJtVAIYOgXFdIuii66gczwwM/LGiOExJn0dTNzsJ/IYhpxL4FBEuP0pskY0o0aUlJ2LS2j+wSQTRKsBgMjyrUrekle2ODStStn3eabjIx0/FHlpFr0jNIm/oMP7kwjtUX4zaNe47QI4Gg==',
         ]);
     }