Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue #80 Fix: Tokens should not be accepted via request variables #119

Open
wants to merge 2 commits into
base: release-2.6.0
Choose a base branch
from
Open

Issue #80 Fix: Tokens should not be accepted via request variables #119

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6620597
Issue #80 Fix: Tokens should not be accepted via request variables
niteshkesarkar May 12, 2020
d0cf2e0
Scrutinizer issues fixed
niteshkesarkar May 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 38 additions & 32 deletions code/site/libraries/authentication.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,19 @@
*/

defined('_JEXEC') or die;
jimport('joomla.application.component.model');

use Joomla\CMS\Object\CMSObject;
use Joomla\CMS\Component\ComponentHelper;
use Joomla\CMS\Factory;
use Joomla\CMS\Plugin\PluginHelper;
use Joomla\CMS\Language\Text;

/**
* Class for API authetication
*
* @since 1.0
*/
abstract class ApiAuthentication extends JObject
abstract class ApiAuthentication extends CMSObject
{
protected $auth_method = null;

Expand Down Expand Up @@ -57,8 +62,8 @@ abstract public function authenticate();
*/
public static function authenticateRequest()
{
$params = JComponentHelper::getParams('com_api');
$app = JFactory::getApplication();
$params = ComponentHelper::getParams('com_api');
$app = Factory::getApplication();

$className = 'APIAuthentication' . ucwords(self::getAuthMethod());

Expand All @@ -73,24 +78,24 @@ public static function authenticateRequest()
}
else
{
$user = JFactory::getUser($user_id);
$user = Factory::getUser($user_id);

if (!$user->id)
{
self::setAuthError(JText::_("COM_API_USER_NOT_FOUND"));
self::setAuthError(Text::_("COM_API_USER_NOT_FOUND"));

return false;
}

if ($user->block == 1)
{
self::setAuthError(JText::_("COM_API_BLOCKED_USER"));
self::setAuthError(Text::_("COM_API_BLOCKED_USER"));

return false;
}

/* V1.8.1 - to set admin info headers
$log_user = JFactory::getUser(); */
$log_user = Factory::getUser(); */
$isroot = $user->authorise('core.admin');

if ($isroot)
Expand Down Expand Up @@ -145,12 +150,13 @@ public static function getAuthError()
*/
public static function getPluginsList()
{
$plugins = JPluginHelper::getPlugin('api');
$plugins = PluginHelper::getPlugin('api');
$pluginsArr = array();

foreach ($plugins as $plg)
{
$xml = JFactory::getXML(JPATH_SITE . '/plugins/api/' . $plg->name . '/' . $plg->name . '.xml');
$xml = simplexml_load_file(JPATH_SITE . '/plugins/api/' . $plg->name . '/' . $plg->name . '.xml');

$version = (string) $xml->version;
$pluginsArr[] = $plg->name . '-' . $version;
}
Expand All @@ -167,7 +173,7 @@ public static function getPluginsList()
*/
public static function getCom_apiVersion()
{
$xml = JFactory::getXML(JPATH_ADMINISTRATOR . '/components/com_api/api.xml');
$xml = simplexml_load_file(JPATH_ADMINISTRATOR . '/components/com_api/api.xml');

return $version = (string) $xml->version;
}
Expand All @@ -181,14 +187,13 @@ public static function getCom_apiVersion()
*/
private static function getAuthMethod()
{
$app = JFactory::getApplication();
$key = $app->input->get('key');
$server = Factory::getApplication()->input->server;

if (isset($_SERVER['HTTP_X_AUTH']) && $_SERVER['HTTP_X_AUTH'])
if (!empty($server->getString('HTTP_X_AUTH', '')))
{
$authMethod = $_SERVER['HTTP_X_AUTH'];
$authMethod = trim($server->getString('HTTP_X_AUTH', ''));
}
elseif ($key || self::getBearerToken())
elseif (self::getBearerToken())
{
$authMethod = 'key';
}
Expand Down Expand Up @@ -228,14 +233,15 @@ public static function getBearerToken()
private static function getAuthorizationHeader()
{
$headers = null;
$server = Factory::getApplication()->input->server;

if (isset($_SERVER['Authorization']))
if (!empty($server->getString('Authorization', '')))
{
$headers = trim($_SERVER["Authorization"]);
$headers = trim($server->getString('Authorization', ''));
}
elseif (isset($_SERVER['HTTP_AUTHORIZATION']))
elseif (!empty($server->getString('HTTP_AUTHORIZATION', '')))
{
$headers = trim($_SERVER["HTTP_AUTHORIZATION"]);
$headers = trim($server->getString('HTTP_AUTHORIZATION', ''));
}
elseif (function_exists('apache_request_headers'))
{
Expand All @@ -250,13 +256,13 @@ private static function getAuthorizationHeader()
}
}

if (isset($_SERVER['X-Authorization']))
if (!empty($server->getString('X-Authorization', '')))
{
$headers = trim($_SERVER["X-Authorization"]);
$headers = trim($server->getString('X-Authorization', ''));
}
elseif (isset($_SERVER['HTTP_X_AUTHORIZATION']))
elseif (!empty($server->getString('HTTP_X_AUTHORIZATION', '')))
{
$headers = trim($_SERVER["HTTP_X_AUTHORIZATION"]);
$headers = trim($server->getString('HTTP_X_AUTHORIZATION', ''));
}
elseif (function_exists('apache_request_headers'))
{
Expand All @@ -283,9 +289,9 @@ private static function getAuthorizationHeader()
*/
public static function getImpersonateHeader()
{
$jinput = JFactory::getApplication()->input;
$xImpersonate = $jinput->server->get('X-Impersonate', '', 'STRING');
$httpXImpersonate = $jinput->server->get('HTTP_X_IMPERSONATE', '', 'STRING');
$server = Factory::getApplication()->input->server;
$xImpersonate = $server->getString('X-Impersonate', '');
$httpXImpersonate = $server->getString('HTTP_X_IMPERSONATE', '');

if (!empty($xImpersonate))
{
Expand Down Expand Up @@ -318,7 +324,7 @@ public static function getUserIdToImpersonate($tokenUserId)
}

// Get user from tokenUserId
$user = JFactory::getUser($tokenUserId);
$user = Factory::getUser($tokenUserId);
$isSuperAdmin = $user->authorise('core.admin');

// If this user is not super admin user, return false
Expand Down Expand Up @@ -346,15 +352,15 @@ public static function getUserIdToImpersonate($tokenUserId)
}
else
{
ApiError::raiseError("400", JText::_('COM_API_INVALID_USER_TO_IMPERSONATE'), 'APIValidationException');
ApiError::raiseError("400", Text::_('COM_API_INVALID_USER_TO_IMPERSONATE'), 'APIValidationException');

return false;
}

// If username or emailid exists ?
if ($searchFor)
{
$db = JFactory::getDbo();
$db = Factory::getDbo();
$query = $db->getQuery(true)
->select($db->quoteName('id'))
->from($db->quoteName('#__users'))
Expand All @@ -367,7 +373,7 @@ public static function getUserIdToImpersonate($tokenUserId)
}
else
{
ApiError::raiseError("400", JText::_('COM_API_INVALID_USER_TO_IMPERSONATE'), 'APIValidationException');
ApiError::raiseError("400", Text::_('COM_API_INVALID_USER_TO_IMPERSONATE'), 'APIValidationException');

return false;
}
Expand All @@ -383,7 +389,7 @@ public static function getUserIdToImpersonate($tokenUserId)
}
else
{
ApiError::raiseError("400", JText::_('COM_API_INVALID_USER_TO_IMPERSONATE'), 'APIValidationException');
ApiError::raiseError("400", Text::_('COM_API_INVALID_USER_TO_IMPERSONATE'), 'APIValidationException');

return false;
}
Expand Down
22 changes: 8 additions & 14 deletions code/site/libraries/authentication/key.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
*/

defined('_JEXEC') or die;
jimport('joomla.application.component.model');

use Joomla\CMS\Language\Text;
use Joomla\CMS\Table\Table;

/**
* API resource class
Expand All @@ -29,25 +31,17 @@ class ApiAuthenticationKey extends ApiAuthentication
*/
public function authenticate()
{
$app = JFactory::getApplication();
$query_token = $app->input->get('key', '', 'STRING');
$header_token = $this->getBearerToken();
$key = $header_token ? $header_token : $query_token;
$token = $this->loadTokenByHash($key);
$token = $this->loadTokenByHash($header_token);

if (isset($token->state) && $token->state == 1)
{
$userId = parent::getUserIdToImpersonate($token->userid);

if ($userId)
{
return $userId;
}

return $token->userid;
return $userId ? $userId : $token->userid;
}

$this->setError(JText::_('COM_API_KEY_NOT_FOUND'));
$this->setError(Text::_('COM_API_KEY_NOT_FOUND'));

return false;
}
Expand All @@ -57,11 +51,11 @@ public function authenticate()
*
* @param STRING $hash The token hash
*
* @return OBJECT
* @return OBJECT|boolean
*/
public function loadTokenByHash($hash)
{
$table = JTable::getInstance('Key', 'ApiTable');
$table = Table::getInstance('Key', 'ApiTable');
$table->loadByHash($hash);

return $table;
Expand Down
Loading