[branch/v7] Ensure ListResources is accurate with denied resources (#14544) #14547
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
* Ensure ListResources is accurate with denied resources Prior to this tsh ls and the web UI were reporting different number of resources when a user had role/roles that restricted access to certain resources. This was caused by returning an incorrect `NextKey` in the `ListResourcesResponse`. In the event that `IterateResourcePages` was returning early due to the callback requesting to stop iteration, the `NextKey` being returned was the last key for the **current page** instead of the key for the **next resource** in the page. This would cause N resources between the last resource iterated on and the end of the page to be skipped. To remedy this `IterateResourcePages` has been refactored to `IterateResources`. This shifts the responsiblity of building the `ListResourcesResponse` onto the caller and not the iterator. There are no more pages to worry about, so the logic about what the next key should be becomes simpler. `TestListResources_WithRoles` was added to ensure that a user with a set of roles that denies access is always returned the correct resources from `ListResources` from both tsh and the web ui. (cherry picked from commit ac69da9)
fspmarshall
approved these changes
Jul 18, 2022
espadolini
approved these changes
Jul 18, 2022
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.
Backport
This will backport the following commits from
branch/v8tobranch/v7:NOTE: this is only backporting a subset of the backport to v8 because
ListResourcesdoesn't exist on v7