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

fixed search command line options associate #1261

Merged
merged 3 commits into from
Feb 2, 2024

Conversation

hitenkoku
Copy link
Collaborator

What Changed

  • added required option filter in search command
  • added conflict command filter in multiple row and json/jsonl output

Evidence

❯ ./1257.exe search -d ../hayabusa-sample-evtx
error: the following required arguments were not provided:
  <--keyword <KEYWORD...>|--regex <REGEX>>

Usage: 1257.exe search <--directory <DIR>|--file <FILE>|--live-analysis> <--keyword <KEYWORD...>|--regex <REGEX>>
  • checked conflict multiline option to JSON-output and JSONL-output.
> ./1257.exe search -d ../hayabusa-sample-evtx -M -o test.jsonl -J
error: the argument '--multiline' cannot be used with '--JSON-output'

Usage: 1257.exe search --multiline --output <FILE> <--directory <DIR>|--file <FILE>|--live-analysis> <--keyword <KEYWORD...>|--regex <REGEX>>
> ./1257.exe search -d ../hayabusa-sample-evtx -M -o test.jsonl -L
error: the argument '--multiline' cannot be used with '--JSONL-output'

Usage: 1257.exe search --multiline --output <FILE> <--directory <DIR>|--file <FILE>|--live-analysis> <--keyword <KEYWORD...>|--regex <REGEX>>

I would appreciate it if you could review when you have time.

@hitenkoku hitenkoku linked an issue Feb 1, 2024 that may be closed by this pull request
@hitenkoku hitenkoku self-assigned this Feb 1, 2024
@hitenkoku hitenkoku added the invalid This doesn't seem right label Feb 1, 2024
Copy link
Collaborator

@fukusuket fukusuket left a comment

Choose a reason for hiding this comment

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

I confirmed the success of the Integration-Test below :) LGTM!!🚀
https://github.com/Yamato-Security/hayabusa/actions/runs/7748410799

Copy link
Collaborator

@YamatoSecurity YamatoSecurity left a comment

Choose a reason for hiding this comment

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

@hitenkoku Thanks so much! LGTM! I just added a clarification to the help menu to say the option is for CSV output.

Copy link

codecov bot commented Feb 1, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (812c56b) 82.20% compared to head (5397061) 82.20%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #1261   +/-   ##
=======================================
  Coverage   82.20%   82.20%           
=======================================
  Files          27       27           
  Lines       24305    24305           
=======================================
  Hits        19981    19981           
  Misses       4324     4324           

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

@hitenkoku
Copy link
Collaborator Author

@YamatoSecurity @fukusuket Thanks for review. I will merge it.

@hitenkoku hitenkoku merged commit 19c8c06 into main Feb 2, 2024
7 checks passed
@hitenkoku hitenkoku deleted the 1257-make-search-command-line-options-stricter branch February 2, 2024 00:12
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
invalid This doesn't seem right
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Make search command line options stricter
3 participants