2 Commits

Author SHA1 Message Date
Toby Chui
0805da9d13 Added more test cases for netutil ipmatch 2025-09-19 21:14:20 +08:00
Toby Chui
52f652fbaf Enable SNI offload in HTTPS proxy connections
Updated the ReverseProxy's ProxyHTTPS method to use tls.Dial with SNI support when connecting to upstream servers. Also incremented SYSTEM_VERSION to 3.2.7.
2025-09-17 07:37:21 +08:00
4 changed files with 80 additions and 7 deletions

View File

@@ -44,7 +44,7 @@ import (
const (
/* Build Constants */
SYSTEM_NAME = "Zoraxy"
SYSTEM_VERSION = "3.2.6"
SYSTEM_VERSION = "3.2.7"
DEVELOPMENT_BUILD = false
/* System Constants */

View File

@@ -2,10 +2,10 @@ package dpcore
import (
"context"
"crypto/tls"
"errors"
"io"
"log"
"net"
"net/http"
"net/url"
"strings"
@@ -391,7 +391,6 @@ func (p *ReverseProxy) ProxyHTTP(rw http.ResponseWriter, req *http.Request, rrr
return res.StatusCode, nil
}
func (p *ReverseProxy) ProxyHTTPS(rw http.ResponseWriter, req *http.Request) (int, error) {
hij, ok := rw.(http.Hijacker)
if !ok {
@@ -407,12 +406,23 @@ func (p *ReverseProxy) ProxyHTTPS(rw http.ResponseWriter, req *http.Request) (in
return http.StatusInternalServerError, err
}
proxyConn, err := net.Dial("tcp", req.URL.Host)
// Extract SNI/hostname for TLS handshake
host := req.URL.Host
if !strings.Contains(host, ":") {
host += ":443"
}
serverName := req.URL.Hostname()
// Connect with SNI offload
tlsConfig := &tls.Config{
ServerName: serverName,
}
proxyConn, err := tls.Dial("tcp", host, tlsConfig)
if err != nil {
if p.Verbal {
p.logf("http: proxy error: %v", err)
}
clientConn.Close()
return http.StatusInternalServerError, err
}

View File

@@ -115,7 +115,17 @@ func IsPrivateIP(ipStr string) bool {
if ip == nil {
return false
}
return ip.IsPrivate()
if ip.IsPrivate() {
return true
}
// Check for IPv6 link-local addresses (fe80::/10)
if ip.To16() != nil && ip.To4() == nil {
// IPv6 only
if ip[0] == 0xfe && (ip[1]&0xc0) == 0x80 {
return true
}
}
return false
}
// Check if an Ip string is ipv6

View File

@@ -26,3 +26,56 @@ func TestHandlePing(t *testing.T) {
t.Log(realIP, pingTime, ttl)
}
func TestMatchIpWildcard_IPv6(t *testing.T) {
// IPv6 wildcards are not supported by MatchIpWildcard, so these should all return false
tests := []struct {
ip string
wildcard string
want bool
}{
{"fd7a:115c:a1e0::e101:6f0f", "fd7a:115c:a1e0::e101:6f0f", false}, // not supported
{"fd7a:115c:a1e0::e101:6f0f", "*:*:*:*:*:*:*:*", false},
}
for _, tt := range tests {
got := netutils.MatchIpWildcard(tt.ip, tt.wildcard)
if got != tt.want {
t.Errorf("MatchIpWildcard(%q, %q) = %v, want %v", tt.ip, tt.wildcard, got, tt.want)
}
}
}
func TestMatchIpCIDR_IPv6(t *testing.T) {
tests := []struct {
ip string
cidr string
want bool
}{
{"fd7a:115c:a1e0::e101:6f0f", "fd7a:115c:a1e0::/48", true},
{"fd7a:115c:a1e0::e101:6f0f", "fd7a:115c:a1e0::/64", true},
{"fd7a:115c:a1e0::e101:6f0f", "fd7a:115c:a1e1::/48", false},
{"fd7a:115c:a1e0::e101:6f0f", "fd7a:115c:a1e0::/128", false},
}
for _, tt := range tests {
got := netutils.MatchIpCIDR(tt.ip, tt.cidr)
if got != tt.want {
t.Errorf("MatchIpCIDR(%q, %q) = %v, want %v", tt.ip, tt.cidr, got, tt.want)
}
}
}
func TestIsPrivateIP_IPv6(t *testing.T) {
tests := []struct {
ip string
want bool
}{
{"fd7a:115c:a1e0::e101:6f0f", true}, // Unique local address (fc00::/7)
{"fe80::1", true}, // Link-local
{"2001:db8::1", false}, // Documentation address
}
for _, tt := range tests {
got := netutils.IsPrivateIP(tt.ip)
if got != tt.want {
t.Errorf("IsPrivateIP(%q) = %v, want %v", tt.ip, got, tt.want)
}
}
}