Преглед изворни кода

Merge pull request #5850 from mailcow/fix/nightly-autodiscover

[Web] Fix autodiscover fails with external IdP
Patrick Schult пре 1 година
родитељ
комит
caee770e36
1 измењених фајлова са 9 додато и 3 уклоњено
  1. 9 3
      data/web/autodiscover.php

+ 9 - 3
data/web/autodiscover.php

@@ -1,11 +1,13 @@
 <?php
 <?php
+require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/lib/vendor/autoload.php';
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
 require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/vars.inc.php';
-require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/functions.inc.php';
-require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/functions.auth.inc.php';
-$default_autodiscover_config = $autodiscover_config;
 if(file_exists('inc/vars.local.inc.php')) {
 if(file_exists('inc/vars.local.inc.php')) {
   include_once 'inc/vars.local.inc.php';
   include_once 'inc/vars.local.inc.php';
 }
 }
+require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/functions.inc.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/functions.auth.inc.php';
+require_once $_SERVER['DOCUMENT_ROOT'] . '/inc/sessions.inc.php';
+$default_autodiscover_config = $autodiscover_config;
 $autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
 $autodiscover_config = array_merge($default_autodiscover_config, $autodiscover_config);
 
 
 // Redis
 // Redis
@@ -50,6 +52,10 @@ $opt = [
   PDO::ATTR_EMULATE_PREPARES   => false,
   PDO::ATTR_EMULATE_PREPARES   => false,
 ];
 ];
 $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
 $pdo = new PDO($dsn, $database_user, $database_pass, $opt);
+
+// Init Identity Provider
+$iam_provider = identity_provider('init');
+
 $login_user = strtolower(trim($_SERVER['PHP_AUTH_USER']));
 $login_user = strtolower(trim($_SERVER['PHP_AUTH_USER']));
 $login_pass = trim(htmlspecialchars_decode($_SERVER['PHP_AUTH_PW']));
 $login_pass = trim(htmlspecialchars_decode($_SERVER['PHP_AUTH_PW']));