bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Logging for ejabberd authentication is now done via syslog

Browse source
This commit is contained in:
Michael 2017-11-04 08:36:42 +00:00
parent 6b9cb9c755
commit d2dc61c246
2 changed files with 41 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/htconfig.md
View file

@ -19,7 +19,6 @@ Example: To set the directory value please add this line to your .htconfig.php:
## jabber ## ## jabber ##
* **debug** (Boolean) - Enable debug level for the jabber account synchronisation. * **debug** (Boolean) - Enable debug level for the jabber account synchronisation.
* **logfile** - Logfile for the jabber account synchronisation.
## system ## ## system ##

102
include/auth_ejabberd.php
View file

@ -33,6 +33,7 @@
*/ */
use Friendica\App; use Friendica\App;
use Friendica\Core\Config;
if (sizeof($_SERVER["argv"]) == 0) if (sizeof($_SERVER["argv"]) == 0)
die(); die();
@ -58,42 +59,30 @@ require_once("include/dba.php");
dba::connect($db_host, $db_user, $db_pass, $db_data); dba::connect($db_host, $db_user, $db_pass, $db_data);
unset($db_host, $db_user, $db_pass, $db_data); unset($db_host, $db_user, $db_pass, $db_data);
// the logfile to which to write, should be writeable by the user which is running the server $oAuth = new exAuth();
$sLogFile = get_config('jabber','logfile');
// set true to debug if needed
$bDebug = get_config('jabber','debug');
$oAuth = new exAuth($sLogFile, $bDebug);
class exAuth { class exAuth {
private $sLogFile;
private $bDebug; private $bDebug;
private $rLogFile;
/** /**
* @brief Create the class and do the authentification studd * @brief Create the class and do the authentification studd
* *
* @param string $sLogFile The logfile name
* @param boolean $bDebug Debug mode * @param boolean $bDebug Debug mode
*/ */
public function __construct($sLogFile, $bDebug) { public function __construct() {
// setter // setter
$this->sLogFile = $sLogFile; $this->bDebug = (int)Config::get('jabber', 'debug');
$this->bDebug = $bDebug;
// Open the logfile if the logfile name is defined
if ($this->sLogFile != '')
$this->rLogFile = fopen($this->sLogFile, "a") || die("Error opening log file: ". $this->sLogFile);
$this->writeLog("[exAuth] start"); openlog('auth_ejabberd', LOG_PID, LOG_USER);
// We are connected to the SQL server and are having a log file. $this->writeLog(LOG_NOTICE, "start");
// We are connected to the SQL server.
do { do {
// Quit if the database connection went down // Quit if the database connection went down
if (!dba::connected()) { if (!dba::connected()) {
$this->writeDebugLog("[debug] the database connection went down"); $this->writeLog(LOG_ERR, "the database connection went down");
return; return;
} }
@ -103,13 +92,13 @@ class exAuth {
// No data? Then quit // No data? Then quit
if ($iLength == 0) { if ($iLength == 0) {
$this->writeDebugLog("[debug] we got no data"); $this->writeLog(LOG_ERR, "we got no data, quitting");
return; return;
} }
// Fetching the data // Fetching the data
$sData = fgets(STDIN, $iLength + 1); $sData = fgets(STDIN, $iLength + 1);
$this->writeDebugLog("[debug] received data: ". $sData); $this->writeLog(LOG_DEBUG, "received data: ". $sData);
$aCommand = explode(":", $sData); $aCommand = explode(":", $sData);
if (is_array($aCommand)) { if (is_array($aCommand)) {
switch ($aCommand[0]) { switch ($aCommand[0]) {
@ -123,17 +112,17 @@ class exAuth {
break; break;
case "setpass": case "setpass":
// We don't accept the setting of passwords here // We don't accept the setting of passwords here
$this->writeLog("[exAuth] setpass command disabled"); $this->writeLog(LOG_NOTICE, "setpass command disabled");
fwrite(STDOUT, pack("nn", 2, 0)); fwrite(STDOUT, pack("nn", 2, 0));
break; break;
default: default:
// We don't know the given command // We don't know the given command
$this->writeLog("[exAuth] unknown command ". $aCommand[0]); $this->writeLog(LOG_NOTICE, "unknown command ". $aCommand[0]);
fwrite(STDOUT, pack("nn", 2, 0)); fwrite(STDOUT, pack("nn", 2, 0));
break; break;
} }
} else { } else {
$this->writeDebugLog("[debug] invalid command string"); $this->writeLog(LOG_NOTICE, "invalid command string ".$sData);
fwrite(STDOUT, pack("nn", 2, 0)); fwrite(STDOUT, pack("nn", 2, 0));
} }
} while (true); } while (true);
@ -149,19 +138,19 @@ class exAuth {
// Check if there is a username // Check if there is a username
if (!isset($aCommand[1])) { if (!isset($aCommand[1])) {
$this->writeLog("[exAuth] invalid isuser command, no username given"); $this->writeLog(LOG_NOTICE, "invalid isuser command, no username given");
fwrite(STDOUT, pack("nn", 2, 0)); fwrite(STDOUT, pack("nn", 2, 0));
return; return;
} }
// Now we check if the given user is valid // Now we check if the given user is valid
$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]); $sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]);
$this->writeDebugLog("[debug] checking isuser for ". $sUser."@".$aCommand[2]);
// Does the hostname match? So we try directly // Does the hostname match? So we try directly
if ($a->get_hostname() == $aCommand[2]) { if ($a->get_hostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, "internal user check for ". $sUser."@".$aCommand[2]);
$sQuery = "SELECT `uid` FROM `user` WHERE `nickname`='".dbesc($sUser)."'"; $sQuery = "SELECT `uid` FROM `user` WHERE `nickname`='".dbesc($sUser)."'";
$this->writeDebugLog("[debug] using query ". $sQuery); $this->writeLog(LOG_DEBUG, "using query ". $sQuery);
$r = q($sQuery); $r = q($sQuery);
$found = dbm::is_result($r); $found = dbm::is_result($r);
} else { } else {
@ -175,11 +164,11 @@ class exAuth {
if ($found) { if ($found) {
// The user is okay // The user is okay
$this->writeLog("[exAuth] valid user: ". $sUser); $this->writeLog(LOG_NOTICE, "valid user: ". $sUser);
fwrite(STDOUT, pack("nn", 2, 1)); fwrite(STDOUT, pack("nn", 2, 1));
} else { } else {
// The user isn't okay // The user isn't okay
$this->writeLog("[exAuth] invalid user: ". $sUser); $this->writeLog(LOG_WARNING, "invalid user: ". $sUser);
fwrite(STDOUT, pack("nn", 2, 0)); fwrite(STDOUT, pack("nn", 2, 0));
} }
} }
@ -195,6 +184,8 @@ class exAuth {
*/ */
private function check_user($host, $user, $ssl) { private function check_user($host, $user, $ssl) {
$this->writeLog(LOG_INFO, "external user check for ".$user."@".$host);
$url = ($ssl ? "https":"http")."://".$host."/noscrape/".$user; $url = ($ssl ? "https":"http")."://".$host."/noscrape/".$user;
$data = z_fetch_url($url); $data = z_fetch_url($url);
@ -222,30 +213,31 @@ class exAuth {
// check user authentication // check user authentication
if (sizeof($aCommand) != 4) { if (sizeof($aCommand) != 4) {
$this->writeLog("[exAuth] invalid auth command, data missing"); $this->writeLog(LOG_NOTICE, "invalid auth command, data missing");
fwrite(STDOUT, pack("nn", 2, 0)); fwrite(STDOUT, pack("nn", 2, 0));
return; return;
} }
// We now check if the password match // We now check if the password match
$sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]); $sUser = str_replace(array("%20", "(a)"), array(" ", "@"), $aCommand[1]);
$this->writeDebugLog("[debug] doing auth for ".$sUser."@".$aCommand[2]);
// Does the hostname match? So we try directly // Does the hostname match? So we try directly
if ($a->get_hostname() == $aCommand[2]) { if ($a->get_hostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, "internal auth for ".$sUser."@".$aCommand[2]);
$sQuery = "SELECT `uid`, `password` FROM `user` WHERE `nickname`='".dbesc($sUser)."'"; $sQuery = "SELECT `uid`, `password` FROM `user` WHERE `nickname`='".dbesc($sUser)."'";
$this->writeDebugLog("[debug] using query ". $sQuery); $this->writeLog(LOG_DEBUG, "using query ". $sQuery);
if ($oResult = q($sQuery)) { if ($oResult = q($sQuery)) {
$uid = $oResult[0]["uid"]; $uid = $oResult[0]["uid"];
$Error = ($oResult[0]["password"] != hash('whirlpool',$aCommand[3])); $Error = ($oResult[0]["password"] != hash('whirlpool',$aCommand[3]));
} else { } else {
$this->writeLog("[MySQL] invalid query: ". $sQuery); $this->writeLog(LOG_WARNING, "invalid query: ". $sQuery);
$Error = true; $Error = true;
$uid = -1; $uid = -1;
} }
if ($Error) { if ($Error) {
$oConfig = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = 'xmpp' AND `k`='password' LIMIT 1;", intval($uid)); $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"]); $this->writeLog(LOG_INFO, "check against alternate password for ".$sUser."@".$aCommand[2]);
$Error = ($aCommand[3] != $oConfig[0]["v"]); $Error = ($aCommand[3] != $oConfig[0]["v"]);
} }
} else { } else {
@ -258,10 +250,10 @@ class exAuth {
} }
if ($Error) { if ($Error) {
$this->writeLog("[exAuth] authentification failed for user ".$sUser."@". $aCommand[2]); $this->writeLog(LOG_WARNING, "authentification failed for user ".$sUser."@". $aCommand[2]);
fwrite(STDOUT, pack("nn", 2, 0)); fwrite(STDOUT, pack("nn", 2, 0));
} else { } else {
$this->writeLog("[exAuth] authentificated user ".$sUser."@".$aCommand[2]); $this->writeLog(LOG_NOTICE, "authentificated user ".$sUser."@".$aCommand[2]);
fwrite(STDOUT, pack("nn", 2, 1)); fwrite(STDOUT, pack("nn", 2, 1));
} }
} }
@ -277,8 +269,6 @@ class exAuth {
* @return boolean Are the credentials okay? * @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";
$ch = curl_init(); $ch = curl_init();
@ -295,39 +285,29 @@ class exAuth {
$http_code = $curl_info["http_code"]; $http_code = $curl_info["http_code"];
curl_close($ch); curl_close($ch);
$this->writeDebugLog("[debug] got HTTP code ".$http_code); $this->writeLog(LOG_INFO, "external auth for ".$user."@".$host." returned ".$http_code);
return ($http_code == 200); return ($http_code == 200);
} }
/** /**
* @brief write data to the logfile * @brief write data to the syslog
* *
* @param string $sMessage The logfile message * @param integer $loglevel The syslog loglevel
* @param string $sMessage The syslog message
*/ */
private function writeLog($sMessage) { private function writeLog($loglevel, $sMessage) {
if (is_resource($this->rLogFile)) if (!$this->bDebug && ($loglevel >= LOG_DEBUG)) {
fwrite($this->rLogFile, date("r")." ".getmypid()." ".$sMessage."\n"); return;
}
syslog($loglevel, $sMessage);
} }
/** /**
* @brief write debug data to the logfile * @brief destroy the class, close the syslog connection.
*
* @param string $sMessage The logfile message
*/
private function writeDebugLog($sMessage) {
if ($this->bDebug)
$this->writeLog($sMessage);
}
/**
* @brief destroy the class
*/ */
public function __destruct() { public function __destruct() {
// close the log file $this->writeLog(LOG_NOTICE, "stop");
$this->writeLog("[exAuth] stop"); closelog();
if (is_resource($this->rLogFile))
fclose($this->rLogFile);
} }
} }