From 011c7a7774fff1feda867f57d1bc4a238d8e917d Mon Sep 17 00:00:00 2001 From: Aykhan Shahsuvarov Date: Fri, 22 Nov 2024 23:58:17 +0400 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Added=20'no-proxy-check'=20paramete?= =?UTF-8?q?r?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/config.go | 20 +++++++++++++++----- main.go | 1 + readers/cli.go | 10 +++++++++- readers/json.go | 9 +++++++-- requests/client.go | 33 ++++++++++++++++++++++++++++++++- requests/run.go | 4 ++++ 6 files changed, 68 insertions(+), 9 deletions(-) diff --git a/config/config.go b/config/config.go index 37c65ce..48bf7ac 100644 --- a/config/config.go +++ b/config/config.go @@ -37,6 +37,7 @@ type RequestConfig struct { Proxies []Proxy Body []string Yes bool + NoProxyCheck bool } func (config *RequestConfig) Print() { @@ -66,6 +67,8 @@ func (config *RequestConfig) Print() { t.AppendSeparator() t.AppendRow(table.Row{"Proxies Count", len(config.Proxies)}) t.AppendSeparator() + t.AppendRow(table.Row{"Proxy Check", !config.NoProxyCheck}) + t.AppendSeparator() t.AppendRow(table.Row{"Body", utils.MarshalJSON(config.Body, 3)}) t.Render() @@ -87,11 +90,12 @@ func (config *RequestConfig) GetMaxConns(minConns uint) uint { } type Config struct { - Method string `json:"method" validate:"http_method"` // custom validations: http_method - URL string `json:"url" validate:"http_url,required"` - Timeout uint32 `json:"timeout" validate:"gte=1,lte=100000"` - DodosCount uint `json:"dodos_count" validate:"gte=1"` - RequestCount uint `json:"request_count" validation_name:"request-count" validate:"gte=1"` + Method string `json:"method" validate:"http_method"` // custom validations: http_method + URL string `json:"url" validate:"http_url,required"` + Timeout uint32 `json:"timeout" validate:"gte=1,lte=100000"` + DodosCount uint `json:"dodos_count" validate:"gte=1"` + RequestCount uint `json:"request_count" validation_name:"request-count" validate:"gte=1"` + NoProxyCheck utils.Option[bool] `json:"no_proxy_check"` } func (config *Config) MergeConfigs(newConfig *Config) { @@ -110,6 +114,9 @@ func (config *Config) MergeConfigs(newConfig *Config) { if newConfig.RequestCount != 0 { config.RequestCount = newConfig.RequestCount } + if !newConfig.NoProxyCheck.IsNone() { + config.NoProxyCheck = newConfig.NoProxyCheck + } } func (config *Config) SetDefaults() { @@ -125,6 +132,9 @@ func (config *Config) SetDefaults() { if config.RequestCount == 0 { config.RequestCount = DefaultRequestCount } + if config.NoProxyCheck.IsNone() { + config.NoProxyCheck = utils.NewOption(false) + } } type Proxy struct { diff --git a/main.go b/main.go index 1b5baec..b911f72 100644 --- a/main.go +++ b/main.go @@ -81,6 +81,7 @@ func main() { Proxies: jsonConf.Proxies, Body: jsonConf.Body, Yes: cliConf.Yes, + NoProxyCheck: *conf.NoProxyCheck.ValueOrPanic(), } requestConf.Print() if !cliConf.Yes { diff --git a/readers/cli.go b/readers/cli.go index 3880a1d..8aae3ea 100644 --- a/readers/cli.go +++ b/readers/cli.go @@ -13,10 +13,15 @@ import ( func CLIConfigReader() (*config.CLIConfig, error) { var ( returnNil = false - cliConfig = &config.CLIConfig{} + cliConfig = &config.CLIConfig{ + Config: config.Config{ + NoProxyCheck: utils.NewNoneOption[bool](), + }, + } dodosCount uint requestCount uint timeout uint32 + noProxyCheck bool rootCmd = &cobra.Command{ Use: "dodo [flags]", Example: ` Simple usage only with URL: @@ -51,6 +56,7 @@ func CLIConfigReader() (*config.CLIConfig, error) { rootCmd.Flags().UintVarP(&dodosCount, "dodos-count", "d", config.DefaultDodosCount, "Number of dodos(threads)") rootCmd.Flags().UintVarP(&requestCount, "request-count", "r", config.DefaultRequestCount, "Number of total requests") rootCmd.Flags().Uint32VarP(&timeout, "timeout", "t", config.DefaultTimeout, "Timeout for each request in milliseconds") + rootCmd.Flags().BoolVarP(&noProxyCheck, "no-proxy-check", "n", false, "Do not check for proxy") if err := rootCmd.Execute(); err != nil { utils.PrintErr(err) rootCmd.Println(rootCmd.UsageString()) @@ -68,6 +74,8 @@ func CLIConfigReader() (*config.CLIConfig, error) { cliConfig.RequestCount = requestCount case "timeout": cliConfig.Timeout = timeout + case "no-proxy-check": + cliConfig.NoProxyCheck = utils.NewOption(noProxyCheck) } }) if returnNil { diff --git a/readers/json.go b/readers/json.go index cf8725e..f88aca5 100644 --- a/readers/json.go +++ b/readers/json.go @@ -5,7 +5,8 @@ import ( "os" "github.com/aykhans/dodo/config" - "github.com/aykhans/dodo/custom_errors" + customerrors "github.com/aykhans/dodo/custom_errors" + "github.com/aykhans/dodo/utils" ) func JSONConfigReader(filePath string) (*config.JSONConfig, error) { @@ -13,7 +14,11 @@ func JSONConfigReader(filePath string) (*config.JSONConfig, error) { if err != nil { return nil, customerrors.OSErrorFormater(err) } - jsonConf := &config.JSONConfig{} + jsonConf := &config.JSONConfig{ + Config: config.Config{ + NoProxyCheck: utils.NewNoneOption[bool](), + }, + } err = json.Unmarshal(data, &jsonConf) if err != nil { diff --git a/requests/client.go b/requests/client.go index 52fef8d..da6010c 100644 --- a/requests/client.go +++ b/requests/client.go @@ -26,11 +26,42 @@ func getClients( dodosCount uint, maxConns uint, yes bool, + noProxyCheck bool, URL *url.URL, ) []*fasthttp.HostClient { isTLS := URL.Scheme == "https" - if len(proxies) > 0 { + if proxiesLen := len(proxies); proxiesLen > 0 { + // If noProxyCheck is true, we will return the clients without checking the proxies. + if noProxyCheck { + clients := make([]*fasthttp.HostClient, 0, proxiesLen) + addr := URL.Host + if isTLS && URL.Port() == "" { + addr += ":443" + } + + for _, proxy := range proxies { + dialFunc, err := getDialFunc(&proxy, timeout) + if err != nil { + continue + } + + clients = append(clients, &fasthttp.HostClient{ + MaxConns: int(maxConns), + IsTLS: isTLS, + Addr: addr, + Dial: dialFunc, + MaxIdleConnDuration: timeout, + MaxConnDuration: timeout, + WriteTimeout: timeout, + ReadTimeout: timeout, + }, + ) + } + return clients + } + + // Else, we will check the proxies and return the active ones. activeProxyClients := getActiveProxyClients( ctx, proxies, timeout, dodosCount, maxConns, URL, ) diff --git a/requests/run.go b/requests/run.go index c1ae2bc..3b2407a 100644 --- a/requests/run.go +++ b/requests/run.go @@ -2,6 +2,7 @@ package requests import ( "context" + "fmt" "sync" "time" @@ -24,6 +25,8 @@ import ( // - Responses: A collection of responses from the executed requests. // - error: An error if the operation fails, such as no internet connection or an interrupt. func Run(ctx context.Context, requestConfig *config.RequestConfig) (Responses, error) { + fmt.Println("No Proxy Check:", requestConfig.NoProxyCheck) + checkConnectionCtx, checkConnectionCtxCancel := context.WithTimeout(ctx, 8*time.Second) if !checkConnection(checkConnectionCtx) { checkConnectionCtxCancel() @@ -38,6 +41,7 @@ func Run(ctx context.Context, requestConfig *config.RequestConfig) (Responses, e requestConfig.GetValidDodosCountForProxies(), requestConfig.GetMaxConns(fasthttp.DefaultMaxConnsPerHost), requestConfig.Yes, + requestConfig.NoProxyCheck, requestConfig.URL, ) if clients == nil {