diff --git a/gobusterdir/gobusterdir.go b/gobusterdir/gobusterdir.go index 11527e88..fd545231 100644 --- a/gobusterdir/gobusterdir.go +++ b/gobusterdir/gobusterdir.go @@ -86,7 +86,7 @@ func New(globalopts *libgobuster.Options, opts *OptionsDir, logger *libgobuster. Method: opts.Method, } - h, err := libgobuster.NewHTTPClient(&httpOpts, globalopts.Debug, logger) + h, err := libgobuster.NewHTTPClient(&httpOpts, logger) if err != nil { return nil, err } diff --git a/gobusterfuzz/gobusterfuzz.go b/gobusterfuzz/gobusterfuzz.go index e7babaee..162bd39b 100644 --- a/gobusterfuzz/gobusterfuzz.go +++ b/gobusterfuzz/gobusterfuzz.go @@ -72,7 +72,7 @@ func New(globalopts *libgobuster.Options, opts *OptionsFuzz, logger *libgobuster Method: opts.Method, } - h, err := libgobuster.NewHTTPClient(&httpOpts, globalopts.Debug, logger) + h, err := libgobuster.NewHTTPClient(&httpOpts, logger) if err != nil { return nil, err } diff --git a/gobustergcs/gobustersgcs.go b/gobustergcs/gobustersgcs.go index c2d71a4d..f8636c80 100644 --- a/gobustergcs/gobustersgcs.go +++ b/gobustergcs/gobustersgcs.go @@ -57,7 +57,7 @@ func New(globalopts *libgobuster.Options, opts *OptionsGCS, logger *libgobuster. FollowRedirect: true, } - h, err := libgobuster.NewHTTPClient(&httpOpts, globalopts.Debug, logger) + h, err := libgobuster.NewHTTPClient(&httpOpts, logger) if err != nil { return nil, err } diff --git a/gobusters3/gobusters3.go b/gobusters3/gobusters3.go index 9cc5e12e..12f7f3c6 100644 --- a/gobusters3/gobusters3.go +++ b/gobusters3/gobusters3.go @@ -57,7 +57,7 @@ func New(globalopts *libgobuster.Options, opts *OptionsS3, logger *libgobuster.L FollowRedirect: true, } - h, err := libgobuster.NewHTTPClient(&httpOpts, globalopts.Debug, logger) + h, err := libgobuster.NewHTTPClient(&httpOpts, logger) if err != nil { return nil, err } diff --git a/gobustervhost/gobustervhost.go b/gobustervhost/gobustervhost.go index 029f30bf..1b50bde2 100644 --- a/gobustervhost/gobustervhost.go +++ b/gobustervhost/gobustervhost.go @@ -66,7 +66,7 @@ func New(globalopts *libgobuster.Options, opts *OptionsVhost, logger *libgobuste Method: opts.Method, } - h, err := libgobuster.NewHTTPClient(&httpOpts, globalopts.Debug, logger) + h, err := libgobuster.NewHTTPClient(&httpOpts, logger) if err != nil { return nil, err } diff --git a/libgobuster/http.go b/libgobuster/http.go index 1335352a..16a055ae 100644 --- a/libgobuster/http.go +++ b/libgobuster/http.go @@ -30,7 +30,6 @@ type HTTPClient struct { cookies string method string host string - debug bool logger *Logger } @@ -45,7 +44,7 @@ type RequestOptions struct { } // NewHTTPClient returns a new HTTPClient -func NewHTTPClient(opt *HTTPOptions, debug bool, logger *Logger) (*HTTPClient, error) { +func NewHTTPClient(opt *HTTPOptions, logger *Logger) (*HTTPClient, error) { var proxyURLFunc func(*http.Request) (*url.URL, error) var client HTTPClient proxyURLFunc = http.ProxyFromEnvironment @@ -107,7 +106,6 @@ func NewHTTPClient(opt *HTTPOptions, debug bool, logger *Logger) (*HTTPClient, e break } } - client.debug = debug client.logger = logger return &client, nil } @@ -205,7 +203,7 @@ func (client *HTTPClient) makeRequest(ctx context.Context, fullURL string, opts req.SetBasicAuth(client.username, client.password) } - if client.debug { + if client.logger.debug { dump, err := httputil.DumpRequestOut(req, false) if err != nil { return nil, err diff --git a/libgobuster/http_test.go b/libgobuster/http_test.go index 245f07c3..5d5c65ef 100644 --- a/libgobuster/http_test.go +++ b/libgobuster/http_test.go @@ -52,7 +52,7 @@ func TestRequest(t *testing.T) { defer h.Close() var o HTTPOptions log := NewLogger(false) - c, err := NewHTTPClient(&o, false, log) + c, err := NewHTTPClient(&o, log) if err != nil { t.Fatalf("Got Error: %v", err) } @@ -80,7 +80,7 @@ func BenchmarkRequestWithoutBody(b *testing.B) { defer h.Close() var o HTTPOptions log := NewLogger(false) - c, err := NewHTTPClient(&o, false, log) + c, err := NewHTTPClient(&o, log) if err != nil { b.Fatalf("Got Error: %v", err) } @@ -101,7 +101,7 @@ func BenchmarkRequestWitBody(b *testing.B) { defer h.Close() var o HTTPOptions log := NewLogger(false) - c, err := NewHTTPClient(&o, false, log) + c, err := NewHTTPClient(&o, log) if err != nil { b.Fatalf("Got Error: %v", err) } @@ -123,7 +123,7 @@ func BenchmarkNewHTTPClient(b *testing.B) { var o HTTPOptions log := NewLogger(false) for x := 0; x < b.N; x++ { - _, err := NewHTTPClient(&o, false, log) + _, err := NewHTTPClient(&o, log) if err != nil { b.Fatalf("Got Error: %v", err) }