addressing resource retention issues

Author: caffix

internal/net/http/http.go

@@ -12,8 +12,6 @@ import (
 	"io"
 	"net"
 	"net/http"
-	"net/http/cookiejar"
-	"net/url"
 	"regexp"
 	"runtime"
 	"strconv"
@@ -83,20 +81,22 @@ type BasicAuth struct {
 }
 
 func init() {
-	jar, _ := cookiejar.New(nil)
 	DefaultClient = &http.Client{
 		Timeout: httpTimeout,
 		Transport: &http.Transport{
 			Proxy:                 http.ProxyFromEnvironment,
 			DialContext:           amassnet.DialContext,
-			MaxIdleConns:          200,
-			MaxConnsPerHost:       50,
+			ForceAttemptHTTP2:     false,
+			MaxIdleConns:          128,
+			MaxConnsPerHost:       8,
+			MaxIdleConnsPerHost:   1,
 			IdleConnTimeout:       10 * time.Second,
 			TLSHandshakeTimeout:   handshakeTimeout,
-			ExpectContinueTimeout: 5 * time.Second,
+			ResponseHeaderTimeout: 5 * time.Second,
+			ExpectContinueTimeout: 1 * time.Second,
 			TLSClientConfig:       &tls.Config{InsecureSkipVerify: true},
 		},
-		Jar: jar,
+		Jar: nil,
 	}
 
 	switch runtime.GOOS {
@@ -170,28 +170,6 @@ func RespToAmassResponse(resp *http.Response) *Response {
 	}
 }
 
-// CopyCookies copies cookies from one domain to another. Some of our data
-// sources rely on shared auth tokens and this avoids sending extra requests
-// to have the site reissue cookies for the other domains.
-func CopyCookies(src string, dest string) {
-	srcURL, _ := url.Parse(src)
-	destURL, _ := url.Parse(dest)
-	DefaultClient.Jar.SetCookies(destURL, DefaultClient.Jar.Cookies(srcURL))
-}
-
-// CheckCookie checks if a cookie exists in the cookie jar for a given host
-func CheckCookie(urlString string, cookieName string) bool {
-	cookieURL, _ := url.Parse(urlString)
-	found := false
-	for _, cookie := range DefaultClient.Jar.Cookies(cookieURL) {
-		if cookie.Name == cookieName {
-			found = true
-			break
-		}
-	}
-	return found
-}
-
 // RequestWebPage returns the response headers, body, and status code for the provided URL when successful.
 func RequestWebPage(ctx context.Context, r *Request) (*Response, error) {
 	if r == nil {

internal/net/http/http_test.go

@@ -19,70 +19,6 @@ import (
 	amassdns "github.com/owasp-amass/amass/v5/internal/net/dns"
 )
 
-func TestCopyCookies(t *testing.T) {
-	u, _ := url.Parse("http://owasp.org")
-	DefaultClient.Jar.SetCookies(u, []*http.Cookie{{
-		Name:  "Test",
-		Value: "Cookie",
-	}})
-	CopyCookies("http://owasp.org", "http://example.com")
-
-	u2, _ := url.Parse("http://example.com")
-	if c := DefaultClient.Jar.Cookies(u2); len(c) == 0 || c[0].Value != "Cookie" {
-		t.Error("Failed to copy the cookie")
-	}
-}
-
-func TestCheckCookie(t *testing.T) {
-	type args struct {
-		urlString  string
-		cookieName string
-	}
-	tests := []struct {
-		name string
-		init func()
-		args args
-		want bool
-	}{
-		{
-			name: "basic-success",
-			init: func() {
-				sampleURL, err := url.Parse("http://owasp.org")
-				if err != nil {
-					t.Errorf("CheckCookie() parse error: got error = %v", err)
-				}
-
-				cookies := []*http.Cookie{{Name: "cookie1", Value: "sample cookie value"}}
-				DefaultClient.Jar.SetCookies(sampleURL, cookies)
-
-			},
-			args: args{
-				urlString:  "https://owasp.org",
-				cookieName: "cookie1",
-			},
-			want: true,
-		},
-		{
-			name: "basic-failure",
-			init: func() {},
-			args: args{
-				urlString:  "http://domain.local",
-				cookieName: "cookie2",
-			},
-			want: false,
-		},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			tt.init()
-			if got := CheckCookie(tt.args.urlString, tt.args.cookieName); got != tt.want {
-				t.Errorf("CheckCookie() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
-
 func TestRequestWebPage(t *testing.T) {
 	name := "caffix"
 	pass := "OWASP"

internal/net/network.go

@@ -11,6 +11,7 @@ import (
 	"net"
 	"strconv"
 	"strings"
+	"time"
 )
 
 // IPv4RE is a regular expression that will match an IPv4 address.
@@ -57,7 +58,11 @@ func init() {
 
 // DialContext performs the dial using global variables (e.g. LocalAddr).
 func DialContext(ctx context.Context, network, addr string) (net.Conn, error) {
-	d := &net.Dialer{DualStack: true}
+	d := &net.Dialer{
+		DualStack: true,
+		Timeout:   10 * time.Second,
+		KeepAlive: 30 * time.Second,
+	}
 
 	_, p, err := net.SplitHostPort(addr)
 	if err != nil {