mirror of
https://github.com/flarum/core.git
synced 2025-10-13 07:54:25 +02:00
Remove sudo mode and add password confirmation when changing email address
closes #674
This commit is contained in:
@@ -10,11 +10,9 @@
|
||||
|
||||
namespace Flarum\Core\Access;
|
||||
|
||||
use DateTime;
|
||||
use Flarum\Api\Exception\InvalidAccessTokenException;
|
||||
use Flarum\Core\Exception\PermissionDeniedException;
|
||||
use Flarum\Core\User;
|
||||
use Psr\Http\Message\ServerRequestInterface;
|
||||
|
||||
trait AssertPermissionTrait
|
||||
{
|
||||
@@ -66,28 +64,4 @@ trait AssertPermissionTrait
|
||||
{
|
||||
$this->assertCan($actor, 'administrate');
|
||||
}
|
||||
|
||||
/**
|
||||
* @param ServerRequestInterface $request
|
||||
* @throws InvalidAccessTokenException
|
||||
*/
|
||||
protected function assertSudo(ServerRequestInterface $request)
|
||||
{
|
||||
$session = $request->getAttribute('session');
|
||||
|
||||
if ($session && $session->get('sudo_expiry') < new DateTime) {
|
||||
throw new InvalidAccessTokenException;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* @param ServerRequestInterface $request
|
||||
* @throws PermissionDeniedException
|
||||
*/
|
||||
protected function assertAdminAndSudo(ServerRequestInterface $request)
|
||||
{
|
||||
$this->assertAdmin($request->getAttribute('actor'));
|
||||
|
||||
$this->assertSudo($request);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user