* Installation:
*
* - Change it's owner to whichever user is running the server, ie. ejabberd
- * $ chown ejabberd:ejabberd /path/to/friendica/scripts/auth_ejabberd.php
+ * $ chown ejabberd:ejabberd /path/to/friendica/bin/auth_ejabberd.php
*
* - Change the access mode so it is readable only to the user ejabberd and has exec
- * $ chmod 700 /path/to/friendica/scripts/auth_ejabberd.php
+ * $ chmod 700 /path/to/friendica/bin/auth_ejabberd.php
*
* - Edit your ejabberd.cfg file, comment out your auth_method and add:
* {auth_method, external}.
- * {extauth_program, "/path/to/friendica/script/auth_ejabberd.php"}.
+ * {extauth_program, "/path/to/friendica/bin/auth_ejabberd.php"}.
*
* - Restart your ejabberd service, you should be able to login with your friendica auth info
*
use Friendica\Core\PConfig;
use Friendica\Database\DBM;
use Friendica\Model\User;
+use Friendica\Util\Network;
use dba;
require_once 'include/dba.php';
{
private $bDebug;
private $host;
- private $pidfile;
/**
* @brief Create the class
$this->setHost($aCommand[2]);
// Now we check if the given user is valid
- $sUser = str_replace(array('%20', '(a)'), array(' ', '@'), $aCommand[1]);
+ $sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
// Does the hostname match? So we try directly
if ($a->get_hostname() == $aCommand[2]) {
$url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
- $data = z_fetch_url($url);
+ $data = Network::curl($url);
if (!is_array($data)) {
return false;
$this->setHost($aCommand[2]);
// We now check if the password match
- $sUser = str_replace(array('%20', '(a)'), array(' ', '@'), $aCommand[1]);
+ $sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
// Does the hostname match? So we try directly
if ($a->get_hostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
- $aUser = dba::select('user', ['uid', 'password'], ['nickname' => $sUser], ['limit' => 1]);
+ $aUser = dba::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
if (DBM::is_result($aUser)) {
- $uid = User::authenticate($aUser, $aCommand[3]);
- $Error = $uid === false;
+ $uid = $aUser['uid'];
+ $success = User::authenticate($aUser, $aCommand[3]);
+ $Error = $success === false;
} else {
$this->writeLog(LOG_WARNING, 'user not found: ' . $sUser);
$Error = true;
*/
private function checkCredentials($host, $user, $password, $ssl)
{
- $url = ($ssl ? 'https' : 'http') . '://' . $host . '/api/account/verify_credentials.json';
+ $this->writeLog(LOG_INFO, 'external credential check for ' . $user . '@' . $host);
+
+ $url = ($ssl ? 'https' : 'http') . '://' . $host . '/api/account/verify_credentials.json?skip_status=true';
$ch = curl_init();
curl_setopt($ch, CURLOPT_URL, $url);
$lockpath = Config::get('jabber', 'lockpath');
if (is_null($lockpath)) {
+ $this->writeLog(LOG_INFO, 'No lockpath defined.');
return;
}
- $this->pidfile = new Pidfile($lockpath, $host);
- if ($this->pidfile->isRunning()) {
- $oldpid = $this->pidfile->pid();
- $this->writeLog(LOG_INFO, 'Process ' . $oldpid . ' was running for ' . $this->pidfile->runningTime() . ' seconds and will now be killed');
- $this->pidfile->kill();
-
- // Wait until the other process is hopefully killed
- sleep(2);
-
- $this->pidfile = new Pidfile($lockpath, $host);
- if ($oldpid == $this->pidfile->pid()) {
- $this->writeLog(LOG_ERR, 'Process ' . $oldpid . "wasn't killed in time. We now quit our process.");
+ $file = $lockpath . DIRECTORY_SEPARATOR . $host;
+ if (PidFile::isRunningProcess($file)) {
+ if (PidFile::killProcess($file)) {
+ $this->writeLog(LOG_INFO, 'Old process was successfully killed');
+ } else {
+ $this->writeLog(LOG_ERR, "The old Process wasn't killed in time. We now quit our process.");
die();
}
}
+
+ // Now it is safe to create the pid file
+ PidFile::create($file);
+ if (!file_exists($file)) {
+ $this->writeLog(LOG_WARNING, 'Logfile ' . $file . " couldn't be created.");
+ }
}
/**