Compare commits

...

23 Commits
1.0 ... 1.1

Author SHA1 Message Date
Toni de la Fuente
765be03111 Merge pull request #53 from MrSecure/add-csv-out
Add csv output mode and code clean up
2017-06-27 10:11:18 -04:00
Ben Allen
94efa3028a clean up CSV output for 1.23 when multiple users match 2017-06-27 09:06:29 -05:00
Ben Allen
085ddae3b9 capture script start time using well supported date arguments 2017-06-27 08:52:55 -05:00
Ben Allen
8232a07437 clean up usage of expr 2017-06-26 17:06:17 -05:00
Ben Allen
e9122b3453 move CSV separator character to a variable 2017-06-26 16:50:57 -05:00
Ben Allen
43527302ac remove commas from output text 2017-06-26 16:45:17 -05:00
Ben Allen
85e620345c remove -b flag, since -M covers it 2017-06-26 16:35:56 -05:00
Ben Allen
8cba6df362 add output mode to README 2017-06-26 16:34:02 -05:00
Ben Allen
1eee23e4e1 documentation & formatting updates
* add M switch to help, readme
* remove title_id data from mono / color output lines
2017-06-26 16:21:07 -05:00
Ben Allen
e66bb7f1ab tiny output tweaks 2017-06-26 16:13:16 -05:00
Ben Allen
9a44414a8e more CSV tweaks
* handle multi-region tests cleanly
* clean up report generation info
2017-06-26 16:05:27 -05:00
Ben Allen
2f16ee4e6e add SCORED column to CSV output; handle section tiles properly 2017-06-26 15:40:28 -05:00
Ben Allen
acb889a267 Initial CSV Support
* rename text output functions to follow convention
* send appropriate data to stderr for progress monitoring
* send results to stdout in pipe-delimited format
* skip banner, etc. when running in CSV mode
2017-06-26 15:32:59 -05:00
Ben Allen
6334e19730 pull ID out of title, and pass it to text_title 2017-06-26 14:53:45 -05:00
Ben Allen
57034ab47d move titles from echo to output function 2017-06-26 13:42:00 -05:00
Ben Allen
f3be4f4c38 cleaning up output messages, clean up logic on chec14 2017-06-26 13:24:45 -05:00
Ben Allen
169eb51b0d switch WARNING output to use text_warn function 2017-06-26 13:09:46 -05:00
Ben Allen
a3a23eb8dc move output formatting functions up in file; use them earlier 2017-06-26 10:54:12 -05:00
Ben Allen
3fadc1cce1 convert NOTICE text to use output function 2017-06-26 10:48:56 -05:00
Ben Allen
029bce9b5b wrap all notice blocks to be single-line ready 2017-06-26 10:38:35 -05:00
Ben Allen
9bb8f0537a finish up first pass of conversion to text_ok for passed checks 2017-06-26 10:30:33 -05:00
Ben Allen
408cc78499 begin transition to function-based output - starting with OK responses for check1* 2017-06-26 10:26:56 -05:00
Ben Allen
045e88038f Clean up ordering; add Mode flag
refactor callCheck case statement to move cleanTemp && exit to end
move calls to functions to after all functions are defined
add -M flag to handle mode changing: text, mono, csv
2017-06-22 16:16:44 -05:00
2 changed files with 564 additions and 371 deletions

View File

@@ -79,6 +79,10 @@ or if you want a colored HTML report do:
pip install ansi2html
./prowler | ansi2html -la > report.html
```
or if you want a pipe-delimited report file, do:
```
./prowler -M csv > output.psv
```
5 - For help use:
@@ -93,7 +97,7 @@ USAGE:
-c <checknum> specify a check number or group from the AWS CIS benchmark (i.e.: check11 for check 1.1 or check3 for entire section 3)
-f <filterregion> specify an AWS region to run checks against (i.e.: us-west-1)
-m <maxitems> specify the maximum number of items to return for long-running requests (default: 100)
-b do not use colors in the output
-M <mode> output mode: text (defalut), mono, csv (separator is "|"; data is on stdout; progress on stderr)
-h this help
```

929
prowler

File diff suppressed because it is too large Load Diff