Merge pull request #11615 from annando/api-markers

[friendica.git] / bin / auth_ejabberd.php

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 930fa853c70ff00cc6428d9d4917fd0a13bb1e02..14ed7b0b2808b1f7bd2f1858aa7ff7654dd9b508 100755 (executable)
--- 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-2022, 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,14 @@
  *
  */
 
+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\Security\ExAuth;
 use Psr\Log\LoggerInterface;
 
 if (sizeof($_SERVER["argv"]) == 0) {
@@ -74,10 +81,11 @@ $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config
 $dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['auth_ejabberd']]);
 
 \Friendica\DI::init($dice);
-
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
 $appMode = $dice->create(Mode::class);
 
 if ($appMode->isNormal()) {
-       $oAuth = new ExAuth();
+       /** @var ExAuth $oAuth */
+       $oAuth = $dice->create(ExAuth::class);
        $oAuth->readStdin();
 }