diff --git a/README.md b/README.md index ad58c57..6be4185 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,7 @@ Send 1000 GET requests to https://example.com with 10 parallel dodos (threads), "dodos": 10, "requests": 1000, "duration": "250s", + "skip_verify": false, "params": [ // A random value will be selected from the list for first "key1" param on each request @@ -162,6 +163,7 @@ timeout: "800ms" dodos: 10 requests: 1000 duration: "250s" +skip_verify: false params: # A random value will be selected from the list for first "key1" param on each request @@ -248,7 +250,7 @@ If `Headers`, `Params`, `Cookies`, `Body`, or `Proxy` fields have multiple value | Parameter | config file | CLI Flag | CLI Short Flag | Type | Description | Default | | --------------- | ----------- | ------------ | -------------- | ------------------------------ | ----------------------------------------------------------- | ------- | -| Config file | - | -config-file | -f | String | Path to local config file or http(s) URL of the config file | - | +| Config file | | -config-file | -f | String | Path to local config file or http(s) URL of the config file | - | | Yes | yes | -yes | -y | Boolean | Answer yes to all questions | false | | URL | url | -url | -u | String | URL to send the request to | - | | Method | method | -method | -m | String | HTTP method | GET | @@ -261,3 +263,4 @@ If `Headers`, `Params`, `Cookies`, `Body`, or `Proxy` fields have multiple value | Cookies | cookies | -cookie | -c | [{String: String OR [String]}] | Request cookies | - | | Body | body | -body | -b | String OR [String] | Request body or list of request bodies | - | | Proxy | proxies | -proxy | -x | String OR [String] | Proxy URL or list of proxy URLs | - | +| Skip Verify | skip_verify | -skip-verify | | Boolean | Skip SSL/TLS certificate verification | false | diff --git a/Taskfile.yaml b/Taskfile.yaml index f47e679..e8e2ff8 100644 --- a/Taskfile.yaml +++ b/Taskfile.yaml @@ -20,8 +20,16 @@ vars: tasks: run: go run main.go + ftl: + cmds: + - task: fmt + - task: tidy + - task: lint + fmt: gofmt -w -d . + tidy: go mod tidy + lint: golangci-lint run build: go build -ldflags "-s -w" -o "dodo" diff --git a/config.json b/config.json index 53c7a0e..66eb6d1 100644 --- a/config.json +++ b/config.json @@ -6,6 +6,7 @@ "dodos": 8, "requests": 1000, "duration": "10s", + "skip_verify": false, "params": [ { "key1": ["value1", "value2", "value3", "value4"] }, @@ -33,4 +34,4 @@ "socks5://example.com:8080", "socks5h://example.com:8080" ] -} \ No newline at end of file +} diff --git a/config.yaml b/config.yaml index d8353b0..78b929d 100644 --- a/config.yaml +++ b/config.yaml @@ -5,6 +5,7 @@ timeout: "5s" dodos: 8 requests: 1000 duration: "10s" +skip_verify: false params: - key1: ["value1", "value2", "value3", "value4"] diff --git a/config/cli.go b/config/cli.go index 48ae09c..997829a 100644 --- a/config/cli.go +++ b/config/cli.go @@ -31,7 +31,7 @@ Usage with all flags: -p "param1=value1" -param "param2=value2" \ -c "cookie1=value1" -cookie "cookie2=value2" \ -x "http://proxy.example.com:8080" -proxy "socks5://proxy2.example.com:8080" \ - -y + -skip-verify -y Flags: -h, -help help for dodo @@ -48,7 +48,8 @@ Flags: -p, -param [string] Parameter for the request (e.g. "key1=value1") -H, -header [string] Header for the request (e.g. "key1:value1") -c, -cookie [string] Cookie for the request (e.g. "key1=value1") - -x, -proxy [string] Proxy for the request (e.g. "http://proxy.example.com:8080")` + -x, -proxy [string] Proxy for the request (e.g. "http://proxy.example.com:8080") + -skip-verify bool Skip SSL/TLS certificate verification (default %v)` func (config *Config) ReadCLI() (types.ConfigFile, error) { flag.Usage = func() { @@ -58,6 +59,7 @@ func (config *Config) ReadCLI() (types.ConfigFile, error) { DefaultDodosCount, DefaultTimeout, DefaultMethod, + DefaultSkipVerify, ) } @@ -65,6 +67,7 @@ func (config *Config) ReadCLI() (types.ConfigFile, error) { version = false configFile = "" yes = false + skipVerify = false method = "" url types.RequestURL dodosCount = uint(0) @@ -83,6 +86,8 @@ func (config *Config) ReadCLI() (types.ConfigFile, error) { flag.BoolVar(&yes, "yes", false, "Answer yes to all questions") flag.BoolVar(&yes, "y", false, "Answer yes to all questions") + flag.BoolVar(&skipVerify, "skip-verify", false, "Skip SSL/TLS certificate verification") + flag.StringVar(&method, "method", "", "HTTP Method") flag.StringVar(&method, "m", "", "HTTP Method") @@ -149,6 +154,8 @@ func (config *Config) ReadCLI() (types.ConfigFile, error) { config.Timeout = &types.Timeout{Duration: timeout} case "yes", "y": config.Yes = utils.ToPtr(yes) + case "skip-verify": + config.SkipVerify = utils.ToPtr(skipVerify) } }) diff --git a/config/config.go b/config/config.go index 0e21772..8b9414f 100644 --- a/config/config.go +++ b/config/config.go @@ -15,7 +15,7 @@ import ( ) const ( - VERSION string = "0.6.4" + VERSION string = "0.6.5" DefaultUserAgent string = "Dodo/" + VERSION DefaultMethod string = "GET" DefaultTimeout time.Duration = time.Second * 10 @@ -23,6 +23,7 @@ const ( DefaultRequestCount uint = 0 DefaultDuration time.Duration = 0 DefaultYes bool = false + DefaultSkipVerify bool = false ) var SupportedProxySchemes []string = []string{"http", "socks5", "socks5h"} @@ -35,6 +36,7 @@ type RequestConfig struct { RequestCount uint Duration time.Duration Yes bool + SkipVerify bool Params types.Params Headers types.Headers Cookies types.Cookies @@ -51,6 +53,7 @@ func NewRequestConfig(conf *Config) *RequestConfig { RequestCount: *conf.RequestCount, Duration: conf.Duration.Duration, Yes: *conf.Yes, + SkipVerify: *conf.SkipVerify, Params: conf.Params, Headers: conf.Headers, Cookies: conf.Cookies, @@ -122,6 +125,8 @@ func (rc *RequestConfig) Print() { t.AppendRow(table.Row{"Proxy", rc.Proxies.String()}) t.AppendSeparator() t.AppendRow(table.Row{"Body", rc.Body.String()}) + t.AppendSeparator() + t.AppendRow(table.Row{"Skip Verify", rc.SkipVerify}) t.Render() } @@ -134,6 +139,7 @@ type Config struct { RequestCount *uint `json:"requests" yaml:"requests"` Duration *types.Duration `json:"duration" yaml:"duration"` Yes *bool `json:"yes" yaml:"yes"` + SkipVerify *bool `json:"skip_verify" yaml:"skip_verify"` Params types.Params `json:"params" yaml:"params"` Headers types.Headers `json:"headers" yaml:"headers"` Cookies types.Cookies `json:"cookies" yaml:"cookies"` @@ -220,6 +226,9 @@ func (config *Config) MergeConfig(newConfig *Config) { if newConfig.Yes != nil { config.Yes = newConfig.Yes } + if newConfig.SkipVerify != nil { + config.SkipVerify = newConfig.SkipVerify + } if len(newConfig.Params) != 0 { config.Params = newConfig.Params } @@ -256,5 +265,8 @@ func (config *Config) SetDefaults() { if config.Yes == nil { config.Yes = utils.ToPtr(DefaultYes) } + if config.SkipVerify == nil { + config.SkipVerify = utils.ToPtr(DefaultSkipVerify) + } config.Headers.SetIfNotExists("User-Agent", DefaultUserAgent) } diff --git a/requests/client.go b/requests/client.go index cffae25..4336a0c 100644 --- a/requests/client.go +++ b/requests/client.go @@ -18,11 +18,12 @@ type ClientGeneratorFunc func() *fasthttp.HostClient // getClients initializes and returns a slice of fasthttp.HostClient based on the provided parameters. // It can either return clients with proxies or a single client without proxies. func getClients( - ctx context.Context, + _ context.Context, timeout time.Duration, proxies []url.URL, maxConns uint, URL url.URL, + skipVerify bool, ) []*fasthttp.HostClient { isTLS := URL.Scheme == "https" @@ -43,7 +44,7 @@ func getClients( MaxConns: int(maxConns), IsTLS: isTLS, TLSConfig: &tls.Config{ - InsecureSkipVerify: true, + InsecureSkipVerify: skipVerify, }, Addr: addr, Dial: dialFunc, @@ -58,10 +59,10 @@ func getClients( } client := &fasthttp.HostClient{ - MaxConns: int(maxConns), - IsTLS: isTLS, + MaxConns: int(maxConns), + IsTLS: isTLS, TLSConfig: &tls.Config{ - InsecureSkipVerify: true, + InsecureSkipVerify: skipVerify, }, Addr: URL.Host, MaxIdleConnDuration: timeout, @@ -87,6 +88,11 @@ func getDialFunc(proxy *url.URL, timeout time.Duration) (fasthttp.DialFunc, erro default: return nil, errors.New("unsupported proxy scheme") } + + if dialer == nil { + return nil, errors.New("internal error: proxy dialer is nil") + } + return dialer, nil } diff --git a/requests/run.go b/requests/run.go index 5905ec3..3441533 100644 --- a/requests/run.go +++ b/requests/run.go @@ -32,6 +32,7 @@ func Run(ctx context.Context, requestConfig *config.RequestConfig) (Responses, e requestConfig.Proxies, requestConfig.GetMaxConns(fasthttp.DefaultMaxConnsPerHost), requestConfig.URL, + requestConfig.SkipVerify, ) if clients == nil { return nil, types.ErrInterrupt diff --git a/types/body.go b/types/body.go index 83f698f..4329b87 100644 --- a/types/body.go +++ b/types/body.go @@ -66,7 +66,7 @@ func (body *Body) UnmarshalJSON(b []byte) error { return nil } -func (body *Body) UnmarshalYAML(unmarshal func(interface{}) error) error { +func (body *Body) UnmarshalYAML(unmarshal func(any) error) error { var data any if err := unmarshal(&data); err != nil { return err diff --git a/types/cookies.go b/types/cookies.go index d6e1a68..c7d182f 100644 --- a/types/cookies.go +++ b/types/cookies.go @@ -99,7 +99,7 @@ func (cookies *Cookies) UnmarshalJSON(b []byte) error { return nil } -func (cookies *Cookies) UnmarshalYAML(unmarshal func(interface{}) error) error { +func (cookies *Cookies) UnmarshalYAML(unmarshal func(any) error) error { var raw []map[string]any if err := unmarshal(&raw); err != nil { return err diff --git a/types/duration.go b/types/duration.go index 814467f..5b79612 100644 --- a/types/duration.go +++ b/types/duration.go @@ -35,7 +35,7 @@ func (duration Duration) MarshalJSON() ([]byte, error) { return json.Marshal(duration.String()) } -func (duration *Duration) UnmarshalYAML(unmarshal func(interface{}) error) error { +func (duration *Duration) UnmarshalYAML(unmarshal func(any) error) error { var v any if err := unmarshal(&v); err != nil { return err diff --git a/types/headers.go b/types/headers.go index 616e021..dad080f 100644 --- a/types/headers.go +++ b/types/headers.go @@ -108,7 +108,7 @@ func (headers *Headers) UnmarshalJSON(b []byte) error { return nil } -func (headers *Headers) UnmarshalYAML(unmarshal func(interface{}) error) error { +func (headers *Headers) UnmarshalYAML(unmarshal func(any) error) error { var raw []map[string]any if err := unmarshal(&raw); err != nil { return err diff --git a/types/params.go b/types/params.go index ef5245b..598876d 100644 --- a/types/params.go +++ b/types/params.go @@ -99,7 +99,7 @@ func (params *Params) UnmarshalJSON(b []byte) error { return nil } -func (params *Params) UnmarshalYAML(unmarshal func(interface{}) error) error { +func (params *Params) UnmarshalYAML(unmarshal func(any) error) error { var raw []map[string]any if err := unmarshal(&raw); err != nil { return err diff --git a/types/proxies.go b/types/proxies.go index 6080482..7d8323d 100644 --- a/types/proxies.go +++ b/types/proxies.go @@ -75,7 +75,7 @@ func (proxies *Proxies) UnmarshalJSON(b []byte) error { return nil } -func (proxies *Proxies) UnmarshalYAML(unmarshal func(interface{}) error) error { +func (proxies *Proxies) UnmarshalYAML(unmarshal func(any) error) error { var data any if err := unmarshal(&data); err != nil { return err diff --git a/types/request_url.go b/types/request_url.go index 7594a9a..4553ec4 100644 --- a/types/request_url.go +++ b/types/request_url.go @@ -25,7 +25,7 @@ func (requestURL *RequestURL) UnmarshalJSON(data []byte) error { return nil } -func (requestURL *RequestURL) UnmarshalYAML(unmarshal func(interface{}) error) error { +func (requestURL *RequestURL) UnmarshalYAML(unmarshal func(any) error) error { var urlStr string if err := unmarshal(&urlStr); err != nil { return err diff --git a/types/timeout.go b/types/timeout.go index 6160e13..7d9e24a 100644 --- a/types/timeout.go +++ b/types/timeout.go @@ -35,7 +35,7 @@ func (timeout Timeout) MarshalJSON() ([]byte, error) { return json.Marshal(timeout.String()) } -func (timeout *Timeout) UnmarshalYAML(unmarshal func(interface{}) error) error { +func (timeout *Timeout) UnmarshalYAML(unmarshal func(any) error) error { var v any if err := unmarshal(&v); err != nil { return err