[6.x] Resolve dictionary fieldtype permissions via the CP guard - #15209
Merged
Conversation
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
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 pull request fixes an issue where the dictionary fieldtype endpoint resolved the
access cppermission using the default auth guard, rather than the guard configured for the Control Panel.When the default guard differed from the CP guard, dictionary dropdowns in the Control Panel would silently render empty, since the endpoint would return a 403 even for authenticated CP users. Worse, when a non-Statamic user was authenticated on the default guard, the endpoint would return a 500 (
Call to a member function isSuper() on null), because theGate::aftercallback in theAuthServiceProviderdidn't account forUser::fromUser()returningnull.This PR fixes it by adding the CP
AuthGuardmiddleware to the dictionary fieldtype route, so the permission check is resolved against the CP guard. Only the guard middleware is applied, not the full CP middleware group, so dictionaries which allow public access remain accessible to guests. This PR also returnsnullfrom theGate::aftercallback when the authenticated user isn't a Statamic user, so the gate abstains rather than erroring.Fixes #15204