[Backport 2.x] Authorize rest requests (#2753) and Enhance RestLayerPrivilegesEvaluator Code Coverage (#3218)#2956
Merged
DarshitChanpura merged 13 commits intoopensearch-project:2.xfrom Oct 4, 2023
Conversation
* WIP on rest layer authz Signed-off-by: Craig Perkins <cwperx@amazon.com> * WIP on rest-layer authz Signed-off-by: Craig Perkins <cwperx@amazon.com> * Extension handshake Signed-off-by: Craig Perkins <cwperx@amazon.com> * Extension TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove SecurityRestFilterChanges to isolate extension TLS change Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove SecurityRestFilterChanges to isolate extension TLS change Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove SecurityRestFilterChanges to isolate extension TLS change Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove SecurityRestFilterChanges to isolate extension TLS change Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove SecurityRestFilterChanges to isolate extension TLS change Signed-off-by: Craig Perkins <cwperx@amazon.com> * WIP for HelloWorld sample extension role Signed-off-by: Craig Perkins <cwperx@amazon.com> * Initial implementation of authz check in REST layer Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove header Signed-off-by: Craig Perkins <cwperx@amazon.com> * Create authorizeRequest method Signed-off-by: Craig Perkins <cwperx@amazon.com> * small fix Signed-off-by: Craig Perkins <cwperx@amazon.com> * Change to ProtectedRoute Signed-off-by: Craig Perkins <cwperx@amazon.com> * Remove extension permissions Signed-off-by: Craig Perkins <cwperx@amazon.com> * Initial implementation of authz check in REST layer Signed-off-by: Craig Perkins <cwperx@amazon.com> * Extension TLS Signed-off-by: Craig Perkins <cwperx@amazon.com> * Adds dummy roles for testing rest authorization against legacy permissions Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds support for legacy permissions to perform rest authorization Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes white-space changes Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Rebases ConfigConstants with main Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Implements a new logic for rest permissions check to be more flexible Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes spotless errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds regex to match against current role permissions when comparing new permission with legacy ones Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Moves legacy permission check logic to ConfigModelV7 Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes extra new-lines Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes unused imports Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes out-of-scope white space changes Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes code-ql errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes spotless and code-ql errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes variable name and remove references to whitelist in javadoc Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds tests for rest layer privilege evaluator Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds license header to the test file Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates zstd dependency to fetch from core version.properties Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates action name in the regex to be dynamic Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds support for allowing evaluation against multiple actions names for a registered named route Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates tests Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds null check Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Makes authorize logic clearer to follow Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds extra check to ensure new actions are also evaluated against transport actions Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes spotless errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes security rest filter setup Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Removes extension reference Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * turn on audit logging Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com> * Adds unit tests for restPathMatches method Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Cleans up TODOs Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Organizes demo users and roles for extension Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Address PR feedback Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds more comments Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * add privileges info Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com> * Makes whoami action a named route and fixes license header check Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds integ tests for whoami route Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Change permissions order in roles.yml Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds developer documentation for authorization in REST layer Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes broken tests Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes checkstyle errors Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses feedback and cleans up logic for super admin check Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses Plugin Install CI failure Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Fixes failing citest task Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Modifies WhoAmI integ tests Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Adds a new endpoint called whoamiprotected and removes changes made to whoami route Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Updates documentation to reflect the new API Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Addresses PR feedback Signed-off-by: Darshit Chanpura <dchanp@amazon.com> * Renames action0 to actions Signed-off-by: Darshit Chanpura <dchanp@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com> Signed-off-by: Darshit Chanpura <dchanp@amazon.com> Signed-off-by: Maciej Mierzwa <dev.maciej.mierzwa@gmail.com> Co-authored-by: Craig Perkins <cwperx@amazon.com> Co-authored-by: MaciejMierzwa <dev.maciej.mierzwa@gmail.com> (cherry picked from commit a53a8a6)
DarshitChanpura
requested review from
RyanL1997,
cliu123,
cwperks,
davidlago,
peternied,
reta,
stephen-crawford and
willyborankin
as code owners
Member
Author
|
Waiting for security reviews to be complete before merging. |
6 tasks
peternied
previously requested changes
Jul 8, 2023
Member
peternied
left a comment
peternied
left a comment
There was a problem hiding this comment.
Putting the hold on this feature with a request changes requirement - dismissed with the internal reviews have completed
Member
Author
|
White source check will be unblocked once #2974 is merged. |
Codecov Report
@@ Coverage Diff @@
## 2.x #2956 +/- ##
============================================
+ Coverage 64.32% 64.34% +0.02%
- Complexity 3462 3490 +28
============================================
Files 256 257 +1
Lines 19515 19606 +91
Branches 3297 3312 +15
============================================
+ Hits 12553 12616 +63
- Misses 5350 5373 +23
- Partials 1612 1617 +5
|
Contributor
|
Removing 2.9 label |
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
…t#3218) Enhance RestLayerPrivilegesEvaluator Code Coverage Signed-off-by: Stephen Crawford <steecraw@amazon.com> Signed-off-by: Peter Nied <petern@amazon.com> Signed-off-by: Darshit Chanpura <dchanp@amazon.com> Co-authored-by: Peter Nied <petern@amazon.com> Co-authored-by: Darshit Chanpura <dchanp@amazon.com> (cherry picked from commit 46dfd84)
3 tasks
DarshitChanpura
changed the title
Member
|
Based on where the security review for this feature is, it isn't going to make code freeze for 2.10, removing the tag. |
Member
Author
|
We are targeting 2.11 for this feature and so tagging as such. |
Signed-off-by: Darshit Chanpura <dchanp@amazon.com>
willyborankin
approved these changes
Oct 3, 2023
DarshitChanpura
dismissed
peternied’s stale review
This change is ready for 2.11 as internal security testing is complete
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
5 participants
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.
Description
Manually Backports #2753
Check List
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.