From 46a8e38d943c505784b348b7c59d19918d77e64a Mon Sep 17 00:00:00 2001 From: Ivan Novikov Date: Sun, 2 Jul 2023 23:24:47 +0000 Subject: [PATCH 1/3] Make output response fields public so they can be specified if httpx used as a library. --- runner/options.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/runner/options.go b/runner/options.go index d2b30e09..5a34e768 100644 --- a/runner/options.go +++ b/runner/options.go @@ -190,8 +190,8 @@ type Options struct { NoColor bool OutputServerHeader bool OutputWebSocket bool - responseInStdout bool - base64responseInStdout bool + ResponseInStdout bool + Base64responseInStdout bool chainInStdout bool FollowHostRedirects bool MaxRedirects int @@ -376,8 +376,8 @@ func ParseOptions() *Options { flagSet.BoolVar(&options.CSVOutput, "csv", false, "store output in csv format"), flagSet.StringVarP(&options.CSVOutputEncoding, "csv-output-encoding", "csvo", "", "define output encoding"), flagSet.BoolVar(&options.JSONOutput, "json", false, "store output in JSONL(ines) format"), - flagSet.BoolVarP(&options.responseInStdout, "include-response", "irr", false, "include http request/response in JSON output (-json only)"), - flagSet.BoolVarP(&options.base64responseInStdout, "include-response-base64", "irrb", false, "include base64 encoded http request/response in JSON output (-json only)"), + flagSet.BoolVarP(&options.ResponseInStdout, "include-response", "irr", false, "include http request/response in JSON output (-json only)"), + flagSet.BoolVarP(&options.Base64responseInStdout, "include-response-base64", "irrb", false, "include base64 encoded http request/response in JSON output (-json only)"), flagSet.BoolVar(&options.chainInStdout, "include-chain", false, "include redirect http chain in JSON output (-json only)"), flagSet.BoolVar(&options.StoreChain, "store-chain", false, "include http redirect chain in responses (-sr only)"), ) From e7e70b2275292bbc3abcb236a3848e53db659006 Mon Sep 17 00:00:00 2001 From: Ivan Novikov Date: Mon, 3 Jul 2023 10:34:10 +0000 Subject: [PATCH 2/3] Fix runner.go to use renamed params. --- runner/runner.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runner/runner.go b/runner/runner.go index 2ce2710e..1cfc6aac 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -204,8 +204,8 @@ func New(options *Options) (*Runner, error) { scanopts.StoreResponseDirectory = options.StoreResponseDir scanopts.OutputServerHeader = options.OutputServerHeader scanopts.OutputWithNoColor = options.NoColor - scanopts.ResponseInStdout = options.responseInStdout - scanopts.Base64ResponseInStdout = options.base64responseInStdout + scanopts.ResponseInStdout = options.ResponseInStdout + scanopts.Base64ResponseInStdout = options.Base64responseInStdout scanopts.ChainInStdout = options.chainInStdout scanopts.OutputWebSocket = options.OutputWebSocket scanopts.TLSProbe = options.TLSProbe From 379ec1d8e79d11edc09a8cdbda71f2d8e62cd20d Mon Sep 17 00:00:00 2001 From: mzack Date: Wed, 19 Jul 2023 14:31:01 +0200 Subject: [PATCH 3/3] renaming var --- runner/options.go | 4 ++-- runner/runner.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/runner/options.go b/runner/options.go index 5a34e768..9ad91614 100644 --- a/runner/options.go +++ b/runner/options.go @@ -191,7 +191,7 @@ type Options struct { OutputServerHeader bool OutputWebSocket bool ResponseInStdout bool - Base64responseInStdout bool + Base64ResponseInStdout bool chainInStdout bool FollowHostRedirects bool MaxRedirects int @@ -377,7 +377,7 @@ func ParseOptions() *Options { flagSet.StringVarP(&options.CSVOutputEncoding, "csv-output-encoding", "csvo", "", "define output encoding"), flagSet.BoolVar(&options.JSONOutput, "json", false, "store output in JSONL(ines) format"), flagSet.BoolVarP(&options.ResponseInStdout, "include-response", "irr", false, "include http request/response in JSON output (-json only)"), - flagSet.BoolVarP(&options.Base64responseInStdout, "include-response-base64", "irrb", false, "include base64 encoded http request/response in JSON output (-json only)"), + flagSet.BoolVarP(&options.Base64ResponseInStdout, "include-response-base64", "irrb", false, "include base64 encoded http request/response in JSON output (-json only)"), flagSet.BoolVar(&options.chainInStdout, "include-chain", false, "include redirect http chain in JSON output (-json only)"), flagSet.BoolVar(&options.StoreChain, "store-chain", false, "include http redirect chain in responses (-sr only)"), ) diff --git a/runner/runner.go b/runner/runner.go index 1cfc6aac..536bedce 100644 --- a/runner/runner.go +++ b/runner/runner.go @@ -205,7 +205,7 @@ func New(options *Options) (*Runner, error) { scanopts.OutputServerHeader = options.OutputServerHeader scanopts.OutputWithNoColor = options.NoColor scanopts.ResponseInStdout = options.ResponseInStdout - scanopts.Base64ResponseInStdout = options.Base64responseInStdout + scanopts.Base64ResponseInStdout = options.Base64ResponseInStdout scanopts.ChainInStdout = options.chainInStdout scanopts.OutputWebSocket = options.OutputWebSocket scanopts.TLSProbe = options.TLSProbe