X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FUtil%2FExAuth.php;h=25eb3cc62e41ca449dde8f222d73ce7dfab89145;hb=f4e1acedfcd86c81403c14747ecfd3b11583506e;hp=847059d6d7e9c2882ab8b3381025d76f502323bc;hpb=e36f2bb1fb3439e9993c7568e57140c4f954b772;p=friendica.git diff --git a/src/Util/ExAuth.php b/src/Util/ExAuth.php index 847059d6d7..25eb3cc62e 100644 --- a/src/Util/ExAuth.php +++ b/src/Util/ExAuth.php @@ -1,6 +1,6 @@ @@ -13,14 +13,14 @@ * 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 * @@ -34,14 +34,9 @@ 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 { @@ -49,13 +44,12 @@ 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); @@ -63,21 +57,27 @@ class ExAuth } /** - * @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; } $iHeader = fgets(STDIN, 3); + if (empty($iHeader)) { + $this->writeLog(LOG_ERR, 'empty stdin'); + return; + } + $aLength = unpack('n', $iHeader); $iLength = $aLength['1']; @@ -120,14 +120,13 @@ class ExAuth } /** - * @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'); @@ -143,9 +142,9 @@ class ExAuth $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; } @@ -167,13 +166,14 @@ class ExAuth } /** - * @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) { @@ -181,17 +181,17 @@ class ExAuth $url = ($ssl ? 'https' : 'http') . '://' . $host . '/noscrape/' . $user; - $data = z_fetch_url($url); + $curlResult = DI::httpRequest()->get($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; } @@ -200,14 +200,13 @@ class ExAuth } /** - * @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'); @@ -223,13 +222,13 @@ class ExAuth $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::selectFirst('user', ['uid', 'password'], ['nickname' => $sUser]); - if (DBM::is_result($aUser)) { + $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); @@ -238,7 +237,7 @@ class ExAuth } 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 { @@ -260,7 +259,7 @@ class ExAuth } /** - * @brief Check remote credentials via HTTP(S) + * Check remote credentials via HTTP(S) * * @param string $host The hostname * @param string $user Username @@ -295,9 +294,10 @@ class ExAuth } /** - * @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) { @@ -309,7 +309,7 @@ class ExAuth $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; @@ -333,7 +333,7 @@ class ExAuth } /** - * @brief write data to the syslog + * write data to the syslog * * @param integer $loglevel The syslog loglevel * @param string $sMessage The syslog message @@ -347,7 +347,7 @@ class ExAuth } /** - * @brief destroy the class, close the syslog connection. + * destroy the class, close the syslog connection. */ public function __destruct() {