fix: Add NoTwoFactorRequired attribute to poll method#1151
Open
joshtrichards wants to merge 2 commits intomainfrom
Open
fix: Add NoTwoFactorRequired attribute to poll method#1151joshtrichards wants to merge 2 commits intomainfrom
joshtrichards wants to merge 2 commits intomainfrom
Conversation
Signed-off-by: Josh <josh.t.richards@gmail.com>
Signed-off-by: Josh <josh.t.richards@gmail.com>
Member
Author
|
P.S. As an aside: Apparently PHP attribute isn't implemented for |
Draft
8 tasks
This was referenced Jan 7, 2026
Member
This was referenced Jan 14, 2026
This was referenced Jan 29, 2026
This was referenced Feb 11, 2026
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
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.
This should allows us to drop the app specific code in server's TwoFactorMiddleware class:
https://github.com/nextcloud/server/blob/6a2e0f819c2d6752b72339e68c4a4eda8d710485/core/Middleware/TwoFactorMiddleware.php#L19
https://github.com/nextcloud/server/blob/6a2e0f819c2d6752b72339e68c4a4eda8d710485/core/Middleware/TwoFactorMiddleware.php#L52-L55
Wasn't an option at the time from what I can tell.
In addition to being ugly, it confuses psalm when the
Controllerparameter type-hint is added in server's TwoFactorMiddleware class (even though it matches the upstream class contract). The 2FA middleware bypass forAPIControllerjust for this app is also a bit confusing since there truly is anOCP\AppFramkework\ApiControllerthat can flow through that middleware too.To avoid ugly app specific workarounds like class_exists/etc, I believe we can just use this annotation here now and drop the special bypass for
pollfrom the 2fa middlware (unless I'm missing something).