diff --git a/handlers/proxy.go b/handlers/proxy.go index bedfbde..e73c1a4 100644 --- a/handlers/proxy.go +++ b/handlers/proxy.go @@ -8,7 +8,9 @@ import ( "net/url" "os" "regexp" + "strconv" "strings" + "time" "ladder/pkg/ruleset" @@ -21,6 +23,7 @@ var ( ForwardedFor = getenv("X_FORWARDED_FOR", "66.249.66.1") rulesSet = ruleset.NewRulesetFromEnv() allowedDomains = []string{} + defaultTimeout = 15 // in seconds ) func init() { @@ -28,6 +31,9 @@ func init() { if os.Getenv("ALLOWED_DOMAINS_RULESET") == "true" { allowedDomains = append(allowedDomains, rulesSet.Domains()...) } + if timeoutStr := os.Getenv("HTTP_TIMEOUT"); timeoutStr != "" { + defaultTimeout, _ = strconv.Atoi(timeoutStr) + } } // extracts a URL from the request ctx. If the URL in the request @@ -181,7 +187,9 @@ func fetchSite(urlpath string, queries map[string]string) (string, *http.Request } // Fetch the site - client := &http.Client{} + client := &http.Client{ + Timeout: time.Second * time.Duration(defaultTimeout), + } req, _ := http.NewRequest("GET", url, nil) if rule.Headers.UserAgent != "" {