Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Check block request only if system index #4430

Merged
merged 6 commits into from
Jun 17, 2024
Merged

Check block request only if system index #4430

merged 6 commits into from
Jun 17, 2024

Conversation

10000-ki
Copy link
Contributor

@10000-ki 10000-ki commented Jun 10, 2024 •
edited
Loading

Description

  • Category : Bug Fix
  • Why these changes are required? : There was an issue where documents could not be queried without system index permissions, even if the index was not a system index. This has been fixed.
  • What is the old behavior before changes and new behavior after changes?
    • old : Documents could not be searched without system index permissions when plugins.security.system_indices.permission.enabled enabled
    • new : Documents in normal indexes can always be searched regardless of system index permissions.

Issues Resolved

issue: #4429

Testing

[Please provide details of testing done: unit testing, integration testing and manual testing]

Check List

  • New functionality includes testing
  • New functionality has been documented
  • Commits are signed per the DCO using --signoff

By 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.

shikharj05
shikharj05 reviewed Jun 11, 2024
View reviewed changes
Copy link
Contributor

@shikharj05 shikharj05 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for this PR and root-causing the issue! Couple of minor comments

src/test/java/org/opensearch/security/IndexIntegrationTests.java Outdated Show resolved Hide resolved
src/main/java/org/opensearch/security/configuration/SecurityIndexSearcherWrapper.java Show resolved Hide resolved
@willyborankin
Copy link
Collaborator

@10000-ki could you plz rebase? The main branch contains fix for the DelegatingRestHandlerTests test

@10000-ki 10000-ki force-pushed the check-block-request-only-if-system-index branch 2 times, most recently from 0d75671 to 215f1f0 Compare June 12, 2024 01:53
@10000-ki
Copy link
Contributor Author

@willyborankin
thank you I have rebased my branch.

@codecov Codecov
Copy link

codecov bot commented Jun 12, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 65.48%. Comparing base (c1872b6) to head (be1bb75).
Report is 4 commits behind head on main.

Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #4430      +/-   ##
==========================================
+ Coverage   65.44%   65.48%   +0.03%     
==========================================
  Files         312      312              
  Lines       22042    22040       -2     
  Branches     3559     3559              
==========================================
+ Hits        14425    14432       +7     
+ Misses       5843     5837       -6     
+ Partials     1774     1771       -3
Files Coverage Δ
...ty/configuration/SecurityIndexSearcherWrapper.java 94.73% <100.00%> (+0.29%) ⬆️

... and 7 files with indirect coverage changes

cwperks
cwperks previously approved these changes Jun 12, 2024
View reviewed changes
@10000-ki 10000-ki force-pushed the check-block-request-only-if-system-index branch from 8841c07 to 5ea9dee Compare June 13, 2024 14:30
@10000-ki
Enhance test case
988c144 
Signed-off-by: 10000-ki <[email protected]>
@10000-ki
Fix line formatting
be1bb75 
Signed-off-by: 10000-ki <[email protected]>
@10000-ki
Copy link
Contributor Author

10000-ki commented Jun 14, 2024 •
edited
Loading

@cwperks @willyborankin
Oh.. I have enhanced the test cases, and the approval was removed.
I'm sorry, but could I please ask you to review this pr again?

@willyborankin
Copy link
Collaborator

@cwperks @willyborankin Oh.. I have enhanced the test cases, and the approval was removed. I'm sorry, but could I please ask you to review this pr again?

@10000-ki, will do during the day

@willyborankin willyborankin added the backport 2.x backport to 2.x branch label Jun 14, 2024
@cwperks cwperks merged commit 1d1b1ed into opensearch-project:main Jun 17, 2024
83 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Jun 17, 2024
@github-actions
Check block request only if system index (#4430)
8c5f090 
Signed-off-by: 10000-ki <[email protected]>
(cherry picked from commit 1d1b1ed)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Jun 17, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DarshitChanpura DarshitChanpura DarshitChanpura left review comments

@cwperks cwperks cwperks approved these changes

@shikharj05 shikharj05 shikharj05 approved these changes

@willyborankin willyborankin willyborankin approved these changes

@cliu123 cliu123 Awaiting requested review from cliu123

@peternied peternied Awaiting requested review from peternied peternied is a code owner

@RyanL1997 RyanL1997 Awaiting requested review from RyanL1997 RyanL1997 is a code owner

@stephen-crawford stephen-crawford Awaiting requested review from stephen-crawford

@reta reta Awaiting requested review from reta reta is a code owner

Assignees
No one assigned
Labels
backport 2.x backport to 2.x branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@10000-ki @willyborankin @shikharj05 @cwperks @DarshitChanpura