[CVE-2022-35980] Ensure concrete indexes included during index resolution for DLS/FLS/Masking checks #1999
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
Resolving index patterns into concrete indices had some confusing logic make it hard to verify its behavior. Updated this code to be easier to read and added test cases to confirm resolution patterns. Also added unit tests to ensure line/by line coverage was correct. Signed-off-by: Peter Nied <petern@amazon.com>
peternied
force-pushed
the
resolve-indices-changes
branch
from
6c000d5
to
107cd4f
Compare
cwperks
reviewed
Aug 8, 2022
src/test/java/org/opensearch/security/securityconf/impl/v7/IndexPatternTests.java
Show resolved
Hide resolved
src/test/java/org/opensearch/security/securityconf/impl/v7/IndexPatternTests.java
Show resolved
Hide resolved
src/test/java/org/opensearch/security/securityconf/impl/v7/IndexPatternTests.java
Show resolved
Hide resolved
cwperks
previously approved these changes
Aug 8, 2022
cliu123
previously approved these changes
Aug 8, 2022
|
The fix looks good to me! But the CI failed. I'll redo approval when CI passes. |
…unresolved index Signed-off-by: Peter Nied <petern@amazon.com>
Codecov Report
@@ Coverage Diff @@
## main #1999 +/- ##
============================================
+ Coverage 61.03% 61.04% +0.01%
Complexity 3232 3232
============================================
Files 256 256
Lines 18085 18084 -1
Branches 3222 3221 -1
============================================
+ Hits 11038 11040 +2
Misses 5471 5471
+ Partials 1576 1573 -3
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
cliu123
reviewed
Aug 8, 2022
cliu123
approved these changes
Aug 8, 2022
cliu123
reviewed
Aug 8, 2022
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Aug 8, 2022
(cherry picked from commit 42b936e)
opensearch-trigger-bot bot
pushed a commit
that referenced
this pull request
Aug 8, 2022
(cherry picked from commit 42b936e)
peternied
added a commit
that referenced
this pull request
Aug 9, 2022
bharath-techie
pushed a commit
to bharath-techie/security
that referenced
this pull request
Aug 12, 2022
peternied
changed the title
peternied
changed the title
peternied
added a commit
that referenced
this pull request
Aug 12, 2022
peternied
added a commit
that referenced
this pull request
Nov 9, 2022
* Update indices resolution to be clearer (#1999) * Resolving backing indices of data streams when resolving for aliases * Fixing resolution of indices for non-wild card scenarios / exact matches * Adding tests for DLS/FLS/Field-Masking on Data Streams Signed-off-by: Craig Perkins <cwperx@amazon.com> Co-authored-by: Sandesh Kumar <kusandes@amazon.com> Co-authored-by: Peter Nied <petern@amazon.com> Co-authored-by: Dave Lago <davelago@amazon.com> Co-authored-by: Sandesh Kumar <kusandes@amazon.com>
stephen-crawford
pushed a commit
to stephen-crawford/security
that referenced
this pull request
Nov 10, 2022
Signed-off-by: Stephen Crawford <steecraw@amazon.com>
wuychn
pushed a commit
to ochprince/security
that referenced
this pull request
Mar 16, 2023
…ensearch-project#2002) (cherry picked from commit 42b936e) Co-authored-by: Peter Nied <petern@amazon.com>
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.
Resolving index patterns into concrete indices had some confusing logic
make it hard to verify its behavior. Updated this code to be easier
to read and added test cases to confirm resolution patterns. Also added
unit tests to ensure line/by line coverage was correct.
Issues Resolved
Testing
Check List
New functionality has been documentedBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.