-
-
Notifications
You must be signed in to change notification settings - Fork 9.7k
[Security] added voter report behavior #21094
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.
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
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
102 changes: 102 additions & 0 deletions
102
src/Symfony/Component/Security/Core/Authorization/Voter/Report/VoteReport.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\Security\Core\Authorization\Voter\Report; | ||
|
|
||
| use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; | ||
| use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface; | ||
|
|
||
| /** | ||
| * @author Maxime Perrimond <max.perrimond@gmail.com> | ||
| */ | ||
| final class VoteReport implements VoteReportInterface | ||
| { | ||
| /** | ||
| * @var string | ||
| */ | ||
| private $message; | ||
|
|
||
| /** | ||
| * @var string | ||
| */ | ||
| private $attribute; | ||
|
|
||
| /** | ||
| * @var mixed | ||
| */ | ||
| private $subject; | ||
|
|
||
| /** | ||
| * @var TokenInterface | ||
| */ | ||
| private $token; | ||
|
|
||
| /** | ||
| * @var VoterInterface | ||
| */ | ||
| private $voter; | ||
|
|
||
| /** | ||
| * @param string $message | ||
| * @param VoterInterface $voter | ||
| * @param string $attribute | ||
| * @param mixed $subject | ||
| * @param TokenInterface $token | ||
| */ | ||
| public function __construct($message, VoterInterface $voter, $attribute, $subject, TokenInterface $token) | ||
| { | ||
| $this->message = $message; | ||
| $this->attribute = $attribute; | ||
| $this->subject = $subject; | ||
| $this->voter = $voter; | ||
| $this->token = $token; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getMessage() | ||
| { | ||
| return $this->message; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getAttribute() | ||
| { | ||
| return $this->attribute; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getSubject() | ||
| { | ||
| return $this->subject; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getToken() | ||
| { | ||
| return $this->token; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function getVoter() | ||
| { | ||
| return $this->voter; | ||
| } | ||
| } |
87 changes: 87 additions & 0 deletions
87
src/Symfony/Component/Security/Core/Authorization/Voter/Report/VoteReportBuilder.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,87 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Symfony package. | ||
| * | ||
| * (c) Fabien Potencier <fabien@symfony.com> | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| namespace Symfony\Component\Security\Core\Authorization\Voter\Report; | ||
|
|
||
| use Symfony\Component\Security\Core\Authentication\Token\TokenInterface; | ||
| use Symfony\Component\Security\Core\Authorization\Voter\Result\VoterResultInterface; | ||
| use Symfony\Component\Security\Core\Authorization\Voter\VoterInterface; | ||
| use Symfony\Component\Translation\TranslatorInterface; | ||
|
|
||
| /** | ||
| * @author Maxime Perrimond <max.perrimond@gmail.com> | ||
| */ | ||
| final class VoteReportBuilder implements VoteReportBuilderInterface | ||
| { | ||
| /** | ||
| * @var VoteReportCollectorInterface | ||
| */ | ||
| private $collector; | ||
|
|
||
| /** | ||
| * @var TranslatorInterface | ||
| */ | ||
| private $translator; | ||
|
|
||
| /** | ||
| * @var null|string | ||
| */ | ||
| private $translationDomain; | ||
|
|
||
| /** | ||
| * @param VoteReportCollectorInterface $collector | ||
| * @param TranslatorInterface $translator | ||
| * @param string|null $translationDomain | ||
| */ | ||
| public function __construct(VoteReportCollectorInterface $collector, TranslatorInterface $translator, $translationDomain = null) | ||
| { | ||
| $this->collector = $collector; | ||
| $this->translator = $translator; | ||
| $this->translationDomain = $translationDomain; | ||
| } | ||
|
|
||
| /** | ||
| * {@inheritdoc} | ||
| */ | ||
| public function addReport(VoterInterface $voter, VoterResultInterface $voterResult, $subject, TokenInterface $token) | ||
| { | ||
| if (null === $voterResult->getPlural()) { | ||
| $translatedMessage = $this->translator->trans( | ||
| $voterResult->getMessage(), | ||
| $voterResult->getParameters(), | ||
| $this->translationDomain | ||
| ); | ||
| } else { | ||
| try { | ||
| $translatedMessage = $this->translator->transChoice( | ||
| $voterResult->getMessage(), | ||
| $voterResult->getPlural(), | ||
| $voterResult->getParameters(), | ||
| $this->translationDomain | ||
| ); | ||
| } catch (\InvalidArgumentException $e) { | ||
| $translatedMessage = $this->translator->trans( | ||
| $voterResult->getMessage(), | ||
| $voterResult->getParameters(), | ||
| $this->translationDomain | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| $this->collector->add(new VoteReport( | ||
| $translatedMessage, | ||
| $voter, | ||
| $voterResult->getAttribute(), | ||
| $subject, | ||
| $token | ||
| )); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that this is still a BC break
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Maybe I should set it and the behavior as optional to avoid the BC Break ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
it must be optional, and it must be at the end. Shifting all arguments is a BC break