chuan/CLIProxyAPI
1
0
Fork 0
mirror of https://github.com/router-for-me/CLIProxyAPI.git synced 2026-02-03 04:50:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(proxy): improve SOCKS5 proxy authentication handling

Browse Source 
- Added nil check for proxy user credentials to prevent potential nil pointer dereference.
- Enhanced authentication logic for SOCKS5 proxies in `proxy_helpers.go` and `proxy.go`.
This commit is contained in:
Luis Pater
2025-09-30 11:23:39 +08:00
parent f6de2a709f
commit 832268cae7
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
internal/runtime/executor/proxy_helpers.go
View File

@@ -87,9 +87,12 @@ func buildProxyTransport(proxyURL string) *http.Transport {
// Handle different proxy schemes // Handle different proxy schemes
if parsedURL.Scheme == "socks5" { if parsedURL.Scheme == "socks5" {
// Configure SOCKS5 proxy with optional authentication // Configure SOCKS5 proxy with optional authentication
var proxyAuth *proxy.Auth
if parsedURL.User != nil {
username := parsedURL.User.Username() username := parsedURL.User.Username()
password, _ := parsedURL.User.Password() password, _ := parsedURL.User.Password()
proxyAuth := &proxy.Auth{User: username, Password: password} proxyAuth = &proxy.Auth{User: username, Password: password}
}
dialer, errSOCKS5 := proxy.SOCKS5("tcp", parsedURL.Host, proxyAuth, proxy.Direct) dialer, errSOCKS5 := proxy.SOCKS5("tcp", parsedURL.Host, proxyAuth, proxy.Direct)
if errSOCKS5 != nil { if errSOCKS5 != nil {
log.Errorf("create SOCKS5 dialer failed: %v", errSOCKS5) log.Errorf("create SOCKS5 dialer failed: %v", errSOCKS5)

5
internal/util/proxy.go
View File

@@ -25,9 +25,12 @@ func SetProxy(cfg *config.SDKConfig, httpClient *http.Client) *http.Client {
// Handle different proxy schemes. // Handle different proxy schemes.
if proxyURL.Scheme == "socks5" { if proxyURL.Scheme == "socks5" {
// Configure SOCKS5 proxy with optional authentication. // Configure SOCKS5 proxy with optional authentication.
var proxyAuth *proxy.Auth
if proxyURL.User != nil {
username := proxyURL.User.Username() username := proxyURL.User.Username()
password, _ := proxyURL.User.Password() password, _ := proxyURL.User.Password()
proxyAuth := &proxy.Auth{User: username, Password: password} proxyAuth = &proxy.Auth{User: username, Password: password}
}
dialer, errSOCKS5 := proxy.SOCKS5("tcp", proxyURL.Host, proxyAuth, proxy.Direct) dialer, errSOCKS5 := proxy.SOCKS5("tcp", proxyURL.Host, proxyAuth, proxy.Direct)
if errSOCKS5 != nil { if errSOCKS5 != nil {
log.Errorf("create SOCKS5 dialer failed: %v", errSOCKS5) log.Errorf("create SOCKS5 dialer failed: %v", errSOCKS5)