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

Support array of key/value in a selection when creating detection rule using visual editor #803

Conversation

amsiglan
Copy link
Collaborator

Description

Some SIGMA rules have detection formatted such that a selection can contain an array of key/value pairs instead of an object with key/values. Added extra parsing logic to support cloning such rules using the visual editor

Check List

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

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Copy link

codecov bot commented Nov 29, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (5bf43a6) 31.18% compared to head (dd80dae) 31.18%.
Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #803      +/-   ##
==========================================
- Coverage   31.18%   31.18%   -0.01%     
==========================================
  Files         151      151              
  Lines        4999     5009      +10     
  Branches      855      859       +4     
==========================================
+ Hits         1559     1562       +3     
- Misses       3250     3257       +7     
  Partials      190      190              

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@amsiglan amsiglan merged commit 7154042 into opensearch-project:main Dec 1, 2023
7 of 9 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x 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.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-803-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 7154042e6d34d747a59ee861ae3b07f78be73fe7
# Push it to GitHub
git push --set-upstream origin backport/backport-803-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-803-to-2.x.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Dec 1, 2023
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 7154042)
amsiglan added a commit that referenced this pull request Dec 4, 2023
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
(cherry picked from commit 7154042)

Co-authored-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
amsiglan added a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Feb 14, 2024
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@amsiglan amsiglan mentioned this pull request Feb 14, 2024
1 task
amsiglan added a commit that referenced this pull request Feb 14, 2024
* Make notifications optional (#796)

* Make notifications optional 2.11 (#770)

* Threat intel feed support for detector creation (#762)

* added threat intel feed support for detector creation

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated cypress workflow file

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated alerts; findings UX

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* refactored alert condition panel; update detector for intel feeds

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated snapshots, mocks

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated workflow

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated tests

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated snapshot

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated UI; tests

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed tests; make notification optional

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* revert notification change

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* supporting array of key/value under selection (#803)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* Correlation rules field matching and time window support (#804)

* added ux for group by field and time window

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* improved validation

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* check for null values

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* addressed PR comments

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* validate fields only when group by enabled; update default window to 5 min (#810)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* do not send fields if empty (#817)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* Allow empty field name for supporting timeframe and keywords when validating rule during creation/update (#823)

* allow empty field name for supporting timeframe and keywords

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed cypress test

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed update payload (#838)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* add already mapped log index fields to list of options (#845)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
amsiglan added a commit to amsiglan/security-analytics-dashboards-plugin that referenced this pull request Feb 14, 2024
Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
@amsiglan amsiglan mentioned this pull request Feb 14, 2024
1 task
amsiglan added a commit that referenced this pull request Feb 14, 2024
* Make notifications optional (#796)

* Make notifications optional 2.11 (#770)

* Threat intel feed support for detector creation (#762)

* added threat intel feed support for detector creation

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated cypress workflow file

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated alerts; findings UX

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* refactored alert condition panel; update detector for intel feeds

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated snapshots, mocks

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated workflow

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated tests

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated snapshot

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* updated UI; tests

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed tests; make notification optional

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* revert notification change

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* supporting array of key/value under selection (#803)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* Correlation rules field matching and time window support (#804)

* added ux for group by field and time window

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* improved validation

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* check for null values

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* addressed PR comments

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* validate fields only when group by enabled; update default window to 5 min (#810)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* do not send fields if empty (#817)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* Allow empty field name for supporting timeframe and keywords when validating rule during creation/update (#823)

* allow empty field name for supporting timeframe and keywords

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed cypress test

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

* fixed update payload (#838)

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>

---------

Signed-off-by: Amardeepsingh Siglani <amardeep7194@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport 2.11 PRs to be backported to 2.11 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants