External/nuclei
1
0
Fork 0
mirror of https://github.com/projectdiscovery/nuclei.git synced 2025-12-17 21:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix socks5 proxy not working on tor proxy (#2455)

Browse Source 
* fix: socks5 proxy not working on tor proxy

* fix: socks5 proxy not working on tor proxy

* minor refactoring

Co-authored-by: Sandeep Singh <sandeep@projectdiscovery.io>
Co-authored-by: Mzack9999 <mzack9999@protonmail.com>
This commit is contained in:
xixijun 2022-08-22 17:48:45 +08:00 committed by GitHub
parent c184b84ebf
commit 2ae7e58c83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
v2/pkg/protocols/headless/engine/http_client.go
View File

@ -3,18 +3,16 @@ package engine
import ( import (
"context" "context"
"crypto/tls" "crypto/tls"
"fmt"
"net" "net"
"net/http" "net/http"
"net/http/cookiejar" "net/http/cookiejar"
"net/url" "net/url"
"time" "time"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
"golang.org/x/net/proxy" "golang.org/x/net/proxy"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
"github.com/projectdiscovery/nuclei/v2/pkg/types" "github.com/projectdiscovery/nuclei/v2/pkg/types"
) )
@ -53,14 +51,15 @@ func newHttpClient(options *types.Options) (*http.Client, error) {
transport.Proxy = http.ProxyURL(proxyURL) transport.Proxy = http.ProxyURL(proxyURL)
} }
} else if types.ProxySocksURL != "" { } else if types.ProxySocksURL != "" {
var proxyAuth *proxy.Auth
socksURL, proxyErr := url.Parse(types.ProxySocksURL) socksURL, proxyErr := url.Parse(types.ProxySocksURL)
if proxyErr == nil { if proxyErr != nil {
proxyAuth = &proxy.Auth{} return nil, err
proxyAuth.User = socksURL.User.Username()
proxyAuth.Password, _ = socksURL.User.Password()
} }
dialer, proxyErr := proxy.SOCKS5("tcp", fmt.Sprintf("%s:%s", socksURL.Hostname(), socksURL.Port()), proxyAuth, proxy.Direct) dialer, err := proxy.FromURL(socksURL, proxy.Direct)
if err != nil {
return nil, err
}
dc := dialer.(interface { dc := dialer.(interface {
DialContext(ctx context.Context, network, addr string) (net.Conn, error) DialContext(ctx context.Context, network, addr string) (net.Conn, error)
}) })

17
v2/pkg/protocols/http/httpclientpool/clientpool.go
View File

@ -3,7 +3,6 @@ package httpclientpool
import ( import (
"context" "context"
"crypto/tls" "crypto/tls"
"fmt"
"net" "net"
"net/http" "net/http"
"net/http/cookiejar" "net/http/cookiejar"
@ -13,14 +12,13 @@ import (
"sync" "sync"
"time" "time"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
"github.com/pkg/errors" "github.com/pkg/errors"
"golang.org/x/net/proxy" "golang.org/x/net/proxy"
"golang.org/x/net/publicsuffix" "golang.org/x/net/publicsuffix"
"github.com/projectdiscovery/fastdialer/fastdialer" "github.com/projectdiscovery/fastdialer/fastdialer"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate" "github.com/projectdiscovery/nuclei/v2/pkg/protocols/common/protocolstate"
"github.com/projectdiscovery/nuclei/v2/pkg/protocols/utils"
"github.com/projectdiscovery/nuclei/v2/pkg/types" "github.com/projectdiscovery/nuclei/v2/pkg/types"
"github.com/projectdiscovery/rawhttp" "github.com/projectdiscovery/rawhttp"
"github.com/projectdiscovery/retryablehttp-go" "github.com/projectdiscovery/retryablehttp-go"
@ -210,14 +208,15 @@ func wrappedGet(options *types.Options, configuration *Configuration) (*retryabl
transport.Proxy = http.ProxyURL(proxyURL) transport.Proxy = http.ProxyURL(proxyURL)
} }
} else if types.ProxySocksURL != "" { } else if types.ProxySocksURL != "" {
var proxyAuth *proxy.Auth
socksURL, proxyErr := url.Parse(types.ProxySocksURL) socksURL, proxyErr := url.Parse(types.ProxySocksURL)
if proxyErr == nil { if proxyErr != nil {
proxyAuth = &proxy.Auth{} return nil, proxyErr
proxyAuth.User = socksURL.User.Username()
proxyAuth.Password, _ = socksURL.User.Password()
} }
dialer, proxyErr := proxy.SOCKS5("tcp", fmt.Sprintf("%s:%s", socksURL.Hostname(), socksURL.Port()), proxyAuth, proxy.Direct) dialer, err := proxy.FromURL(socksURL, proxy.Direct)
if err != nil {
return nil, err
}
dc := dialer.(interface { dc := dialer.(interface {
DialContext(ctx context.Context, network, addr string) (net.Conn, error) DialContext(ctx context.Context, network, addr string) (net.Conn, error)
}) })