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.

Sign up for GitHub

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

Jump to bottom

Allow to show response headers in json output without using -irh option #1326

Merged
merged 8 commits into from
Sep 11, 2023
Merged

Allow to show response headers in json output without using -irh option #1326

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
3d004d2
Show responses headers in JSON output
JoshuaMart Aug 18, 2023
b86c6af
Update ident
JoshuaMart Aug 18, 2023
4343074
Update options name
JoshuaMart Aug 18, 2023
5bedd79
Update option & README
JoshuaMart Aug 18, 2023
0e549f1
Add missing 's'
JoshuaMart Sep 1, 2023
e32b88a
Add missing 's'
JoshuaMart Sep 1, 2023
e7a1599
updated headers to header for user facing variable to keep it uniform
ehsandeep Sep 7, 2023
7274291
updating doc
Mzack9999 Sep 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,8 @@ OUTPUT:
-csv store output in csv format
-csvo, -csv-output-encoding string define output encoding
-json store output in JSONL(ines) format
-irr, -include-response include http request/response in JSON output (-json only)
-irh, -include-response-header include http response (headers) in JSON output (-json only)
-irr, -include-response include http request/response (headers + body) in JSON output (-json only)
-irrb, -include-response-base64 include base64 encoded http request/response in JSON output (-json only)
-include-chain include redirect http chain in JSON output (-json only)
-store-chain include http redirect chain in responses (-sr only)
Expand Down
6 changes: 5 additions & 1 deletion runner/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ type ScanOptions struct {
OutputWebSocket bool
OutputWithNoColor bool
OutputMethod bool
ResponseHeadersInStdout bool
ResponseInStdout bool
Base64ResponseInStdout bool
ChainInStdout bool
Expand Down Expand Up @@ -104,6 +105,7 @@ func (s *ScanOptions) Clone() *ScanOptions {
OutputWebSocket: s.OutputWebSocket,
OutputWithNoColor: s.OutputWithNoColor,
OutputMethod: s.OutputMethod,
ResponseHeadersInStdout: s.ResponseHeadersInStdout,
ResponseInStdout: s.ResponseInStdout,
Base64ResponseInStdout: s.Base64ResponseInStdout,
ChainInStdout: s.ChainInStdout,
Expand Down Expand Up @@ -192,6 +194,7 @@ type Options struct {
NoColor bool
OutputServerHeader bool
OutputWebSocket bool
ResponseHeadersInStdout bool
ResponseInStdout bool
Base64ResponseInStdout bool
chainInStdout bool
Expand Down Expand Up @@ -381,7 +384,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.ResponseHeadersInStdout, "include-response-header", "irh", false, "include http response (headers) in JSON output (-json only)"),
flagSet.BoolVarP(&options.ResponseInStdout, "include-response", "irr", false, "include http request/response (headers + body) 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)"),
Expand Down
31 changes: 18 additions & 13 deletions runner/runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,7 @@ func New(options *Options) (*Runner, error) {
scanopts.StoreResponse = options.StoreResponse
scanopts.StoreResponseDirectory = options.StoreResponseDir
scanopts.OutputServerHeader = options.OutputServerHeader
scanopts.ResponseHeadersInStdout = options.ResponseHeadersInStdout
scanopts.OutputWithNoColor = options.NoColor
scanopts.ResponseInStdout = options.ResponseInStdout
scanopts.Base64ResponseInStdout = options.Base64ResponseInStdout
Expand Down Expand Up @@ -675,14 +676,14 @@ func (r *Runner) RunEnumeration() {
default: // unknown encoding
gologger.Fatal().Msgf("unknown csv output encoding: %s\n", r.options.CSVOutputEncoding)
}
header := Result{}.CSVHeader()
headers := Result{}.CSVHeader()
if !r.options.OutputAll && !jsonAndCsv {
gologger.Silent().Msgf("%s\n", header)
gologger.Silent().Msgf("%s\n", headers)
}

if csvFile != nil {
//nolint:errcheck // this method needs a small refactor to reduce complexity
csvFile.WriteString(header + "\n")
csvFile.WriteString(headers + "\n")
}
}
if r.options.StoreResponseDir != "" {
Expand Down Expand Up @@ -1519,12 +1520,16 @@ retry:
}

var (
serverResponseRaw string
request string
rawResponseHeader string
responseHeader map[string]interface{}
serverResponseRaw string
request string
rawResponseHeaders string
responseHeaders map[string]interface{}
)

if scanopts.ResponseHeadersInStdout {
responseHeaders = normalizeHeaders(resp.Headers)
}

respData := string(resp.Data)
if r.options.NoDecode {
respData = string(resp.RawData)
Expand All @@ -1533,13 +1538,13 @@ retry:
if scanopts.ResponseInStdout || r.options.OutputMatchCondition != "" || r.options.OutputFilterCondition != "" {
serverResponseRaw = string(respData)
request = string(requestDump)
responseHeader = normalizeHeaders(resp.Headers)
rawResponseHeader = resp.RawHeaders
responseHeaders = normalizeHeaders(resp.Headers)
rawResponseHeaders = resp.RawHeaders
} else if scanopts.Base64ResponseInStdout {
serverResponseRaw = stringz.Base64([]byte(respData))
request = stringz.Base64(requestDump)
responseHeader = normalizeHeaders(resp.Headers)
rawResponseHeader = stringz.Base64([]byte(resp.RawHeaders))
responseHeaders = normalizeHeaders(resp.Headers)
rawResponseHeaders = stringz.Base64([]byte(resp.RawHeaders))
}

// check for virtual host
Expand Down Expand Up @@ -1882,8 +1887,8 @@ retry:
result := Result{
Timestamp: time.Now(),
Request: request,
ResponseHeader: responseHeader,
RawHeader: rawResponseHeader,
ResponseHeaders: responseHeaders,
RawHeaders: rawResponseHeaders,
Scheme: parsed.Scheme,
Port: finalPort,
Path: finalPath,
Expand Down
6 changes: 3 additions & 3 deletions runner/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ type Result struct {
FavIconMMH3 string `json:"favicon,omitempty" csv:"favicon"`
FaviconPath string `json:"favicon_path,omitempty" csv:"favicon_path"`
FinalURL string `json:"final_url,omitempty" csv:"final_url"`
ResponseHeader map[string]interface{} `json:"header,omitempty" csv:"header"`
RawHeader string `json:"raw_header,omitempty" csv:"raw_header"`
ResponseHeaders map[string]interface{} `json:"header,omitempty" csv:"header"`
RawHeaders string `json:"raw_header,omitempty" csv:"raw_header"`
Request string `json:"request,omitempty" csv:"request"`
ResponseTime string `json:"time,omitempty" csv:"time"`
Jarm string `json:"jarm,omitempty" csv:"jarm"`
Expand Down Expand Up @@ -83,7 +83,7 @@ type Result struct {
// function to get dsl variables from result struct
func dslVariables() ([]string, error) {
fakeResult := Result{}
fieldsToIgnore := []string{"Hashes", "ResponseHeader", "Err", "KnowledgeBase"}
fieldsToIgnore := []string{"Hashes", "ResponseHeaders", "Err", "KnowledgeBase"}
if err := faker.FakeData(&fakeResult, options.WithFieldsToIgnore(fieldsToIgnore...)); err != nil {
return nil, err
}
Expand Down
Loading