Added scope check

This commit is contained in:
Michael 2021-05-16 07:37:11 +00:00
parent 33573dda34
commit 49207a8624
53 changed files with 107 additions and 62 deletions

View file

@ -1,6 +1,6 @@
-- ------------------------------------------ -- ------------------------------------------
-- Friendica 2021.06-dev (Siberian Iris) -- Friendica 2021.06-dev (Siberian Iris)
-- DB_UPDATE_VERSION 1417 -- DB_UPDATE_VERSION 1418
-- ------------------------------------------ -- ------------------------------------------
@ -378,6 +378,7 @@ CREATE TABLE IF NOT EXISTS `application` (
`read` boolean COMMENT 'Read scope', `read` boolean COMMENT 'Read scope',
`write` boolean COMMENT 'Write scope', `write` boolean COMMENT 'Write scope',
`follow` boolean COMMENT 'Follow scope', `follow` boolean COMMENT 'Follow scope',
`push` boolean COMMENT 'Push scope',
PRIMARY KEY(`id`), PRIMARY KEY(`id`),
UNIQUE INDEX `client_id` (`client_id`) UNIQUE INDEX `client_id` (`client_id`)
) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth application'; ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='OAuth application';
@ -395,6 +396,7 @@ CREATE TABLE IF NOT EXISTS `application-token` (
`read` boolean COMMENT 'Read scope', `read` boolean COMMENT 'Read scope',
`write` boolean COMMENT 'Write scope', `write` boolean COMMENT 'Write scope',
`follow` boolean COMMENT 'Follow scope', `follow` boolean COMMENT 'Follow scope',
`push` boolean COMMENT 'Push scope',
PRIMARY KEY(`application-id`,`uid`), PRIMARY KEY(`application-id`,`uid`),
INDEX `uid_id` (`uid`,`application-id`), INDEX `uid_id` (`uid`,`application-id`),
FOREIGN KEY (`application-id`) REFERENCES `application` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE, FOREIGN KEY (`application-id`) REFERENCES `application` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
@ -1525,7 +1527,8 @@ CREATE VIEW `application-view` AS SELECT
`application-token`.`scopes` AS `scopes`, `application-token`.`scopes` AS `scopes`,
`application-token`.`read` AS `read`, `application-token`.`read` AS `read`,
`application-token`.`write` AS `write`, `application-token`.`write` AS `write`,
`application-token`.`follow` AS `follow` `application-token`.`follow` AS `follow`,
`application-token`.`push` AS `push`
FROM `application-token` FROM `application-token`
INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`; INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`;

View file

@ -54,6 +54,15 @@ class Error extends BaseFactory
System::jsonError(401, $errorobj->toArray()); System::jsonError(401, $errorobj->toArray());
} }
public function Forbidden(string $error = '')
{
$error = $error ?: DI::l10n()->t('Token is not authorized with a valid user or is missing a required scope');
$error_description = '';
$errorobj = New \Friendica\Object\Api\Mastodon\Error($error, $error_description);
System::jsonError(403, $errorobj->toArray());
}
public function InternalError(string $error = '') public function InternalError(string $error = '')
{ {
$error = $error ?: DI::l10n()->t('Internal Server Error'); $error = $error ?: DI::l10n()->t('Internal Server Error');

View file

@ -35,7 +35,7 @@ class Index extends BaseApi
{ {
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
if (self::login() === false) { if (self::login(self::SCOPE_READ) === false) {
throw new HTTPException\ForbiddenException(); throw new HTTPException\ForbiddenException();
} }

View file

@ -37,7 +37,7 @@ class Show extends BaseApi
{ {
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
if (self::login() === false) { if (self::login(self::SCOPE_READ) === false) {
throw new HTTPException\ForbiddenException(); throw new HTTPException\ForbiddenException();
} }

View file

@ -33,7 +33,7 @@ class Block extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_FOLLOW);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -33,7 +33,7 @@ class Follow extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_FOLLOW);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {
@ -42,6 +42,6 @@ class Follow extends BaseApi
$cid = Contact::follow($parameters['id'], self::getCurrentUserID()); $cid = Contact::follow($parameters['id'], self::getCurrentUserID());
System::jsonExit(DI::mstdnRelationship()->createFromContactId($cid)->toArray()); System::jsonExit(DI::mstdnRelationship()->createFromContactId($cid, $uid)->toArray());
} }
} }

View file

@ -37,7 +37,7 @@ class Followers extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -37,7 +37,7 @@ class Following extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -35,7 +35,7 @@ class IdentityProofs extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
System::jsonExit([]); System::jsonExit([]);
} }

View file

@ -38,7 +38,7 @@ class Lists extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -33,7 +33,7 @@ class Mute extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_FOLLOW);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -34,7 +34,7 @@ class Note extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -37,7 +37,7 @@ class Relationships extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($_REQUEST['id']) || !is_array($_REQUEST['id'])) { if (empty($_REQUEST['id']) || !is_array($_REQUEST['id'])) {

View file

@ -40,7 +40,7 @@ class Search extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
// What to search for // What to search for

View file

@ -33,7 +33,7 @@ class Unblock extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_FOLLOW);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -33,7 +33,7 @@ class Unfollow extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_FOLLOW);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -33,7 +33,7 @@ class Unmute extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_FOLLOW);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -31,7 +31,7 @@ class UpdateCredentials extends BaseApi
{ {
public static function patch(array $parameters = []) public static function patch(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$data = Network::postdata(); $data = Network::postdata();

View file

@ -38,7 +38,7 @@ class VerifyCredentials extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$self = User::getOwnerDataById($uid); $self = User::getOwnerDataById($uid);

View file

@ -35,7 +35,7 @@ class Announcements extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
// @todo Possibly use the message from the pageheader addon for this // @todo Possibly use the message from the pageheader addon for this
System::jsonExit([]); System::jsonExit([]);

View file

@ -67,9 +67,10 @@ class Apps extends BaseApi
$fields['scopes'] = $scopes; $fields['scopes'] = $scopes;
} }
$fields['read'] = (stripos($scopes, 'read') !== false); $fields['read'] = (stripos($scopes, self::SCOPE_READ) !== false);
$fields['write'] = (stripos($scopes, 'write') !== false); $fields['write'] = (stripos($scopes, self::SCOPE_WRITE) !== false);
$fields['follow'] = (stripos($scopes, 'follow') !== false); $fields['follow'] = (stripos($scopes, self::SCOPE_FOLLOW) !== false);
$fields['push'] = (stripos($scopes, self::SCOPE_PUSH) !== false);
if (!empty($website)) { if (!empty($website)) {
$fields['website'] = $website; $fields['website'] = $website;

View file

@ -37,7 +37,7 @@ class Blocks extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -39,7 +39,7 @@ class Bookmarks extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
// Maximum number of results to return. Defaults to 20. // Maximum number of results to return. Defaults to 20.

View file

@ -40,7 +40,7 @@ class Favourited extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
// Maximum number of results to return. Defaults to 20. // Maximum number of results to return. Defaults to 20.

View file

@ -45,7 +45,7 @@ class FollowRequests extends BaseApi
*/ */
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_FOLLOW);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$introduction = DI::intro()->selectFirst(['id' => $parameters['id'], 'uid' => $uid]); $introduction = DI::intro()->selectFirst(['id' => $parameters['id'], 'uid' => $uid]);
@ -83,7 +83,7 @@ class FollowRequests extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$min_id = $_GET['min_id'] ?? null; $min_id = $_GET['min_id'] ?? null;

View file

@ -33,7 +33,7 @@ class Lists extends BaseApi
{ {
public static function delete(array $parameters = []) public static function delete(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
@ -54,7 +54,7 @@ class Lists extends BaseApi
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$title = $_REQUEST['title'] ?? ''; $title = $_REQUEST['title'] ?? '';
@ -90,7 +90,7 @@ class Lists extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -49,7 +49,7 @@ class Accounts extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -31,6 +31,8 @@ class Markers extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(self::SCOPE_WRITE);
self::unsupported('post'); self::unsupported('post');
} }
@ -40,7 +42,7 @@ class Markers extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
System::jsonExit([]); System::jsonExit([]);
} }

View file

@ -33,6 +33,9 @@ class Media extends BaseApi
{ {
public static function put(array $parameters = []) public static function put(array $parameters = [])
{ {
self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
$data = self::getPutData(); $data = self::getPutData();
self::unsupported('put'); self::unsupported('put');
} }
@ -43,7 +46,7 @@ class Media extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -37,7 +37,7 @@ class Mutes extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -39,7 +39,7 @@ class Notifications extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (!empty($parameters['id'])) { if (!empty($parameters['id'])) {

View file

@ -32,7 +32,7 @@ class Clear extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
DBA::update('notify', ['seen' => true], ['uid' => $uid]); DBA::update('notify', ['seen' => true], ['uid' => $uid]);

View file

@ -33,7 +33,7 @@ class Dismiss extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -37,7 +37,7 @@ class Preferences extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$user = User::getById($uid, ['language', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']); $user = User::getById($uid, ['language', 'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid']);

View file

@ -42,7 +42,7 @@ class Statuses extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
$data = self::getJsonPostData(); $data = self::getJsonPostData();
@ -190,7 +190,7 @@ class Statuses extends BaseApi
public static function delete(array $parameters = []) public static function delete(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -35,7 +35,7 @@ class Bookmark extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -35,7 +35,7 @@ class Favourite extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -34,7 +34,7 @@ class Mute extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -34,7 +34,7 @@ class Pin extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -37,7 +37,7 @@ class Reblog extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -35,7 +35,7 @@ class Unbookmark extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -35,7 +35,7 @@ class Unfavourite extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -34,7 +34,7 @@ class Unmute extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -34,7 +34,7 @@ class Unpin extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -37,7 +37,7 @@ class Unreblog extends BaseApi
{ {
public static function post(array $parameters = []) public static function post(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_WRITE);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -37,7 +37,7 @@ class Suggestions extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
// Maximum number of results to return. Defaults to 40. // Maximum number of results to return. Defaults to 40.

View file

@ -39,7 +39,7 @@ class Home extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
// Return results older than id // Return results older than id

View file

@ -39,7 +39,7 @@ class ListTimeline extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['id'])) { if (empty($parameters['id'])) {

View file

@ -40,7 +40,7 @@ class Tag extends BaseApi
*/ */
public static function rawContent(array $parameters = []) public static function rawContent(array $parameters = [])
{ {
self::login(); self::login(self::SCOPE_READ);
$uid = self::getCurrentUserID(); $uid = self::getCurrentUserID();
if (empty($parameters['hashtag'])) { if (empty($parameters['hashtag'])) {

View file

@ -39,7 +39,7 @@ abstract class ContactEndpoint extends BaseApi
{ {
parent::init($parameters); parent::init($parameters);
if (!self::login()) { if (!self::login(self::SCOPE_READ)) {
throw new HTTPException\UnauthorizedException(); throw new HTTPException\UnauthorizedException();
} }
} }

View file

@ -35,6 +35,11 @@ require_once __DIR__ . '/../../include/api.php';
class BaseApi extends BaseModule class BaseApi extends BaseModule
{ {
const SCOPE_READ = 'read';
const SCOPE_WRITE = 'write';
const SCOPE_FOLLOW = 'follow';
const SCOPE_PUSH = 'push';
/** /**
* @var string json|xml|rss|atom * @var string json|xml|rss|atom
*/ */
@ -175,6 +180,8 @@ class BaseApi extends BaseModule
* *
* Simple Auth allow username in form of <pre>user@server</pre>, ignoring server part * Simple Auth allow username in form of <pre>user@server</pre>, ignoring server part
* *
* @param string $scope the requested scope (read, write, follow)
*
* @return bool Was a user authenticated? * @return bool Was a user authenticated?
* @throws HTTPException\ForbiddenException * @throws HTTPException\ForbiddenException
* @throws HTTPException\UnauthorizedException * @throws HTTPException\UnauthorizedException
@ -186,7 +193,7 @@ class BaseApi extends BaseModule
* 'authenticated' => return status, * 'authenticated' => return status,
* 'user_record' => return authenticated user record * 'user_record' => return authenticated user record
*/ */
protected static function login() protected static function login(string $scope)
{ {
if (empty(self::$current_user_id)) { if (empty(self::$current_user_id)) {
self::$current_token = self::getTokenByBearer(); self::$current_token = self::getTokenByBearer();
@ -197,6 +204,13 @@ class BaseApi extends BaseModule
} }
} }
if (!empty($scope) && !empty(self::$current_token)) {
if (empty(self::$current_token[$scope])) {
Logger::warning('The requested scope is not allowed', ['scope' => $scope, 'application' => self::$current_token]);
DI::mstdnError()->Forbidden();
}
}
if (empty(self::$current_user_id)) { if (empty(self::$current_user_id)) {
// The execution stops here if no one is logged in // The execution stops here if no one is logged in
api_login(DI::app()); api_login(DI::app());
@ -259,7 +273,7 @@ class BaseApi extends BaseModule
$bearer = trim(substr($authorization, 7)); $bearer = trim(substr($authorization, 7));
$condition = ['access_token' => $bearer]; $condition = ['access_token' => $bearer];
$token = DBA::selectFirst('application-view', ['uid', 'id', 'name', 'website', 'created_at', 'read', 'write', 'follow'], $condition); $token = DBA::selectFirst('application-view', ['uid', 'id', 'name', 'website', 'created_at', 'read', 'write', 'follow', 'push'], $condition);
if (!DBA::isResult($token)) { if (!DBA::isResult($token)) {
Logger::warning('Token not found', $condition); Logger::warning('Token not found', $condition);
return []; return [];
@ -332,8 +346,18 @@ class BaseApi extends BaseModule
$access_token = bin2hex(random_bytes(32)); $access_token = bin2hex(random_bytes(32));
$fields = ['application-id' => $application['id'], 'uid' => $uid, 'code' => $code, 'access_token' => $access_token, 'scopes' => $scope, $fields = ['application-id' => $application['id'], 'uid' => $uid, 'code' => $code, 'access_token' => $access_token, 'scopes' => $scope,
'read' => (stripos($scope, 'read') !== false), 'write' => (stripos($scope, 'write') !== false), 'read' => (stripos($scope, self::SCOPE_READ) !== false),
'follow' => (stripos($scope, 'follow') !== false), 'created_at' => DateTimeFormat::utcNow(DateTimeFormat::MYSQL)]; 'write' => (stripos($scope, self::SCOPE_WRITE) !== false),
'follow' => (stripos($scope, self::SCOPE_FOLLOW) !== false),
'push' => (stripos($scope, self::SCOPE_PUSH) !== false),
'created_at' => DateTimeFormat::utcNow(DateTimeFormat::MYSQL)];
foreach ([self::SCOPE_READ, self::SCOPE_WRITE, self::SCOPE_WRITE, self::SCOPE_PUSH] as $scope) {
if ($fields[$scope] && !$application[$scope]) {
Logger::warning('Requested token scope is not allowed for the application', ['token' => $fields, 'application' => $application]);
}
}
if (!DBA::insert('application-token', $fields, Database::INSERT_UPDATE)) { if (!DBA::insert('application-token', $fields, Database::INSERT_UPDATE)) {
return []; return [];
} }

View file

@ -55,7 +55,7 @@
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) { if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1417); define('DB_UPDATE_VERSION', 1418);
} }
return [ return [
@ -439,6 +439,7 @@ return [
"read" => ["type" => "boolean", "comment" => "Read scope"], "read" => ["type" => "boolean", "comment" => "Read scope"],
"write" => ["type" => "boolean", "comment" => "Write scope"], "write" => ["type" => "boolean", "comment" => "Write scope"],
"follow" => ["type" => "boolean", "comment" => "Follow scope"], "follow" => ["type" => "boolean", "comment" => "Follow scope"],
"push" => ["type" => "boolean", "comment" => "Push scope"],
], ],
"indexes" => [ "indexes" => [
"PRIMARY" => ["id"], "PRIMARY" => ["id"],
@ -457,6 +458,7 @@ return [
"read" => ["type" => "boolean", "comment" => "Read scope"], "read" => ["type" => "boolean", "comment" => "Read scope"],
"write" => ["type" => "boolean", "comment" => "Write scope"], "write" => ["type" => "boolean", "comment" => "Write scope"],
"follow" => ["type" => "boolean", "comment" => "Follow scope"], "follow" => ["type" => "boolean", "comment" => "Follow scope"],
"push" => ["type" => "boolean", "comment" => "Push scope"],
], ],
"indexes" => [ "indexes" => [
"PRIMARY" => ["application-id", "uid"], "PRIMARY" => ["application-id", "uid"],

View file

@ -53,6 +53,7 @@
"read" => ["application-token", "read"], "read" => ["application-token", "read"],
"write" => ["application-token", "write"], "write" => ["application-token", "write"],
"follow" => ["application-token", "follow"], "follow" => ["application-token", "follow"],
"push" => ["application-token", "push"],
], ],
"query" => "FROM `application-token` "query" => "FROM `application-token`
INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`" INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`"