Merge pull request #692 from projectdiscovery/feat-jarm-dialer

Expose Jarm Dialer Option

Author: Mzack9999

conn/connpool/onetimepool.go

@@ -21,7 +21,7 @@ type OneTimePool struct {
 	mx              sync.RWMutex
 }
 
-func NewOneTimePool(ctx context.Context, address string, poolSize int) (*OneTimePool, error) {
+func NewOneTimePool(ctx context.Context, address string, poolSize int, opts ...Option) (*OneTimePool, error) {
 	idleConnections := make(chan net.Conn, poolSize)
 	inFlightConns, err := NewInFlightConns()
 	if err != nil {
@@ -36,6 +36,15 @@ func NewOneTimePool(ctx context.Context, address string, poolSize int) (*OneTime
 		ctx = context.Background()
 	}
 	pool.ctx, pool.cancel = context.WithCancel(ctx)
+	// apply options
+	for _, opt := range opts {
+		if opt == nil {
+			continue
+		}
+		if err := opt(pool); err != nil {
+			return nil, err
+		}
+	}
 	return pool, nil
 }
 

conn/connpool/options.go

@@ -0,0 +1,29 @@
+package connpool
+
+// Option configures OneTimePool at construction time.
+type Option func(*OneTimePool) error
+
+// WithDialer sets a custom Dialer used by the pool to establish connections.
+func WithDialer(d Dialer) Option {
+	return func(p *OneTimePool) error {
+		p.mx.Lock()
+		p.Dialer = d
+		p.mx.Unlock()
+		return nil
+	}
+}
+
+// WithProxy configures a SOCKS5 proxy using the provided URL string
+// Example: socks5://user:pass@127.0.0.1:1080
+func WithProxy(proxyURL string) Option {
+	return func(p *OneTimePool) error {
+		d, err := NewCreateSOCKS5Dialer(proxyURL)
+		if err != nil {
+			return err
+		}
+		p.mx.Lock()
+		p.Dialer = d
+		p.mx.Unlock()
+		return nil
+	}
+}

conn/connpool/socks5_dialer.go

@@ -0,0 +1,54 @@
+package connpool
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/url"
+
+	"golang.org/x/net/proxy"
+)
+
+// socks5WrapperDialer adapts a golang.org/x/net/proxy.Dialer to our Dialer interface.
+type socks5WrapperDialer struct {
+	dialer proxy.Dialer
+}
+
+func (s *socks5WrapperDialer) Dial(ctx context.Context, network, address string) (net.Conn, error) {
+	conn, err := s.dialer.Dial(network, address)
+	if err != nil {
+		return nil, fmt.Errorf("failed to connect via SOCKS5 proxy: %w", err)
+	}
+	return conn, nil
+}
+
+// NewCreateSOCKS5Dialer creates a Dialer that routes connections via a SOCKS5 proxy.
+// socks5ProxyURLStr should be of the form: socks5://user:pass@host:port
+func NewCreateSOCKS5Dialer(socks5ProxyURLStr string) (Dialer, error) {
+	proxyURL, err := url.Parse(socks5ProxyURLStr)
+	if err != nil {
+		return nil, fmt.Errorf("failed to parse proxy URL: %v", err)
+	}
+	if proxyURL.Scheme != "socks5" {
+		return nil, fmt.Errorf("unsupported proxy scheme: %s, only socks5 is supported", proxyURL.Scheme)
+	}
+
+	var auth *proxy.Auth
+	if proxyURL.User != nil {
+		username := proxyURL.User.Username()
+		password, hasPassword := proxyURL.User.Password()
+		if hasPassword {
+			auth = &proxy.Auth{User: username, Password: password}
+		} else {
+			auth = &proxy.Auth{User: username}
+		}
+	}
+
+	// Create the SOCKS5 dialer
+	socks5ProxyDialer, err := proxy.SOCKS5("tcp", proxyURL.Host, auth, proxy.Direct)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create SOCKS5 proxy dialer: %w", err)
+	}
+
+	return &socks5WrapperDialer{dialer: socks5ProxyDialer}, nil
+}

go.mod

@@ -129,7 +129,7 @@ require (
 	github.com/zmap/rc2 v0.0.0-20190804163417-abaa70531248 // indirect
 	golang.org/x/crypto v0.37.0 // indirect
 	golang.org/x/mod v0.22.0 // indirect
-	golang.org/x/net v0.39.0 // indirect
+	golang.org/x/net v0.39.0
 	golang.org/x/term v0.31.0
 	golang.org/x/tools v0.29.0
 )

update/utils_all.go

@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package updateutils
 

update/utils_linux.go

@@ -1,5 +1,4 @@
 //go:build linux
-// +build linux
 
 package updateutils