feat(security): Add PHP \Attribute for remaining security annotations #37905
Conversation
This file contains 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
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
There was a problem hiding this comment.
Psalm found more than 10 potential problems in the proposed changes. Check the Files changed tab for more details.
nickvergessen
force-pushed
the
techdebt/noid/add-attributes-for-remaining-security-annotations
branch
from
4f53919 to
a64daa3
Compare
nickvergessen
added
3. to review
nickvergessen
requested review from
susnux,
vitormattos,
ChristophWurst and
come-nc
ChristophWurst
approved these changes
Apr 25, 2023
nickvergessen
force-pushed
the
techdebt/noid/add-attributes-for-remaining-security-annotations
branch
from
a64daa3 to
203f182
Compare
nickvergessen
added
the
pending documentation
Signed-off-by: Joas Schilling <coding@schilljs.com>
nickvergessen
force-pushed
the
techdebt/noid/add-attributes-for-remaining-security-annotations
branch
from
203f182 to
ecb8b55
Compare
|
Comment for #37039 on merge: |
4 tasks
vitormattos
approved these changes
Apr 25, 2023
| if ($this->reflector->hasAnnotation($annotationName)) { | ||
| return true; | ||
| } | ||
|
|
| @@ -114,23 +141,25 @@ public function beforeController($controller, $methodName) { | |||
| * @throws SecurityException | |||
| */ | |||
| public function afterController($controller, $methodName, Response $response) { | |||
There was a problem hiding this comment.
This will impact a lot of classes but would be good create a followup issue to do this fix return type and others from Middleware abstract class:
Suggested change
| public function afterController($controller, $methodName, Response $response) { | |
| public function afterController($controller, $methodName, Response $response): void { |
| * @param class-string<T> $attributeClass | ||
| * @return boolean | ||
| */ | ||
| protected function hasAnnotationOrAttribute(ReflectionMethod $reflectionMethod, string $annotationName, string $attributeClass): bool { |
There was a problem hiding this comment.
This method occur 3 times at this PR with the same signature.
Maybe will be good to move to parent class.
There was a problem hiding this comment.
This ia only temporary until we drop the annotations and its 2 if statements. I don't really feel like creating an abstract parent class for 4 operational lines
| * @return boolean | ||
| */ | ||
| protected function hasAnnotationOrAttribute(ReflectionMethod $reflectionMethod, string $annotationName, string $attributeClass): bool { | ||
| if ($this->reflector->hasAnnotation($annotationName)) { |
There was a problem hiding this comment.
At other implements of this method on this PR you used the follow code. Make any difference or only was about wrote more times the same method without doing a copy paste?
Suggested change
| if ($this->reflector->hasAnnotation($annotationName)) { | |
| if (!empty($reflectionMethod->getAttributes($attributeClass))) { |
There was a problem hiding this comment.
For AuthorizedAdminSetting we need the values, so i changed it there but then went for an independent approach, so that's why after that attempt some might diverge, but as mentioned above they are just 2 ifs so it doesn't really matter
nickvergessen
deleted the
techdebt/noid/add-attributes-for-remaining-security-annotations
branch
nickvergessen
removed
the
pending documentation
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary
Allowing the remaining annotations of the security middlewares as Attributes
TODO
Checklist