github-mirror/framework
github-mirror/framework
2
0
Fork 0
mirror of https://github.com/flarum/framework.git synced 2025-03-02 05:50:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix leak of private information when updating users

Browse Source 
Fixes #1628.
This commit is contained in:
Franz Liedke 2018-11-09 11:39:20 +01:00
parent fad8ed335d
commit ebcc173496
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
framework/core/src/Api/Controller/UpdateUserController.php
View File

@ -12,6 +12,7 @@
namespace Flarum\Api\Controller; namespace Flarum\Api\Controller;
use Flarum\Api\Serializer\CurrentUserSerializer; use Flarum\Api\Serializer\CurrentUserSerializer;
use Flarum\Api\Serializer\UserSerializer;
use Flarum\User\Command\EditUser; use Flarum\User\Command\EditUser;
use Flarum\User\Exception\PermissionDeniedException; use Flarum\User\Exception\PermissionDeniedException;
use Illuminate\Contracts\Bus\Dispatcher; use Illuminate\Contracts\Bus\Dispatcher;
@ -23,7 +24,7 @@ class UpdateUserController extends AbstractShowController
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public $serializer = CurrentUserSerializer::class; public $serializer = UserSerializer::class;
/** /**
* {@inheritdoc} * {@inheritdoc}
@ -52,6 +53,10 @@ class UpdateUserController extends AbstractShowController
$actor = $request->getAttribute('actor'); $actor = $request->getAttribute('actor');
$data = array_get($request->getParsedBody(), 'data', []); $data = array_get($request->getParsedBody(), 'data', []);
if ($actor->id == $id) {
$this->serializer = CurrentUserSerializer::class;
}
// Require the user's current password if they are attempting to change // Require the user's current password if they are attempting to change
// their own email address. // their own email address.
if (isset($data['attributes']['email']) && $actor->id == $id) { if (isset($data['attributes']['email']) && $actor->id == $id) {