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

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index bf6d069d12..3a95532464 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -1,6 +1,23 @@
 #!/usr/bin/env php
 <?php
-/*
+/**
+ * @copyright Copyright (C) 2010-2023, 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,8 +51,16 @@
  *
  */
 
-use Friendica\Factory;
-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\Core\Logger\Capability\LogChannel;
+use Friendica\Security\ExAuth;
+use Psr\Log\LoggerInterface;
 
 if (sizeof($_SERVER["argv"]) == 0) {
 	die();
@@ -51,9 +78,22 @@ chdir($directory);
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
-$a = Factory\DependencyFactory::setUp('auth_ejabbered', dirname(__DIR__));
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
+/** @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 ($a->getMode()->isNormal()) {
-	$oAuth = new ExAuth();
+if ($appMode->isNormal()) {
+	/** @var ExAuth $oAuth */
+	$oAuth = $dice->create(ExAuth::class);
 	$oAuth->readStdin();
 }