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 11df438952a06e96ee700a7d6345cba1c90007d8..14ed7b0b2808b1f7bd2f1858aa7ff7654dd9b508 100755 (executable)
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -1,6 +1,23 @@
 #!/usr/bin/env php
 <?php
-/*
+/**
+ * @copyright Copyright (C) 2010-2022, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
  * ejabberd extauth script for the integration with friendica
  *
  * Originally written for joomla by Dalibor Karlovic <dado@krizevci.info>
@@ -18,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
  *
@@ -32,11 +51,15 @@
  *
  */
 
-use Friendica\App;
-use Friendica\Core\Config;
-use Friendica\Factory;
-use Friendica\Util\BasePath;
-use Friendica\Util\ExAuth;
+if (php_sapi_name() !== 'cli') {
+       header($_SERVER["SERVER_PROTOCOL"] . ' 403 Forbidden');
+       exit();
+}
+
+use Dice\Dice;
+use Friendica\App\Mode;
+use Friendica\Security\ExAuth;
+use Psr\Log\LoggerInterface;
 
 if (sizeof($_SERVER["argv"]) == 0) {
        die();
@@ -54,14 +77,15 @@ chdir($directory);
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$basedir = BasePath::create(dirname(__DIR__), $_SERVER);
-$configLoader = new Config\ConfigCacheLoader($basedir);
-$config = Factory\ConfigFactory::createCache($configLoader);
-$logger = Factory\LoggerFactory::create('auth_ejabberd', $config);
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['auth_ejabberd']]);
 
-$a = new App($config, $logger);
+\Friendica\DI::init($dice);
+\Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
+$appMode = $dice->create(Mode::class);
 
-if ($a->getMode()->isNormal()) {
-       $oAuth = new ExAuth();
+if ($appMode->isNormal()) {
+       /** @var ExAuth $oAuth */
+       $oAuth = $dice->create(ExAuth::class);
        $oAuth->readStdin();
 }