feat: add http proxy

Author: mrhaoxx

tunnels/http/httpproxy.go

@@ -2,25 +2,26 @@ package http
 
 import (
 	"bufio"
+	"context"
 	"encoding/base64"
 	"fmt"
+	gonet "net"
 	"net/http"
 	"net/url"
 
 	"github.com/mrhaoxx/OpenNG/net"
 )
 
 type HttpProxyInterface struct {
-	proxyurl   *url.URL
-	underlying net.Interface
+	Proxyurl *net.URL
 }
 
-func (s *HttpProxyInterface) Dial(network, addr string) (net.Conn, error) {
+func (s *HttpProxyInterface) DialContext(ctx context.Context, network, addr string) (gonet.Conn, error) {
 	if network != "tcp" {
 		return nil, net.ErrTCPOnly
 	}
 
-	c, err := s.underlying.Dial("tcp", s.proxyurl.Host)
+	c, err := s.Proxyurl.Underlying.DialContext(ctx, "tcp", s.Proxyurl.Host)
 	if err != nil {
 		return nil, err
 	}
@@ -39,8 +40,8 @@ func (s *HttpProxyInterface) Dial(network, addr string) (net.Conn, error) {
 	}
 
 	req.Close = false
-	if s.proxyurl.User != nil {
-		req.Header.Set("Proxy-Authorization", "Basic "+basicAuth(s.proxyurl.User.Username(), func() string { pwd, _ := s.proxyurl.User.Password(); return pwd }()))
+	if s.Proxyurl.User != nil {
+		req.Header.Set("Proxy-Authorization", "Basic "+basicAuth(s.Proxyurl.User.Username(), func() string { pwd, _ := s.Proxyurl.User.Password(); return pwd }()))
 	}
 
 	req.Header.Set("User-Agent", "OpenNG Proxy Forward")
@@ -66,7 +67,11 @@ func (s *HttpProxyInterface) Dial(network, addr string) (net.Conn, error) {
 	return c, nil
 }
 
-func (s *HttpProxyInterface) Listen(network, address string) (net.Listener, error) {
+func (s *HttpProxyInterface) Dial(network, addr string) (gonet.Conn, error) {
+	return s.DialContext(context.Background(), network, addr)
+}
+
+func (s *HttpProxyInterface) Listen(network, address string) (gonet.Listener, error) {
 	return nil, net.ErrListenNotSupport
 }
 

tunnels/wireguard/server.go

@@ -17,6 +17,7 @@ import (
 	"golang.zx2c4.com/wireguard/device"
 	"golang.zx2c4.com/wireguard/tun"
 
+	"gvisor.dev/gvisor/pkg/tcpip"
 	gtcp "gvisor.dev/gvisor/pkg/tcpip/transport/tcp"
 	gudp "gvisor.dev/gvisor/pkg/tcpip/transport/udp"
 )
@@ -98,6 +99,7 @@ func NewWireGuardServer(cfg *WireGuardConfig) (*WireGuardServer, error) {
 			KeepaliveInterval: cfg.TcpKeepaliveInterval,
 			KeepaliveCount:    cfg.TcpKeepAliveCount,
 			Tnet:              tnet,
+			Addr:              tcpip.AddrFrom4(addr.As4()),
 			StackLock:         &lock,
 		}
 

tunnels/wireguard/tcp/tcp.go

@@ -42,6 +42,8 @@ type Config struct {
 	KeepaliveCount    int
 	Tnet              *netstack.Net
 	StackLock         *sync.Mutex
+
+	Addr tcpip.Address
 }
 
 // Handler manages a single TCP flow.
@@ -112,6 +114,16 @@ func checkDst(config *Config, s stack.TransportEndpointID) (net.Conn, bool) {
 	defer cancel()
 	c, err := net.DefaultRouteTable.DialContext(ctx, "tcp", gnet.JoinHostPort(s.LocalAddress.String(), fmt.Sprint(s.LocalPort)))
 
+	// c, err := gonet.DialTCPWithBind(ctx, config.Tnet.Stack(), tcpip.FullAddress{
+	// 	NIC:  1,
+	// 	Addr: config.Addr,
+	// 	Port: 0,
+	// }, tcpip.FullAddress{
+	// 	NIC:  1,
+	// 	Addr: s.LocalAddress,
+	// 	Port: s.LocalPort,
+	// }, ipv4.ProtocolNumber)
+
 	if err != nil {
 		// If connection refused, we can send a reset to let peer know.
 		if oerr, ok := err.(*gnet.OpError); ok {

ui/builtin.go

@@ -949,6 +949,15 @@ var _builtin_refs_assertions = map[string]Assert{
 			},
 		},
 	},
+	"builtin::http::proxy": {
+		Type: "map",
+		Sub: AssertMap{
+			"url": {
+				Type:     "url",
+				Required: true,
+			},
+		},
+	},
 	"builtin::net::interface::sys": {
 		Type: "null",
 		Desc: "use system default interface",
@@ -1732,6 +1741,10 @@ var _builtin_refs = map[string]Inst{
 			Underlying:     underlying,
 		}, nil
 	},
+	"builtin::http::proxy": func(spec *ArgNode) (any, error) {
+		proxyurl := spec.MustGet("url").ToURL()
+		return &thttp.HttpProxyInterface{Proxyurl: proxyurl}, nil
+	},
 	"builtin::net::interface::sys": func(*ArgNode) (any, error) {
 		return &net.SysInterface{}, nil
 	},