X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FExAuth.php;h=7d118d26ca21c66636acb26e069a57caf54f5b83;hb=6c36fd9e01510a14fea9de766b4afe6760912a2e;hp=1ab5341a816efb86cf2f5bef01066d5080a0695d;hpb=4f2ae8868431952bd3acda1537ee899740cbf205;p=friendica.git

diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php
index 1ab5341a81..7d118d26ca 100644
--- a/src/Util/ExAuth.php
+++ b/src/Util/ExAuth.php
@@ -35,26 +35,22 @@
 namespace Friendica\Util;
 
 use Friendica\Core\Config;
-use Friendica\Core\PConfig;
 use Friendica\Database\DBA;
-use Friendica\Database\DBM;
+use Friendica\DI;
 use Friendica\Model\User;
 
-require_once 'include/dba.php';
-
 class ExAuth
 {
 	private $bDebug;
 	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);
 
@@ -62,10 +58,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()
 	{
@@ -119,14 +116,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');
@@ -142,7 +138,7 @@ class ExAuth
 		$sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
 
 		// Does the hostname match? So we try directly
-		if ($a->get_hostname() == $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 {
@@ -166,13 +162,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)
 	{
@@ -180,17 +177,17 @@ class ExAuth
 
 		$url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
 
-		$data = Network::curl($url);
+		$curlResult = Network::curl($url);
 
-		if (!is_array($data)) {
+		if (!$curlResult->isSuccess()) {
 			return false;
 		}
 
-		if ($data['return_code'] != '200') {
+		if ($curlResult->getReturnCode() != 200) {
 			return false;
 		}
 
-		$json = @json_decode($data['body']);
+		$json = @json_decode($curlResult->getBody());
 		if (!is_object($json)) {
 			return false;
 		}
@@ -199,14 +196,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');
@@ -222,13 +218,13 @@ class ExAuth
 		$sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
 
 		// Does the hostname match? So we try directly
-		if ($a->get_hostname() == $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 (DBM::is_result($aUser)) {
+			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);
@@ -237,7 +233,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 {
@@ -259,7 +255,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
@@ -294,9 +290,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)
 	{
@@ -308,7 +305,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;
@@ -332,7 +329,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
@@ -346,7 +343,7 @@ class ExAuth
 	}
 
 	/**
-	 * @brief destroy the class, close the syslog connection.
+	 * destroy the class, close the syslog connection.
 	 */
 	public function __destruct()
 	{