Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Sécurité][BO] Cohérence des controles sur route back_signalement_qualification_editer #2698

Merged
merged 1 commit into from
Jun 14, 2024
Merged

[Sécurité][BO] Cohérence des controles sur route back_signalement_qualification_editer #2698

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Controller/Back/BackSignalementQualificationController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
use App\Entity\Signalement;
use App\Entity\SignalementQualification;
use App\Manager\SignalementManager;
use App\Security\Voter\UserVoter;
use App\Security\Voter\SignalementVoter;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
Expand All @@ -29,7 +29,7 @@ public function editQualification(
SignalementManager $signalementManager,
SerializerInterface $serializer
): RedirectResponse|JsonResponse {
$this->denyAccessUnlessGranted(UserVoter::SEE_NDE, $this->getUser());
$this->denyAccessUnlessGranted(SignalementVoter::EDIT_NDE, $signalement);
$decodedRequest = json_decode($request->getContent());
if ($this->isCsrfTokenValid('signalement_edit_nde_'.$signalement->getId(), $decodedRequest->_token)) {
$qualificationNDERequest = $serializer->deserialize(
Expand Down
17 changes: 1 addition & 16 deletions src/Controller/Back/SignalementController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@

use App\Entity\Affectation;
use App\Entity\Enum\Qualification;
use App\Entity\Enum\QualificationStatus;
use App\Entity\Intervention;
use App\Entity\Signalement;
use App\Entity\SignalementQualification;
use App\Entity\User;
use App\Event\SignalementClosedEvent;
use App\Event\SignalementViewedEvent;
Expand All @@ -20,7 +18,6 @@
use App\Repository\InterventionRepository;
use App\Repository\SignalementQualificationRepository;
use App\Repository\TagRepository;
use App\Security\Voter\UserVoter;
use App\Service\Signalement\PhotoHelper;
use App\Service\Signalement\SignalementDesordresProcessor;
use Doctrine\Persistence\ManagerRegistry;
Expand Down Expand Up @@ -133,7 +130,6 @@ public function viewSignalement(
$signalementQualificationNDE = $signalementQualificationRepository->findOneBy([
'signalement' => $signalement,
'qualification' => Qualification::NON_DECENCE_ENERGETIQUE, ]);
$isSignalementNDEActif = $this->isSignalementNDEActif($signalementQualificationNDE);

if (null == $signalement->getCreatedFrom()) {
$signalementQualificationNDECriticites = $signalementQualificationNDE
Expand All @@ -151,9 +147,7 @@ public function viewSignalement(

$files = $parameterBag->get('files');

$canEditNDE = $isSignalementNDEActif && $this->isGranted(UserVoter::SEE_NDE, $this->getUser())
&& $canEditSignalement;

$canEditNDE = $this->isGranted('SIGN_EDIT_NDE', $signalement);
$listQualificationStatusesLabelsCheck = [];
if (null !== $signalement->getSignalementQualifications()) {
foreach ($signalement->getSignalementQualifications() as $qualification) {
Expand Down Expand Up @@ -213,15 +207,6 @@ public function viewSignalement(
]);
}

private function isSignalementNDEActif(?SignalementQualification $signalementQualification): bool
{
if (null !== $signalementQualification) {
return QualificationStatus::ARCHIVED != $signalementQualification->getStatus();
}

return false;
}

#[Route('/{uuid}/supprimer', name: 'back_signalement_delete', methods: 'POST')]
public function deleteSignalement(Signalement $signalement, Request $request, ManagerRegistry $doctrine): Response
{
Expand Down
31 changes: 29 additions & 2 deletions src/Security/Voter/SignalementVoter.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@

use App\Entity\Affectation;
use App\Entity\Enum\Qualification;
use App\Entity\Enum\QualificationStatus;
use App\Entity\Signalement;
use App\Entity\User;
use Symfony\Bundle\SecurityBundle\Security;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\Security\Core\Authorization\Voter\Voter;
use Symfony\Component\Security\Core\User\UserInterface;
Expand All @@ -20,10 +22,15 @@ class SignalementVoter extends Voter
public const REOPEN = 'SIGN_REOPEN';
public const ADD_VISITE = 'SIGN_ADD_VISITE';
public const USAGER_EDIT = 'SIGN_USAGER_EDIT';
public const EDIT_NDE = 'SIGN_EDIT_NDE';

public function __construct(private Security $security)
{
}

protected function supports(string $attribute, $subject): bool
{
return \in_array($attribute, [self::EDIT, self::VIEW, self::DELETE, self::VALIDATE, self::REOPEN, self::CLOSE, self::ADD_VISITE, self::USAGER_EDIT])
return \in_array($attribute, [self::EDIT, self::VIEW, self::DELETE, self::VALIDATE, self::REOPEN, self::CLOSE, self::ADD_VISITE, self::USAGER_EDIT, self::EDIT_NDE])
&& ($subject instanceof Signalement);
}

Expand All @@ -43,6 +50,10 @@ protected function voteOnAttribute(string $attribute, $subject, TokenInterface $
return $this->canAddVisite($subject, $user);
}

if (self::EDIT_NDE == $attribute) {
return $this->canEditNDE($subject, $user);
}

if ($user->isSuperAdmin()) {
return true;
}
Expand Down Expand Up @@ -82,7 +93,8 @@ private function canEdit(Signalement $signalement, User $user): bool
{
return $signalement->getAffectations()->filter(function (Affectation $affectation) use ($user) {
return $affectation->getPartner()->getId() === $user->getPartner()->getId();
})->count() > 0 || $user->isTerritoryAdmin() && $user->getTerritory() === $signalement->getTerritory();
})->count() > 0 || ($user->isTerritoryAdmin() && $user->getTerritory() === $signalement->getTerritory())
|| $user->isSuperAdmin();
}

private function canView(Signalement $signalement, User $user): bool
Expand All @@ -109,4 +121,19 @@ public function canAddVisite(Signalement $signalement, User $user): bool

return $user->isSuperAdmin() || $isUserInAffectedPartnerWithQualificationVisite || $isUserTerritoryAdminOfSignalementTerritory;
}

private function canEditNDE(Signalement $signalement, User $user): bool
{
$signalementQualificationNDE = $signalement->getSignalementQualifications()?->filter(function ($qualification) {
return Qualification::NON_DECENCE_ENERGETIQUE === $qualification->getQualification();
})->first();

$isSignalementNDEActif = false;
if (null !== $signalementQualificationNDE && false !== $signalementQualificationNDE) {
$isSignalementNDEActif = QualificationStatus::ARCHIVED != $signalementQualificationNDE->getStatus();
}

return $isSignalementNDEActif && $this->security->isGranted(UserVoter::SEE_NDE, $user)
&& $this->canEdit($signalement, $user);
}
}
Loading