namespace Friendica\Util;
-use Friendica\Core\Config;
-use Friendica\Core\PConfig;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\User;
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()
{
}
/**
- * @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');
$sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
// Does the hostname match? So we try directly
- if ($a->getHostName() == $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]);
} else {
}
/**
- * @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)
{
}
/**
- * @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');
$sUser = str_replace(['%20', '(a)'], [' ', '@'], $aCommand[1]);
// Does the hostname match? So we try directly
- if ($a->getHostName() == $aCommand[2]) {
+ if (DI::baseUrl()->getHostname() == $aCommand[2]) {
$this->writeLog(LOG_INFO, 'internal auth for ' . $sUser . '@' . $aCommand[2]);
$aUser = DBA::selectFirst('user', ['uid', 'password', 'legacy_password'], ['nickname' => $sUser]);
if (DBA::isResult($aUser)) {
$uid = $aUser['uid'];
- $success = User::authenticate($aUser, $aCommand[3]);
+ $success = User::authenticate($aUser, $aCommand[3], true);
$Error = $success === false;
} else {
$this->writeLog(LOG_WARNING, 'user not found: ' . $sUser);
}
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()
{