X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FExAuth.php;h=25eb3cc62e41ca449dde8f222d73ce7dfab89145;hb=f4e1acedfcd86c81403c14747ecfd3b11583506e;hp=28157c23ef7285bc3443c1f0abbb2ed4765ec225;hpb=e447375cddb847edbc9d4486be3938674ae66b8c;p=friendica.git

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index 28157c23ef..25eb3cc62e 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -1,6 +1,6 @@
 <?php
 
-/*
+/**
  * ejabberd extauth script for the integration with friendica
  *
  * Originally written for joomla by Dalibor Karlovic <dado@krizevci.info>
@@ -34,9 +34,8 @@
 
 namespace Friendica\Util;
 
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
+use Friendica\DI;
 use Friendica\Model\User;
 
 class ExAuth
@@ -45,13 +44,12 @@ class ExAuth
 	private $host;
 
 	/**
-	 * @brief Create the class
+	 * Create the class
 	 *
-	 * @param boolean $bDebug Debug mode
 	 */
 	public function __construct()
 	{
-		$this->bDebug = (int) Config::get('jabber', 'debug');
+		$this->bDebug = (int) DI::config()->get('jabber', 'debug');
 
 		openlog('auth_ejabberd', LOG_PID, LOG_USER);
 
@@ -59,10 +57,11 @@ class ExAuth
 	}
 
 	/**
-	 * @brief Standard input reading function, executes the auth with the provided
+	 * Standard input reading function, executes the auth with the provided
 	 * parameters
 	 *
 	 * @return null
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	public function readStdin()
 	{
@@ -74,6 +73,11 @@ class ExAuth
 			}
 
 			$iHeader = fgets(STDIN, 3);
+			if (empty($iHeader)) {
+				$this->writeLog(LOG_ERR, 'empty stdin');
+				return;
+			}
+
 			$aLength = unpack('n', $iHeader);
 			$iLength = $aLength['1'];
 
@@ -116,14 +120,13 @@ class ExAuth
 	}
 
 	/**
-	 * @brief Check if the given username exists
+	 * Check if the given username exists
 	 *
 	 * @param array $aCommand The command array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function isUser(array $aCommand)
 	{
-		$a = \get_app();
-
 		// Check if there is a username
 		if (!isset($aCommand[1])) {
 			$this->writeLog(LOG_NOTICE, 'invalid isuser command, no username given');
@@ -139,7 +142,7 @@ class ExAuth
 		$sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
 
 		// Does the hostname match? So we try directly
-		if ($a->getHostName() == $aCommand[2]) {
+		if (DI::baseUrl()->getHostname() == $aCommand[2]) {
 			$this->writeLog(LOG_INFO, 'internal user check for ' . $sUser . '@' . $aCommand[2]);
 			$found = DBA::exists('user', ['nickname' => $sUser]);
 		} else {
@@ -163,13 +166,14 @@ class ExAuth
 	}
 
 	/**
-	 * @brief Check remote user existance via HTTP(S)
+	 * Check remote user existance via HTTP(S)
 	 *
-	 * @param string $host The hostname
-	 * @param string $user Username
-	 * @param boolean $ssl Should the check be done via SSL?
+	 * @param string  $host The hostname
+	 * @param string  $user Username
+	 * @param boolean $ssl  Should the check be done via SSL?
 	 *
 	 * @return boolean Was the user found?
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function checkUser($host, $user, $ssl)
 	{
@@ -177,7 +181,7 @@ class ExAuth
 
 		$url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
 
-		$curlResult = Network::curl($url);
+		$curlResult = DI::httpRequest()->get($url);
 
 		if (!$curlResult->isSuccess()) {
 			return false;
@@ -196,14 +200,13 @@ class ExAuth
 	}
 
 	/**
-	 * @brief Authenticate the given user and password
+	 * Authenticate the given user and password
 	 *
 	 * @param array $aCommand The command array
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function auth(array $aCommand)
 	{
-		$a = \get_app();
-
 		// check user authentication
 		if (sizeof($aCommand) != 4) {
 			$this->writeLog(LOG_NOTICE, 'invalid auth command, data missing');
@@ -219,13 +222,13 @@ class ExAuth
 		$sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
 
 		// Does the hostname match? So we try directly
-		if ($a->getHostName() == $aCommand[2]) {
+		if (DI::baseUrl()->getHostname() == $aCommand[2]) {
 			$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
 
 			$aUser = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
 			if (DBA::isResult($aUser)) {
 				$uid = $aUser['uid'];
-				$success = User::authenticate($aUser, $aCommand[3]);
+				$success = User::authenticate($aUser, $aCommand[3], true);
 				$Error = $success === false;
 			} else {
 				$this->writeLog(LOG_WARNING, 'user not found: ' . $sUser);
@@ -234,7 +237,7 @@ class ExAuth
 			}
 			if ($Error) {
 				$this->writeLog(LOG_INFO, 'check against alternate password for ' . $sUser . '@' . $aCommand[2]);
-				$sPassword = PConfig::get($uid, 'xmpp', 'password', null, true);
+				$sPassword = DI::pConfig()->get($uid, 'xmpp', 'password', null, true);
 				$Error = ($aCommand[3] != $sPassword);
 			}
 		} else {
@@ -256,7 +259,7 @@ class ExAuth
 	}
 
 	/**
-	 * @brief Check remote credentials via HTTP(S)
+	 * Check remote credentials via HTTP(S)
 	 *
 	 * @param string $host The hostname
 	 * @param string $user Username
@@ -291,9 +294,10 @@ class ExAuth
 	}
 
 	/**
-	 * @brief Set the hostname for this process
+	 * Set the hostname for this process
 	 *
 	 * @param string $host The hostname
+	 * @throws \Friendica\Network\HTTPException\InternalServerErrorException
 	 */
 	private function setHost($host)
 	{
@@ -305,7 +309,7 @@ class ExAuth
 
 		$this->host = $host;
 
-		$lockpath = Config::get('jabber', 'lockpath');
+		$lockpath = DI::config()->get('jabber', 'lockpath');
 		if (is_null($lockpath)) {
 			$this->writeLog(LOG_INFO, 'No lockpath defined.');
 			return;
@@ -329,7 +333,7 @@ class ExAuth
 	}
 
 	/**
-	 * @brief write data to the syslog
+	 * write data to the syslog
 	 *
 	 * @param integer $loglevel The syslog loglevel
 	 * @param string $sMessage The syslog message
@@ -343,7 +347,7 @@ class ExAuth
 	}
 
 	/**
-	 * @brief destroy the class, close the syslog connection.
+	 * destroy the class, close the syslog connection.
 	 */
 	public function __destruct()
 	{