* 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
*
namespace Friendica\Util;
use Friendica\Core\Config;
-use Friendica\Core\PConfig;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\User;
-use dba;
-
-require_once 'include/dba.php';
-require_once 'include/dba.php';
class ExAuth
{
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);
}
/**
- * @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()
{
while (!feof(STDIN)) {
// Quit if the database connection went down
- if (!dba::connected()) {
+ if (!DBA::connected()) {
$this->writeLog(LOG_ERR, 'the database connection went down');
return;
}
}
/**
- * @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');
$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]) {
+ if (DI::baseUrl()->getHostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, 'internal user check for ' . $sUser . '@' . $aCommand[2]);
- $found = dba::exists('user', ['nickname' => $sUser]);
+ $found = DBA::exists('user', ['nickname' => $sUser]);
} else {
$found = false;
}
}
/**
- * @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)
{
$url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user;
- $data = z_fetch_url($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;
}
}
/**
- * @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');
$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]) {
+ if (DI::baseUrl()->getHostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
- $aUser = dba::select('user', ['uid', 'password'], ['nickname' => $sUser], ['limit' => 1]);
- if (DBM::is_result($aUser)) {
- $uid = User::authenticate($aUser, $aCommand[3]);
- $Error = $uid === false;
+ $aUser = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
+ if (DBA::isResult($aUser)) {
+ $uid = $aUser['uid'];
+ $success = User::authenticate($aUser, $aCommand[3], true);
+ $Error = $success === false;
} else {
$this->writeLog(LOG_WARNING, 'user not found: ' . $sUser);
$Error = true;
}
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 {
}
/**
- * @brief Check remote credentials via HTTP(S)
+ * Check remote credentials via HTTP(S)
*
* @param string $host The hostname
* @param string $user Username
}
/**
- * @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)
{
$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;
}
/**
- * @brief write data to the syslog
+ * write data to the syslog
*
* @param integer $loglevel The syslog loglevel
* @param string $sMessage The syslog message
}
/**
- * @brief destroy the class, close the syslog connection.
+ * destroy the class, close the syslog connection.
*/
public function __destruct()
{
projects / friendica.git / blobdiff