ulysia/szurubooru
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Moved security disabling from Api to Access

Browse source
This commit is contained in:
Marcin Kurczewski 2014-05-05 11:05:57 +02:00
parent f254e7bb1e
commit a74b133cfc
3 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/Access.php
View file

@ -2,6 +2,7 @@
class Access class Access
{ {
private static $privileges = []; private static $privileges = [];
private static $checkPrivileges = true;
public static function init() public static function init()
{ {
@ -30,11 +31,15 @@ class Access
self::$privileges[$privilegeName] = $minAccessRank; self::$privileges[$privilegeName] = $minAccessRank;
} }
} }
//todo: move to scripts etc.
#if (php_sapi_name() == 'cli')
# self::disablePrivilegeChecking();
} }
public static function check(Privilege $privilege, $user = null) public static function check(Privilege $privilege, $user = null)
{ {
if (php_sapi_name() == 'cli') if (!self::$checkPrivileges)
return true; return true;
if ($user === null) if ($user === null)
@ -62,6 +67,9 @@ class Access
public static function checkEmailConfirmation($user = null) public static function checkEmailConfirmation($user = null)
{ {
if (!self::$checkPrivileges)
return true;
if ($user === null) if ($user === null)
$user = Auth::getCurrentUser(); $user = Auth::getCurrentUser();
@ -102,7 +110,7 @@ class Access
public static function getAllowedSafety() public static function getAllowedSafety()
{ {
if (php_sapi_name() == 'cli') if (!self::$checkPrivileges)
return PostSafety::getAll(); return PostSafety::getAll();
return array_filter(PostSafety::getAll(), function($safety) return array_filter(PostSafety::getAll(), function($safety)
@ -111,4 +119,14 @@ class Access
and Auth::getCurrentUser()->hasEnabledSafety($safety); and Auth::getCurrentUser()->hasEnabledSafety($safety);
}); });
} }
public static function disablePrivilegeChecking()
{
self::$checkPrivileges = false;
}
public static function enablePrivilegeChecking()
{
self::$checkPrivileges = true;
}
} }

15
src/Api/Api.php
View file

@ -1,8 +1,6 @@
<?php <?php
final class Api final class Api
{ {
protected static $checkPrivileges = true;
public static function run($job, $jobArgs) public static function run($job, $jobArgs)
{ {
$user = Auth::getCurrentUser(); $user = Auth::getCurrentUser();
@ -20,9 +18,6 @@ final class Api
public static function checkPrivileges(AbstractJob $job) public static function checkPrivileges(AbstractJob $job)
{ {
if (!self::$checkPrivileges)
return;
if ($job->requiresAuthentication()) if ($job->requiresAuthentication())
Access::assertAuthentication(); Access::assertAuthentication();
@ -53,14 +48,4 @@ final class Api
}); });
return $statuses; return $statuses;
} }
public static function disablePrivilegeChecking()
{
self::$checkPrivileges = false;
}
public static function enablePrivilegeChecking()
{
self::$checkPrivileges = true;
}
} }

4
src/Api/Jobs/AddUserJob.php
View file

@ -19,9 +19,9 @@ class AddUserJob extends AbstractJob
: AccessRank::Registered; : AccessRank::Registered;
Logger::bufferChanges(); Logger::bufferChanges();
Api::disablePrivilegeChecking(); Access::disablePrivilegeChecking();
Api::run((new EditUserJob)->skipSaving(), $arguments); Api::run((new EditUserJob)->skipSaving(), $arguments);
Api::enablePrivilegeChecking(); Access::enablePrivilegeChecking();
Logger::setBuffer([]); Logger::setBuffer([]);
if ($firstUser) if ($firstUser)