mirror of
https://github.com/Part-DB/Part-DB-server.git
synced 2025-06-21 09:35:49 +02:00
Check for permissions before showing user infos or allow the user to change its own infos.
This commit is contained in:
parent
b9cd2fcc7f
commit
6ed2eeabae
5 changed files with 130 additions and 10 deletions
|
@ -153,9 +153,9 @@ perms: # Here comes a list with all Permission names (they have a perm_[name] co
|
||||||
bit: 4
|
bit: 4
|
||||||
delete:
|
delete:
|
||||||
bit: 8
|
bit: 8
|
||||||
editUsername:
|
edit_username:
|
||||||
bit: 2
|
bit: 2
|
||||||
changeGroup:
|
change_group:
|
||||||
bit: 6
|
bit: 6
|
||||||
edit_infos:
|
edit_infos:
|
||||||
bit: 10
|
bit: 10
|
||||||
|
|
|
@ -55,10 +55,12 @@ class UserController extends AbstractController
|
||||||
*/
|
*/
|
||||||
public function userInfo(?User $user, Packages $packages)
|
public function userInfo(?User $user, Packages $packages)
|
||||||
{
|
{
|
||||||
|
|
||||||
//If no user id was passed, then we show info about the current user
|
//If no user id was passed, then we show info about the current user
|
||||||
if($user == null) {
|
if($user == null) {
|
||||||
$user = $this->getUser();
|
$user = $this->getUser();
|
||||||
|
} else {
|
||||||
|
//Else we must check, if the current user is allowed to access $user
|
||||||
|
$this->denyAccessUnlessGranted('read', $user);
|
||||||
}
|
}
|
||||||
|
|
||||||
if($this->getParameter("use_gravatar")) {
|
if($this->getParameter("use_gravatar")) {
|
||||||
|
|
|
@ -14,21 +14,35 @@ use Symfony\Component\Form\Extension\Core\Type\TextType;
|
||||||
use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
|
use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
|
||||||
use Symfony\Component\Form\FormBuilderInterface;
|
use Symfony\Component\Form\FormBuilderInterface;
|
||||||
use Symfony\Component\OptionsResolver\OptionsResolver;
|
use Symfony\Component\OptionsResolver\OptionsResolver;
|
||||||
|
use Symfony\Component\Security\Core\Security;
|
||||||
|
|
||||||
class UserSettingsType extends AbstractType
|
class UserSettingsType extends AbstractType
|
||||||
{
|
{
|
||||||
|
protected $security;
|
||||||
|
|
||||||
|
public function __construct(Security $security)
|
||||||
|
{
|
||||||
|
$this->security = $security;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public function buildForm(FormBuilderInterface $builder, array $options)
|
public function buildForm(FormBuilderInterface $builder, array $options)
|
||||||
{
|
{
|
||||||
$builder
|
$builder
|
||||||
->add('name', TextType::class, ['label'=>'user.username.label'])
|
->add('name', TextType::class, ['label'=>'user.username.label',
|
||||||
|
'disabled' => !$this->security->isGranted('edit_username', $options['data'])])
|
||||||
->add('first_name', TextType::class, ['required' => false,
|
->add('first_name', TextType::class, ['required' => false,
|
||||||
'label'=>'user.firstName.label'])
|
'label'=>'user.firstName.label',
|
||||||
|
'disabled' => !$this->security->isGranted('edit_infos', $options['data'])])
|
||||||
->add('last_name', TextType::class, ['required' => false,
|
->add('last_name', TextType::class, ['required' => false,
|
||||||
'label'=>'user.lastName.label'])
|
'label'=>'user.lastName.label',
|
||||||
|
'disabled' => !$this->security->isGranted('edit_infos', $options['data'])])
|
||||||
->add('department', TextType::class, ['required' => false,
|
->add('department', TextType::class, ['required' => false,
|
||||||
'label'=>'user.department.label'])
|
'label'=>'user.department.label',
|
||||||
|
'disabled' => !$this->security->isGranted('edit_infos', $options['data'])])
|
||||||
->add('email', EmailType::class, ['required' => false,
|
->add('email', EmailType::class, ['required' => false,
|
||||||
'label'=>'user.email.label'])
|
'label'=>'user.email.label',
|
||||||
|
'disabled' => !$this->security->isGranted('edit_infos', $options['data'])])
|
||||||
->add('language', LocaleType::class, ['required' => false,
|
->add('language', LocaleType::class, ['required' => false,
|
||||||
'attr'=>['class'=> 'selectpicker', 'data-live-search' => true]
|
'attr'=>['class'=> 'selectpicker', 'data-live-search' => true]
|
||||||
, 'placeholder' => 'user_settings.language.placeholder', 'label'=>'user.language_select'])
|
, 'placeholder' => 'user_settings.language.placeholder', 'label'=>'user.language_select'])
|
||||||
|
|
91
src/Security/Voter/UserVoter.php
Normal file
91
src/Security/Voter/UserVoter.php
Normal file
|
@ -0,0 +1,91 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* part-db version 0.1
|
||||||
|
* Copyright (C) 2005 Christoph Lechner
|
||||||
|
* http://www.cl-projects.de/
|
||||||
|
*
|
||||||
|
* part-db version 0.2+
|
||||||
|
* Copyright (C) 2009 K. Jacobs and others (see authors.php)
|
||||||
|
* http://code.google.com/p/part-db/
|
||||||
|
*
|
||||||
|
* Part-DB Version 0.4+
|
||||||
|
* Copyright (C) 2016 - 2019 Jan Böhmer
|
||||||
|
* https://github.com/jbtronics
|
||||||
|
*
|
||||||
|
* This program is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 2
|
||||||
|
* of the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This program is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU General Public License
|
||||||
|
* along with this program; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
namespace App\Security\Voter;
|
||||||
|
|
||||||
|
|
||||||
|
use App\Entity\User;
|
||||||
|
|
||||||
|
class UserVoter extends ExtendedVoter
|
||||||
|
{
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Determines if the attribute and subject are supported by this voter.
|
||||||
|
*
|
||||||
|
* @param string $attribute An attribute
|
||||||
|
* @param mixed $subject The subject to secure, e.g. an object the user wants to access or any other PHP type
|
||||||
|
*
|
||||||
|
* @return bool True if the attribute and subject are supported, false otherwise
|
||||||
|
*/
|
||||||
|
protected function supports($attribute, $subject)
|
||||||
|
{
|
||||||
|
if($subject instanceof User)
|
||||||
|
{
|
||||||
|
return in_array($attribute, array_merge(
|
||||||
|
$this->resolver->listOperationsForPermission('users'),
|
||||||
|
$this->resolver->listOperationsForPermission('self')),
|
||||||
|
false
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Similar to voteOnAttribute, but checking for the anonymous user is already done.
|
||||||
|
* The current user (or the anonymous user) is passed by $user.
|
||||||
|
* @param $attribute
|
||||||
|
* @param $subject
|
||||||
|
* @param User $user
|
||||||
|
* @return bool
|
||||||
|
*/
|
||||||
|
protected function voteOnUser($attribute, $subject, User $user): bool
|
||||||
|
{
|
||||||
|
if($subject instanceof User)
|
||||||
|
{
|
||||||
|
//Check if the checked user is the user itself
|
||||||
|
if($subject->getID() === $user->getID() &&
|
||||||
|
$this->resolver->isValidOperation('self', $attribute)) {
|
||||||
|
//Then we also need to check the self permission
|
||||||
|
$tmp = $this->resolver->inherit($user, 'self', $attribute) ?? false;
|
||||||
|
//But if the self value is not allowed then use just the user value:
|
||||||
|
if($tmp)
|
||||||
|
return $tmp;
|
||||||
|
}
|
||||||
|
//Else just check users permission:
|
||||||
|
return $this->resolver->inherit($user, 'users', $attribute) ?? false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
|
@ -35,8 +35,6 @@ namespace App\Services;
|
||||||
use App\Configuration\PermissionsConfiguration;
|
use App\Configuration\PermissionsConfiguration;
|
||||||
use App\Entity\User;
|
use App\Entity\User;
|
||||||
use App\Security\Interfaces\HasPermissionsInterface;
|
use App\Security\Interfaces\HasPermissionsInterface;
|
||||||
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Security;
|
|
||||||
use Symfony\Component\Config\Definition\Builder\TreeBuilder;
|
|
||||||
use Symfony\Component\Config\Definition\Processor;
|
use Symfony\Component\Config\Definition\Processor;
|
||||||
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
|
use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
|
||||||
use Symfony\Component\Yaml\Yaml;
|
use Symfony\Component\Yaml\Yaml;
|
||||||
|
@ -70,6 +68,8 @@ class PermissionResolver
|
||||||
);
|
);
|
||||||
|
|
||||||
$this->permission_structure = $processedConfiguration;
|
$this->permission_structure = $processedConfiguration;
|
||||||
|
|
||||||
|
//dump($this->permission_structure);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -163,5 +163,18 @@ class PermissionResolver
|
||||||
return isset($this->permission_structure['perms'][$permission]);
|
return isset($this->permission_structure['perms'][$permission]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Checks if the permission operation combination with the given names is existing.
|
||||||
|
*
|
||||||
|
* @param string $permission The name of the permission which should be checked.
|
||||||
|
* @param string $operation The name of the operation which should be checked.
|
||||||
|
* @return bool True if the given permission operation combination is existing.
|
||||||
|
*/
|
||||||
|
public function isValidOperation(string $permission, string $operation) : bool
|
||||||
|
{
|
||||||
|
return $this->isValidPermission($permission) &&
|
||||||
|
isset($this->permission_structure['perms'][$permission]['operations'][$operation]);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
Loading…
Add table
Add a link
Reference in a new issue