X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=bin%2Fauth_ejabberd.php;h=d6e20dfe15bd435cb47046b7fc3a12ca69592959;hb=2f84d874a874148ad73044a33b88783e09ae424f;hp=7ad28c96f5660c3c8da843c91c97b3b308404426;hpb=66a103e36a42ab251fd9ca6c4b56b54380e4d535;p=friendica.git

diff --git a/bin/auth_ejabberd.php b/bin/auth_ejabberd.php
index 7ad28c96f5..d6e20dfe15 100755
--- a/bin/auth_ejabberd.php
+++ b/bin/auth_ejabberd.php
@@ -1,6 +1,23 @@
 #!/usr/bin/env php
 <?php
-/*
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @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,15 @@
  *
  */
 
-use Friendica\App;
-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();
@@ -49,12 +75,17 @@ $directory = realpath($directory . DIRECTORY_SEPARATOR . "..");
 
 chdir($directory);
 
-require_once "boot.php";
-require_once "include/dba.php";
+require dirname(__DIR__) . '/vendor/autoload.php';
+
+$dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['auth_ejabberd']]);
 
-$a = new App(dirname(__DIR__));
+\Friendica\DI::init($dice);
 
-if ($a->mode === App::MODE_NORMAL) {
-	$oAuth = new ExAuth();
+$appMode = $dice->create(Mode::class);
+
+if ($appMode->isNormal()) {
+	/** @var ExAuth $oAuth */
+	$oAuth = $dice->create(ExAuth::class);
 	$oAuth->readStdin();
-}
\ No newline at end of file
+}