feat: AWS CloudTrail search command #117
Merged
Conversation
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
fukusuket
changed the title
fukusuket
changed the title
Contributor
There was a problem hiding this comment.
Pull request overview
This PR implements a new AWS CloudTrail search command that allows users to search and filter CloudTrail logs without requiring Sigma rules. The implementation refactors common CLI options into reusable structs and updates the GeoIP integration to use a newer maxminddb API.
Key changes:
- Added
aws-ct-searchcommand with filtering by fields, keywords, regex, and time ranges - Refactored CLI options to create reusable
OutputOptionandSearchOptionsstructs - Updated GeoIP lookups to use the newer maxminddb
lookup().decode()API pattern
Reviewed changes
Copilot reviewed 10 out of 11 changed files in this pull request and generated 5 comments.
Show a summary per file
| File | Description |
|---|---|
src/cmd/aws/aws_search.rs |
New search command implementation with filter/keyword/regex support and comprehensive unit tests |
src/cmd/aws.rs |
Registers the new aws_search module |
src/option/cli.rs |
Refactors output-related options into OutputOption struct and adds SearchOptions with display_order for consistent help text |
src/main.rs |
Integrates AwsCtSearch command with validation and dispatching logic |
src/core/util.rs |
Extracts load_profile function with skip_sigma parameter for reuse across commands |
src/core/timeline.rs |
Updates to use refactored OutputOption and new load_profile signature |
src/core/timeline_writer.rs |
Supports optional rules by changing write_record to accept Option<&Rule> |
src/core/scan.rs |
Updates to use refactored options.output_opt structure |
src/option/geoip.rs |
Updates GeoIP API usage from lookup::<T>() to lookup().decode::<T>() pattern |
Cargo.toml |
Adds regex = "1" dependency for regex search functionality |
Cargo.lock |
Updates dependency versions including regex and various transitive dependencies |
Comments suppressed due to low confidence (2)
src/option/geoip.rs:111
- The country value is not being cached when lookup succeeds but decode fails. When
country.decode()returnsErrorOk(None), the function returns "-" without caching this result. This means subsequent lookups for the same IP will repeatedly attempt to decode, which is inefficient. Consider caching the "-" result as well to avoid redundant lookups.
match self.country.lookup(ip) {
Ok(country) => {
let mut ret = "-";
if let Ok(Some(country)) = country.decode::<geoip2::Country>() {
let name_tree = country.country.names;
ret = name_tree.english.unwrap_or("")
}
ret.to_string()
}
_ => "-".to_string(),
}
src/option/geoip.rs:131
- The city value is not being cached when lookup succeeds but decode fails. When
city.decode()returnsErrorOk(None), the function returns "-" without caching this result. This means subsequent lookups for the same IP will repeatedly attempt to decode, which is inefficient. Consider caching the "-" result as well to avoid redundant lookups.
match self.city.lookup(ip) {
Ok(city) => {
let mut ret = "-";
if let Ok(Some(city)) = city.decode::<geoip2::City>() {
let name_tree = city.city.names;
ret = name_tree.english.unwrap_or("")
}
ret.to_string()
}
_ => "-".to_string(),
}
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot <[email protected]>
Co-authored-by: Copilot <[email protected]>
Collaborator
Author
help |
Collaborator
Author
-k, --keyword |
Collaborator
Author
-r, --regex |
Collaborator
Author
-F, --filter |
Collaborator
Author
-t, --output-type (5: CSV & JSONL) |
Collaborator
Author
-G, --geo-ip |
YamatoSecurity
approved these changes
Dec 7, 2025
Contributor
YamatoSecurity
left a comment
YamatoSecurity
left a comment
There was a problem hiding this comment.
@fukusuket LGTM! Thanks so much!!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
What Changed
aws-ct-searchcommand #55Evidence
Integration-Test
I’d appreciate it if you could check it when you have time🙏