More robust and consistent allowAll indicesAccessControl #79415
Merged
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
This PR ensures that AllowAllIndicesAccessControl is able to behave well for all superclass's methods. Previously it throws NPE when it is asked about Fls/Dls usage because it has a null index permissions map as a placeholder. In this PR, we also get rid of the null and also mandate non-null in the constructor of IndicesAccessControl. In additional, whether a role has DLS/FLS and whether an AllowAllIndicesAccessControl should be used for short circuit is determined more consistently. In both places, whether a group has total access to all indices is used as part of the criteria. Previously it is possible that the role reports it has DLS/FLS while the cindicesAccessControl does not have it. This could happen when one of the group has DLS/FLS but another group has total access to all indices. In this case, the code now correctly reports no DLS/FLS in both places. Resolves: elastic#79361
ywangd
added
>test
|
Pinging @elastic/es-security (Team:Security) |
ywangd
changed the title
|
@elasticmachine run elasticsearch-ci/part-1 |
💔 Backport failed
You can use sqren/backport to manually backport by running |
weizijun
added a commit
to weizijun/elasticsearch
that referenced
this pull request
Oct 19, 2021
* upstream/master: (34 commits) Add extensionName() to security extension (elastic#79329) More robust and consistent allowAll indicesAccessControl (elastic#79415) Fix circuit breaker leak in MultiTerms aggregation (elastic#79362) guard geoline aggregation from parents aggegator that emit empty buckets (elastic#79129) Vector tiles: increase the size of the envelope used to clip geometries (elastic#79030) Revert "[ML] Add queue_capacity setting to start deployment API (elastic#79369)" (elastic#79374) Convert token service license object to LicensedFeature (elastic#79284) [TEST] Fix ShardPathTests for MDP (elastic#79393) Fix fleet search API with no checkpints (elastic#79400) Reduce BWC version for transient settings (elastic#79396) EQL: Rename a test class for eclipse (elastic#79254) Use search_coordination threadpool in field caps (elastic#79378) Use query param instead of a system property for opting in for new cluster health response code (elastic#79351) Add new kNN search endpoint (elastic#79013) Disable BWC tests Convert auditing license object to LicensedFeature (elastic#79280) Update BWC versions after backport of elastic#78551 Enable InstantiatingObjectParser to pass context as a first argument (elastic#79206) Move xcontent filtering tests (elastic#79298) Update links to Fleet/Agent docs (elastic#79303) ...
ywangd
added a commit
to ywangd/elasticsearch
that referenced
this pull request
Oct 19, 2021
This PR ensures that AllowAllIndicesAccessControl is able to behave well for all superclass's methods. Previously it throws NPE when it is asked about Fls/Dls usage because it has a null index permissions map as a placeholder. In this PR, we also get rid of the null and also mandate non-null in the constructor of IndicesAccessControl. In additional, whether a role has DLS/FLS and whether an AllowAllIndicesAccessControl should be used for short circuit is determined more consistently. In both places, whether a group has total access to all indices is used as part of the criteria. Previously it is possible that the role reports it has DLS/FLS while the cindicesAccessControl does not have it. This could happen when one of the group has DLS/FLS but another group has total access to all indices. In this case, the code now correctly reports no DLS/FLS in both places. Resolves: elastic#79361
elasticsearchmachine
pushed a commit
that referenced
this pull request
Oct 19, 2021
…9427) * More robust and consistent allowAll indicesAccessControl (#79415) This PR ensures that AllowAllIndicesAccessControl is able to behave well for all superclass's methods. Previously it throws NPE when it is asked about Fls/Dls usage because it has a null index permissions map as a placeholder. In this PR, we also get rid of the null and also mandate non-null in the constructor of IndicesAccessControl. In additional, whether a role has DLS/FLS and whether an AllowAllIndicesAccessControl should be used for short circuit is determined more consistently. In both places, whether a group has total access to all indices is used as part of the criteria. Previously it is possible that the role reports it has DLS/FLS while the cindicesAccessControl does not have it. This could happen when one of the group has DLS/FLS but another group has total access to all indices. In this case, the code now correctly reports no DLS/FLS in both places. Resolves: #79361 * fix for 7.x quirks
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 PR ensures that AllowAllIndicesAccessControl is able to behave well
for all superclass's methods. Previously it throws NPE when it is asked
about Fls/Dls usage because it has a null index permissions map as a
placeholder. In this PR, we also get rid of the null and mandate
non-null in the constructor of IndicesAccessControl.
In addition, whether a role has DLS/FLS and whether an
AllowAllIndicesAccessControl should be used for short circuit is
determined more consistently. In both places, whether a group has total
access to all indices is used as part of the criteria. Previously it is
possible that a role reports it has DLS/FLS while the
indicesAccessControl does not have it. This could happen when one of
the group has DLS/FLS but another group has total access to all indices.
In this case, the code now correctly reports no DLS/FLS in both places.
Resolves: #79361