X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fauth_ejabberd.php;h=3a95532464a7f2e70a60b09c8b35fc5274d4bfc6;hb=63c8a908804bb019898732af972d04f286eec041;hp=930fa853c70ff00cc6428d9d4917fd0a13bb1e02;hpb=e80d68ba53776bed047d897f52db7e25b35a479d;p=friendica.git

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 930fa853c7..3a95532464 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -35,9 +35,11 @@
  * 	- Change the access mode so it is readable only to the user ejabberd and has exec
  * 	  $ chmod 700 /path/to/friendica/bin/auth_ejabberd.php
  *
- * 	- Edit your ejabberd.cfg file, comment out your auth_method and add:
- * 	  {auth_method, external}.
- * 	  {extauth_program, "/path/to/friendica/bin/auth_ejabberd.php"}.
+ * 	- Edit your ejabberd.yml file and add after "shaper:":
+ *
+ * 	  auth_method: [external]
+ * 	  extauth_program: "/path/to/friendica/bin/auth_ejabberd.php"
+ *    auth_use_cache: false
  *
  * 	- Restart your ejabberd service, you should be able to login with your friendica auth info
  *
@@ -49,9 +51,15 @@
  *
  */
 
+if (php_sapi_name() !== 'cli') {
+	header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+	exit();
+}
+
 use Dice\Dice;
 use Friendica\App\Mode;
-use Friendica\Util\ExAuth;
+use Friendica\Core\Logger\Capability\LogChannel;
+use Friendica\Security\ExAuth;
 use Psr\Log\LoggerInterface;
 
 if (sizeof($_SERVER["argv"]) == 0) {
@@ -71,13 +79,21 @@ chdir($directory);
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['auth_ejabberd']]);
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
+$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => [LogChannel::AUTH_JABBERED]]);
 
 \Friendica\DI::init($dice);
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
+
+// Check the database structure and possibly fixes it
+\Friendica\Core\Update::check(\Friendica\DI::basePath(), true);
 
 $appMode = $dice->create(Mode::class);
 
 if ($appMode->isNormal()) {
-	$oAuth = new ExAuth();
+	/** @var ExAuth $oAuth */
+	$oAuth = $dice->create(ExAuth::class);
 	$oAuth->readStdin();
 }