From: Michael Vogel <ike@pirati.ca>
Date: Tue, 13 Sep 2016 20:29:47 +0000 (+0000)
Subject: XMPP authentification for multi domain systems
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=4f5997f30af979e9f34dae1f2560a5a5e8e77dfd;p=friendica.git

XMPP authentification for multi domain systems
---

diff --git a/include/auth_ejabberd.php b/include/auth_ejabberd.php
index 9a9d9accad..0be5db7760 100755
--- a/include/auth_ejabberd.php
+++ b/include/auth_ejabberd.php
@@ -75,7 +75,7 @@ class exAuth
 
 	public function __construct($sLogFile, $bDebug)
 	{
-		global $db;
+		global $a, $db;
 
 		// setter
 		$this->sLogFile 	= $sLogFile;
@@ -135,36 +135,30 @@ class exAuth
 							} else {
 								// ovdje provjeri prijavu
 								$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]);
-								$this->writeDebugLog("[debug] doing auth for ". $sUser);
-								//$sQuery = "SELECT `uid`, `password` FROM `user` WHERE `password`='".hash('whirlpool',$aCommand[3])."' AND `nickname`='". $db->escape($sUser) ."'";
-								$sQuery = "SELECT `uid`, `password` FROM `user` WHERE `nickname`='". $db->escape($sUser) ."'";
-								$this->writeDebugLog("[debug] using query ". $sQuery);
-								if ($oResult = q($sQuery)){
-									$uid = $oResult[0]["uid"];
-									$Error = ($oResult[0]["password"] != hash('whirlpool',$aCommand[3]));
-/*
-									if ($oResult[0]["password"] == hash('whirlpool',$aCommand[3])) {
-										// korisnik OK
-										$this->writeLog("[exAuth] authentificated user ". $sUser ."@". $aCommand[2]);
-										fwrite(STDOUT, pack("nn", 2, 1));
+								$this->writeDebugLog("[debug] doing auth for ".$sUser."@".$aCommand[2]);
+
+								// If the hostnames doesn't match, we try to authenticate remotely
+								if ($a->get_hostname() != $aCommand[2])
+									$Error = !$this->check_credentials($aCommand[2], $aCommand[1], $aCommand[3], true);
+								else {
+
+									//$sQuery = "SELECT `uid`, `password` FROM `user` WHERE `password`='".hash('whirlpool',$aCommand[3])."' AND `nickname`='". $db->escape($sUser) ."'";
+									$sQuery = "SELECT `uid`, `password` FROM `user` WHERE `nickname`='". $db->escape($sUser) ."'";
+									$this->writeDebugLog("[debug] using query ". $sQuery);
+									if ($oResult = q($sQuery)){
+										$uid = $oResult[0]["uid"];
+										$Error = ($oResult[0]["password"] != hash('whirlpool',$aCommand[3]));
 									} else {
-										// korisnik nije OK
-										$this->writeLog("[exAuth] authentification failed for user ". $sUser ."@". $aCommand[2]);
-										fwrite(STDOUT, pack("nn", 2, 0));
+										$this->writeLog("[MySQL] invalid query: ". $sQuery);
+										$Error = true;
+										$uid = -1;
+									}
+									if ($Error) {
+										$oConfig = q("SELECT `v` FROM `pconfig` WHERE `uid`=%d AND `cat` = 'xmpp' AND `k`='password' LIMIT 1;", intval($uid));
+										$this->writeLog("[exAuth] got password ".$oConfig[0]["v"]);
+										$Error = ($aCommand[3] != $oConfig[0]["v"]);
 									}
-									$oResult->close();
-*/
-								} else {
-									$this->writeLog("[MySQL] invalid query: ". $sQuery);
-									$Error = true;
-									$uid = -1;
-								}
-								if ($Error) {
-									$oConfig = q("SELECT `v` FROM `pconfig` WHERE `uid`=%d AND `cat` = 'xmpp' AND `k`='password' LIMIT 1;", intval($uid));
-									$this->writeLog("[exAuth] got password ".$oConfig[0]["v"]);
-									$Error = ($aCommand[3] != $oConfig[0]["v"]);
 								}
-
 								if ($Error) {
 									$this->writeLog("[exAuth] authentification failed for user ". $sUser ."@". $aCommand[2]);
 									fwrite(STDOUT, pack("nn", 2, 0));
@@ -207,6 +201,27 @@ class exAuth
 		}
 	}
 
+	private function check_credentials($host, $user, $password, $ssl) {
+
+		$url = ($ssl ? "https":"http")."://".$host."/api/account/verify_credentials.json";
+
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $url);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+		curl_setopt($ch, CURLOPT_HEADER, true);
+		curl_setopt($ch, CURLOPT_NOBODY, true);
+		curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+		curl_setopt($ch, CURLOPT_USERPWD, $user.':'.$password);
+
+		$header = curl_exec($ch);
+		$curl_info = @curl_getinfo($ch);
+		$http_code = $curl_info["http_code"];
+		curl_close($ch);
+
+		return($http_code == 200);
+	}
+
 	private function writeLog($sMessage)
 	{
 		if (is_resource($this->rLogFile)) {