bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Use "checkAllowedScope" instead of "login"

Browse source
This commit is contained in:
Michael 2021-06-08 12:00:22 +00:00
parent 5853fe562d
commit 2a440c0bae
54 changed files with 62 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Module/Api/Friendica/Events/Index.php
View file

@ -35,7 +35,7 @@ class Index extends BaseApi
{
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
$request = self::getRequest([

2
src/Module/Api/Friendica/Profile/Show.php
View file

@ -37,7 +37,7 @@ class Show extends BaseApi
{
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
// retrieve general information about profiles for user

2
src/Module/Api/Mastodon/Accounts/Block.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Follow.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Followers.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Following.php
View file

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

2
src/Module/Api/Mastodon/Accounts/IdentityProofs.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Lists.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Mute.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Note.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Relationships.php
View file

@ -37,7 +37,7 @@ class Relationships extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
$request = self::getRequest([

2
src/Module/Api/Mastodon/Accounts/Search.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Unblock.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Unfollow.php
View file

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

2
src/Module/Api/Mastodon/Accounts/Unmute.php
View file

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

2
src/Module/Api/Mastodon/Accounts/UpdateCredentials.php
View file

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

2
src/Module/Api/Mastodon/Accounts/VerifyCredentials.php
View file

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

2
src/Module/Api/Mastodon/Announcements.php
View file

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

2
src/Module/Api/Mastodon/Apps/VerifyCredentials.php
View file

@ -32,7 +32,7 @@ class VerifyCredentials extends BaseApi
{
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$application = self::getCurrentApplication();
if (empty($application['id'])) {

2
src/Module/Api/Mastodon/Blocks.php
View file

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

2
src/Module/Api/Mastodon/Bookmarks.php
View file

@ -39,7 +39,7 @@ class Bookmarks extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
$request = self::getRequest([

4
src/Module/Api/Mastodon/Conversations.php
View file

@ -33,7 +33,7 @@ class Conversations extends BaseApi
{
public static function delete(array $parameters = [])
{
self::login(self::SCOPE_WRITE);
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
if (!empty($parameters['id'])) {
@ -52,7 +52,7 @@ class Conversations extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
$request = self::getRequest([

2
src/Module/Api/Mastodon/Conversations/Read.php
View file

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

2
src/Module/Api/Mastodon/Favourited.php
View file

@ -40,7 +40,7 @@ class Favourited extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
// @todo provide HTTP link header

4
src/Module/Api/Mastodon/Filters.php
View file

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

4
src/Module/Api/Mastodon/FollowRequests.php
View file

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

6
src/Module/Api/Mastodon/Lists.php
View file

@ -33,7 +33,7 @@ class Lists extends BaseApi
{
public static function delete(array $parameters = [])
{
self::login(self::SCOPE_WRITE);
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
if (empty($parameters['id'])) {
@ -53,7 +53,7 @@ class Lists extends BaseApi
public static function post(array $parameters = [])
{
self::login(self::SCOPE_WRITE);
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
$request = self::getRequest([
@ -94,7 +94,7 @@ class Lists extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
if (empty($parameters['id'])) {

2
src/Module/Api/Mastodon/Lists/Accounts.php
View file

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

4
src/Module/Api/Mastodon/Markers.php
View file

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

6
src/Module/Api/Mastodon/Media.php
View file

@ -34,7 +34,7 @@ class Media extends BaseApi
{
public static function post(array $parameters = [])
{
self::login(self::SCOPE_WRITE);
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
Logger::info('Photo post', ['request' => $_REQUEST, 'files' => $_FILES]);
@ -55,7 +55,7 @@ class Media extends BaseApi
public static function put(array $parameters = [])
{
self::login(self::SCOPE_WRITE);
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
$request = self::getRequest([
@ -85,7 +85,7 @@ class Media extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
if (empty($parameters['id'])) {

2
src/Module/Api/Mastodon/Mutes.php
View file

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

2
src/Module/Api/Mastodon/Notifications.php
View file

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

2
src/Module/Api/Mastodon/Notifications/Clear.php
View file

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

2
src/Module/Api/Mastodon/Notifications/Dismiss.php
View file

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

2
src/Module/Api/Mastodon/Preferences.php
View file

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

2
src/Module/Api/Mastodon/Search.php
View file

@ -43,7 +43,7 @@ class Search extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
$request = self::getRequest([

4
src/Module/Api/Mastodon/Statuses.php
View file

@ -43,7 +43,7 @@ class Statuses extends BaseApi
{
public static function post(array $parameters = [])
{
self::login(self::SCOPE_WRITE);
self::checkAllowedScope(self::SCOPE_WRITE);
$uid = self::getCurrentUserID();
$request = self::getRequest([
@ -194,7 +194,7 @@ class Statuses extends BaseApi
public static function delete(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
if (empty($parameters['id'])) {

2
src/Module/Api/Mastodon/Statuses/Bookmark.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Favourite.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Mute.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Pin.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Reblog.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Unbookmark.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Unfavourite.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Unmute.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Unpin.php
View file

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

2
src/Module/Api/Mastodon/Statuses/Unreblog.php
View file

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

2
src/Module/Api/Mastodon/Suggestions.php
View file

@ -37,7 +37,7 @@ class Suggestions extends BaseApi
*/
public static function rawContent(array $parameters = [])
{
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
$uid = self::getCurrentUserID();
$request = self::getRequest([

2
src/Module/Api/Mastodon/Timelines/Direct.php
View file

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

2
src/Module/Api/Mastodon/Timelines/Home.php
View file

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

2
src/Module/Api/Mastodon/Timelines/ListTimeline.php
View file

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

2
src/Module/Api/Mastodon/Timelines/Tag.php
View file

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

2
src/Module/Api/Twitter/ContactEndpoint.php
View file

@ -39,7 +39,7 @@ abstract class ContactEndpoint extends BaseApi
{
parent::init($parameters);
self::login(self::SCOPE_READ);
self::checkAllowedScope(self::SCOPE_READ);
}
/**

11
src/Module/BaseApi.php
View file

@ -168,17 +168,6 @@ class BaseApi extends BaseModule
return $request;
}
/**
* @deprecated Use checkAllowedScope instead
* Log in user via OAuth or Basic HTTP Auth.
*
* @param string $scope the requested scope (read, write, follow)
*/
protected static function login(string $scope)
{
self::checkAllowedScope($scope);
}
/**
* Get current application token
*