Merge pull request #2787 from annando/1609-xmpp-auth

Reworked ejabberd authentification
This commit is contained in:
Tobias Diekershoff 2016-09-22 23:28:46 +02:00 committed by GitHub
commit 4948460232
2 changed files with 218 additions and 126 deletions

View file

@ -47,11 +47,10 @@ require_once("boot.php");
global $a, $db; global $a, $db;
if(is_null($a)) { if (is_null($a))
$a = new App; $a = new App;
}
if(is_null($db)) { if (is_null($db)) {
@include(".htconfig.php"); @include(".htconfig.php");
require_once("include/dba.php"); require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data); $db = new dba($db_host, $db_user, $db_pass, $db_data);
@ -66,142 +65,210 @@ $bDebug = get_config('jabber','debug');
$oAuth = new exAuth($sLogFile, $bDebug); $oAuth = new exAuth($sLogFile, $bDebug);
class exAuth class exAuth {
{
private $sLogFile; private $sLogFile;
private $bDebug; private $bDebug;
private $rLogFile; private $rLogFile;
public function __construct($sLogFile, $bDebug) /**
{ * @brief Create the class and do the authentification studd
global $a, $db; *
* @param string $sLogFile The logfile name
* @param boolean $bDebug Debug mode
*/
public function __construct($sLogFile, $bDebug) {
global $db;
// setter // setter
$this->sLogFile = $sLogFile; $this->sLogFile = $sLogFile;
$this->bDebug = $bDebug; $this->bDebug = $bDebug;
// ovo ne provjeravamo jer ako ne mozes kreirati log file, onda si u kvascu :) // Open the logfile if the logfile name is defined
if ($this->sLogFile != '') if ($this->sLogFile != '')
$this->rLogFile = fopen($this->sLogFile, "a") or die("Error opening log file: ". $this->sLogFile); $this->rLogFile = fopen($this->sLogFile, "a") or die("Error opening log file: ". $this->sLogFile);
$this->writeLog("[exAuth] start"); $this->writeLog("[exAuth] start");
// ovdje bi trebali biti spojeni na MySQL, imati otvoren log i zavrtit cekalicu // We are connected to the SQL server and are having a log file.
do { do {
$iHeader = fgets(STDIN, 3); // Quit if the database connection went down
$aLength = unpack("n", $iHeader); if (!$db->connected()) {
$iLength = $aLength["1"]; $this->writeDebugLog("[debug] the database connection went down");
if($iLength > 0) { return;
// ovo znaci da smo nesto dobili }
$sData = fgets(STDIN, $iLength + 1);
$this->writeDebugLog("[debug] received data: ". $sData); $iHeader = fgets(STDIN, 3);
$aCommand = explode(":", $sData); $aLength = unpack("n", $iHeader);
if (is_array($aCommand)){ $iLength = $aLength["1"];
switch ($aCommand[0]){
case "isuser": // No data? Then quit
// provjeravamo je li korisnik dobar if ($iLength == 0) {
if (!isset($aCommand[1])){ $this->writeDebugLog("[debug] we got no data");
$this->writeLog("[exAuth] invalid isuser command, no username given"); return;
fwrite(STDOUT, pack("nn", 2, 0)); }
} else {
// ovdje provjeri je li korisnik OK // Fetching the data
$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]); $sData = fgets(STDIN, $iLength + 1);
$this->writeDebugLog("[debug] checking isuser for ". $sUser); $this->writeDebugLog("[debug] received data: ". $sData);
$sQuery = "SELECT `uid` FROM `user` WHERE `nickname`='". $db->escape($sUser) ."'"; $aCommand = explode(":", $sData);
$this->writeDebugLog("[debug] using query ". $sQuery); if (is_array($aCommand)) {
if ($oResult = q($sQuery)){ switch ($aCommand[0]) {
if ($oResult) { case "isuser":
// korisnik OK // Check the existance of a given username
$this->writeLog("[exAuth] valid user: ". $sUser); $this->isuser($aCommand);
fwrite(STDOUT, pack("nn", 2, 1)); break;
} else { case "auth":
// korisnik nije OK // Check if the givven password is correct
$this->writeLog("[exAuth] invalid user: ". $sUser); $this->auth($aCommand);
fwrite(STDOUT, pack("nn", 2, 0)); break;
} case "setpass":
//$oResult->close(); // We don't accept the setting of passwords here
} else { $this->writeLog("[exAuth] setpass command disabled");
$this->writeLog("[MySQL] invalid query: ". $sQuery); fwrite(STDOUT, pack("nn", 2, 0));
fwrite(STDOUT, pack("nn", 2, 0)); break;
} default:
} // We don't know the given command
break; $this->writeLog("[exAuth] unknown command ". $aCommand[0]);
case "auth": fwrite(STDOUT, pack("nn", 2, 0));
// provjeravamo autentifikaciju korisnika break;
if (sizeof($aCommand) != 4){ }
$this->writeLog("[exAuth] invalid auth command, data missing"); } else {
fwrite(STDOUT, pack("nn", 2, 0)); $this->writeDebugLog("[debug] invalid command string");
} else { fwrite(STDOUT, pack("nn", 2, 0));
// ovdje provjeri prijavu
$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[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 {
$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));
} else {
$this->writeLog("[exAuth] authentificated user ". $sUser ."@". $aCommand[2]);
fwrite(STDOUT, pack("nn", 2, 1));
}
}
break;
case "setpass":
// postavljanje zaporke, onemoguceno
$this->writeLog("[exAuth] setpass command disabled");
fwrite(STDOUT, pack("nn", 2, 0));
break;
default:
// ako je uhvaceno ista drugo
$this->writeLog("[exAuth] unknown command ". $aCommand[0]);
fwrite(STDOUT, pack("nn", 2, 0));
break;
}
} else {
$this->writeDebugLog("[debug] invalid command string");
fwrite(STDOUT, pack("nn", 2, 0));
}
} }
unset ($iHeader);
unset ($aLength);
unset ($iLength);
unset($aCommand);
} while (true); } while (true);
} }
public function __destruct() /**
{ * @brief Check if the given username exists
// zatvori log file *
$this->writeLog("[exAuth] stop"); * @param array $aCommand The command array
*/
private function isuser($aCommand) {
global $a;
if (is_resource($this->rLogFile)){ // Check if there is a username
fclose($this->rLogFile); if (!isset($aCommand[1])) {
$this->writeLog("[exAuth] invalid isuser command, no username given");
fwrite(STDOUT, pack("nn", 2, 0));
return;
}
// Now we check if the given user is valid
$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]);
$this->writeDebugLog("[debug] checking isuser for ". $sUser."@".$aCommand[2]);
// If the hostnames doesn't match, we try to check remotely
if ($a->get_hostname() != $aCommand[2])
$found = $this->check_user($aCommand[2], $aCommand[1], true);
else {
$sQuery = "SELECT `uid` FROM `user` WHERE `nickname`='".dbesc($sUser)."'";
$this->writeDebugLog("[debug] using query ". $sQuery);
$r = q($sQuery);
$found = dbm::is_result($r);
}
if ($found) {
// The user is okay
$this->writeLog("[exAuth] valid user: ". $sUser);
fwrite(STDOUT, pack("nn", 2, 1));
} else {
// The user isn't okay
$this->writeLog("[exAuth] invalid user: ". $sUser);
fwrite(STDOUT, pack("nn", 2, 0));
} }
} }
/**
* @brief 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?
*
* @return boolean Was the user found?
*/
private function check_user($host, $user, $ssl) {
$url = ($ssl ? "https":"http")."://".$host."/noscrape/".$user;
$data = z_fetch_url($url);
if (!is_array($data))
return(false);
if ($data["return_code"] != "200")
return(false);
$json = @json_decode($data["body"]);
if (!is_object($json))
return(false);
return($json->nick == $user);
}
/**
* @brief Authenticate the givven user and password
*
* @param array $aCommand The command array
*/
private function auth($aCommand) {
global $a;
// check user authentication
if (sizeof($aCommand) != 4) {
$this->writeLog("[exAuth] invalid auth command, data missing");
fwrite(STDOUT, pack("nn", 2, 0));
return;
}
// We now check if the password match
$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[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 `nickname`='".dbesc($sUser)."'";
$this->writeDebugLog("[debug] using query ". $sQuery);
if ($oResult = q($sQuery)) {
$uid = $oResult[0]["uid"];
$Error = ($oResult[0]["password"] != hash('whirlpool',$aCommand[3]));
} 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));
} else {
$this->writeLog("[exAuth] authentificated user ".$sUser."@".$aCommand[2]);
fwrite(STDOUT, pack("nn", 2, 1));
}
}
/**
* @brief Check remote credentials via HTTP(S)
*
* @param string $host The hostname
* @param string $user Username
* @param string $password Password
* @param boolean $ssl Should the check be done via SSL?
*
* @return boolean Are the credentials okay?
*/
private function check_credentials($host, $user, $password, $ssl) { private function check_credentials($host, $user, $password, $ssl) {
$this->writeDebugLog("[debug] check credentials for user ".$user." on ".$host);
$url = ($ssl ? "https":"http")."://".$host."/api/account/verify_credentials.json"; $url = ($ssl ? "https":"http")."://".$host."/api/account/verify_credentials.json";
@ -219,24 +286,40 @@ class exAuth
$http_code = $curl_info["http_code"]; $http_code = $curl_info["http_code"];
curl_close($ch); curl_close($ch);
return($http_code == 200); $this->writeDebugLog("[debug] got HTTP code ".$http_code);
return ($http_code == 200);
} }
private function writeLog($sMessage) /**
{ * @brief write data to the logfile
if (is_resource($this->rLogFile)) { *
fwrite($this->rLogFile, date("r") ." ". $sMessage ."\n"); * @param string $sMessage The logfile message
} */
private function writeLog($sMessage) {
if (is_resource($this->rLogFile))
fwrite($this->rLogFile, date("r")." ".$sMessage."\n");
} }
private function writeDebugLog($sMessage) /**
{ * @brief write debug data to the logfile
if ($this->bDebug){ *
* @param string $sMessage The logfile message
*/
private function writeDebugLog($sMessage) {
if ($this->bDebug)
$this->writeLog($sMessage); $this->writeLog($sMessage);
}
} }
/**
* @brief destroy the class
*/
public function __destruct() {
// close the log file
$this->writeLog("[exAuth] stop");
if (is_resource($this->rLogFile))
fclose($this->rLogFile);
}
} }
?> ?>

View file

@ -249,6 +249,15 @@ class dba {
} }
} }
function connected() {
if ($this->mysqli)
$connected = $this->db->ping();
else
$connected = mysql_ping($this->db);
return $connected;
}
function __destruct() { function __destruct() {
if ($this->db) if ($this->db)
if($this->mysqli) if($this->mysqli)