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.

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

[Backport 2.x] Notification security fix (#861) #863

Conversation

stevanbz
Copy link
Contributor

  • Notification security fix (Notification security fix #852)

  • added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin

  • compile fix

  • refactored user_info injection to use InjectSecurity

  • ktlint fix


(cherry picked from commit e0b7a5a)

  • remove unneeded import

Issue #, if available:

Description of changes:

CheckList:
[ ] 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.

* Notification security fix (opensearch-project#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* compile fix

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* refactored user_info injection to use InjectSecurity

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

* ktlint fix

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>

---------

Signed-off-by: Petar Dzepina <petar.dzepina@gmail.com>
(cherry picked from commit e0b7a5a)

* remove unneeded import

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>

---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
@stevanbz stevanbz requested a review from a team April 17, 2023 19:26
@lezzago lezzago merged commit 264a447 into opensearch-project:feature/composite-monitors Apr 17, 2023
stevanbz added a commit to stevanbz/alerting that referenced this pull request Apr 17, 2023
…ensearch-project#863)

* Notification security fix (opensearch-project#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin



* compile fix



* refactored user_info injection to use InjectSecurity



* ktlint fix



---------


(cherry picked from commit e0b7a5a)

* remove unneeded import



---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
stevanbz added a commit to stevanbz/alerting that referenced this pull request Apr 17, 2023
…ensearch-project#863)

* Notification security fix (opensearch-project#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin



* compile fix



* refactored user_info injection to use InjectSecurity



* ktlint fix



---------


(cherry picked from commit e0b7a5a)

* remove unneeded import



---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
lezzago added a commit that referenced this pull request Apr 17, 2023
#857)

* Refactored workflowIndexing validation - removed coroutine and context client context lost

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* refactored getting the workflows

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Changed the logic according to secure test findings

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* [Backport 2.x] Notification security fix (#861) (#863)

* Notification security fix (#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin



* compile fix



* refactored user_info injection to use InjectSecurity



* ktlint fix



---------


(cherry picked from commit e0b7a5a)

* remove unneeded import



---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>

* Stashed user together with it's roles

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
eirsep pushed a commit that referenced this pull request May 24, 2023
#857)

* Refactored workflowIndexing validation - removed coroutine and context client context lost

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* refactored getting the workflows

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Changed the logic according to secure test findings

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* [Backport 2.x] Notification security fix (#861) (#863)

* Notification security fix (#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin



* compile fix



* refactored user_info injection to use InjectSecurity



* ktlint fix



---------


(cherry picked from commit e0b7a5a)

* remove unneeded import



---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>

* Stashed user together with it's roles

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
eirsep pushed a commit to eirsep/alerting that referenced this pull request May 24, 2023
opensearch-project#857)

* Refactored workflowIndexing validation - removed coroutine and context client context lost

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* refactored getting the workflows

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Changed the logic according to secure test findings

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* [Backport 2.x] Notification security fix (opensearch-project#861) (opensearch-project#863)

* Notification security fix (opensearch-project#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin

* compile fix

* refactored user_info injection to use InjectSecurity

* ktlint fix

---------

(cherry picked from commit e0b7a5a)

* remove unneeded import

---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>

* Stashed user together with it's roles

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
eirsep pushed a commit to eirsep/alerting that referenced this pull request May 25, 2023
opensearch-project#857)

* Refactored workflowIndexing validation - removed coroutine and context client context lost

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* refactored getting the workflows

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Changed the logic according to secure test findings

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* [Backport 2.x] Notification security fix (opensearch-project#861) (opensearch-project#863)

* Notification security fix (opensearch-project#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin

* compile fix

* refactored user_info injection to use InjectSecurity

* ktlint fix

---------

(cherry picked from commit e0b7a5a)

* remove unneeded import

---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>

* Stashed user together with it's roles

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
eirsep pushed a commit to eirsep/alerting that referenced this pull request May 25, 2023
opensearch-project#857)

* Refactored workflowIndexing validation - removed coroutine and context client context lost

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* refactored getting the workflows

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Changed the logic according to secure test findings

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* [Backport 2.x] Notification security fix (opensearch-project#861) (opensearch-project#863)

* Notification security fix (opensearch-project#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin

* compile fix

* refactored user_info injection to use InjectSecurity

* ktlint fix

---------

(cherry picked from commit e0b7a5a)

* remove unneeded import

---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>

* Stashed user together with it's roles

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
eirsep added a commit that referenced this pull request May 25, 2023
* Added layer for creating and updating the workflow (#831)

* Renamed chainedFindings to chainedMonitorFindings

* Removed unecessary mappings from workflow definition

* Improved logging when saving the workflows

* Added a workflow id in response

* Added role check and index access once the workflow is being created

* Updated mappings for the workflow

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Fixed xContent dependencies due to OSCore changes (#839)

Signed-off-by: Angie Zhang <langelzh@amazon.com>

* Dependency fix (#846)

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Refactored workflowIndexing validation - removed coroutine and contex… (#857)

* Refactored workflowIndexing validation - removed coroutine and context client context lost

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* refactored getting the workflows

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Changed the logic according to secure test findings

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* [Backport 2.x] Notification security fix (#861) (#863)

* Notification security fix (#852)

* added injecting whole user object in threadContext before calling notification APIs so that backend roles are available to notification plugin

* compile fix

* refactored user_info injection to use InjectSecurity

* ktlint fix

---------

(cherry picked from commit e0b7a5a)

* remove unneeded import

---------

Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>

* Stashed user together with it's roles

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>

* Added workflow execution logic (#850)

* Added workflow execution logic

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Adjusted code according to comments

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Updated version of the findings json

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Updating the workflow metadata in the case of updating flag set to false while the metadata alerady exist

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Added logging for workflow metadata update

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Added Rest Execute Workflow action

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Extended workflow context with workflowMetadataId. Adjusted the doc level monitor findings

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Updated conditions for unstashing the context when indexing and deleting the workflow

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Added fix when executing the workflow and when chained findings index… (#890)

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>

* Fixed deleting monitor workflow metadata (#882)

* Fixed deleting monitor metadata and workflow metadata.

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* fix monitor metadata error from conflict resolution

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* remove unused import

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* remove rest execute workflow action

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

* increment schema version for findings mapping json

Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>

---------

Signed-off-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Signed-off-by: Angie Zhang <langelzh@amazon.com>
Signed-off-by: Ashish Agrawal <ashisagr@amazon.com>
Signed-off-by: Surya Sashank Nistala <snistala@amazon.com>
Co-authored-by: Stevan Buzejic <buzejic.stevan@gmail.com>
Co-authored-by: Angie Zhang <langelzh@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: Petar Dzepina <petar.dzepina@gmail.com>
Co-authored-by: Ashish Agrawal <ashisagr@amazon.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.5 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.5 2.5
# Navigate to the new working tree
cd .worktrees/backport-2.5
# Create a new branch
git switch --create backport/backport-863-to-2.5
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 264a4476be49ce4981daa29b44e5cc02dfa029f0
# Push it to GitHub
git push --set-upstream origin backport/backport-863-to-2.5
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.5

Then, create a pull request where the base branch is 2.5 and the compare/head branch is backport/backport-863-to-2.5.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.3 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.3 2.3
# Navigate to the new working tree
cd .worktrees/backport-2.3
# Create a new branch
git switch --create backport/backport-863-to-2.3
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 264a4476be49ce4981daa29b44e5cc02dfa029f0
# Push it to GitHub
git push --set-upstream origin backport/backport-863-to-2.3
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.3

Then, create a pull request where the base branch is 2.3 and the compare/head branch is backport/backport-863-to-2.3.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants