feat: Add URL-REGEX rule

adapter/inbound/mitm.go

@@ -8,11 +8,12 @@ import (
 )
 
 // NewMitm receive mitm request and return MitmContext
-func NewMitm(target socks5.Addr, srcConn net.Conn, userAgent string, conn net.Conn, additions ...Addition) (net.Conn, *C.Metadata) {
+func NewMitm(target socks5.Addr, srcConn net.Conn, userAgent string, Url string, conn net.Conn, additions ...Addition) (net.Conn, *C.Metadata) {
 	metadata := parseSocksAddr(target)
 	metadata.NetWork = C.TCP
 	metadata.Type = C.MITM
 	metadata.UserAgent = userAgent
+	metadata.Url = Url
 	metadata.RawSrcAddr = srcConn.RemoteAddr()
 	metadata.RawDstAddr = srcConn.LocalAddr()
 	ApplyAdditions(metadata, WithSrcAddr(srcConn.RemoteAddr()), WithInAddr(conn.LocalAddr()))

config/config.go

@@ -13,7 +13,6 @@ import (
 	"strings"
 	"time"
 
-	rewrites "github.com/metacubex/mihomo/rewrite"
 	"github.com/metacubex/mihomo/adapter"
 	"github.com/metacubex/mihomo/adapter/outbound"
 	"github.com/metacubex/mihomo/adapter/outboundgroup"
@@ -37,6 +36,7 @@ import (
 	L "github.com/metacubex/mihomo/listener"
 	LC "github.com/metacubex/mihomo/listener/config"
 	"github.com/metacubex/mihomo/log"
+	"github.com/metacubex/mihomo/mitm"
 	R "github.com/metacubex/mihomo/rules"
 	RP "github.com/metacubex/mihomo/rules/provider"
 	T "github.com/metacubex/mihomo/tunnel"
@@ -168,8 +168,9 @@ type Sniffer struct {
 
 // Mitm config
 type Mitm struct {
-	Port  int           `yaml:"port" json:"port"`
-	Rules C.RewriteRule `yaml:"rules" json:"rules"`
+	Port  int                    `yaml:"port" json:"port"`
+	Hosts *trie.DomainTrie[bool] `yaml:"hosts" json:"hosts"`
+	Rules C.RewriteRule          `yaml:"rules" json:"rules"`
 }
 
 // Experimental config
@@ -293,8 +294,9 @@ type RawTuicServer struct {
 }
 
 type RawMitm struct {
-	Port  int                    `yaml:"port" json:"port"`
-	Rules []rewrites.RawMitmRule `yaml:"rules" json:"rules"`
+	Port  int                `yaml:"port" json:"port"`
+	Hosts []string           `yaml:"hosts" json:"hosts"`
+	Rules []mitm.RawMitmRule `yaml:"rules" json:"rules"`
 }
 
 type RawConfig struct {
@@ -514,8 +516,8 @@ func UnmarshalRawConfig(buf []byte) (*RawConfig, error) {
 			OverrideDest:    true,
 		},
 		MITM: RawMitm{
-			Port:  0,
-			Rules: []rewrites.RawMitmRule{},
+			Hosts: []string{},
+			Rules: []mitm.RawMitmRule{},
 		},
 		Profile: Profile{
 			StoreSelected: true,
@@ -751,6 +753,9 @@ func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[
 	if cfg.MITM.Port != 0 {
 		proxies["MITM"] = adapter.NewProxy(outbound.NewMitm(fmt.Sprintf("127.0.0.1:%d", cfg.MITM.Port)))
 		proxyList = append(proxyList, "MITM")
+	} else if len(cfg.MITM.Hosts) != 0 {
+		proxies["MITM"] = adapter.NewProxy(outbound.NewMitm(fmt.Sprintf("127.0.0.1:%d", cfg.MitmPort)))
+		proxyList = append(proxyList, "MITM")
 	}
 
 	// parse proxy
@@ -953,7 +958,7 @@ func parseRules(rulesConfig []string, proxies map[string]C.Proxy, subRules map[s
 
 		l := len(rule)
 
-		if ruleName == "NOT" || ruleName == "OR" || ruleName == "AND" || ruleName == "SUB-RULE" || ruleName == "DOMAIN-REGEX" {
+		if ruleName == "NOT" || ruleName == "OR" || ruleName == "AND" || ruleName == "SUB-RULE" || ruleName == "DOMAIN-REGEX" || ruleName == "URL-REGEX" {
 			target = rule[l-1]
 			payload = strings.Join(rule[1:l-1], ",")
 		} else {
@@ -1609,7 +1614,7 @@ func parseMitm(rawMitm RawMitm) (*Mitm, error) {
 	)
 
 	for _, line := range rawMitm.Rules {
-		rule, err := rewrites.ParseRewrite(line)
+		rule, err := mitm.ParseRewrite(line)
 		if err != nil {
 			return nil, fmt.Errorf("parse rewrite rule failure: %w", err)
 		}
@@ -1621,8 +1626,19 @@ func parseMitm(rawMitm RawMitm) (*Mitm, error) {
 		}
 	}
 
+	hosts := trie.New[bool]()
+
+	if len(rawMitm.Hosts) != 0 {
+		for _, domain := range rawMitm.Hosts {
+			_ = hosts.Insert(domain, true)
+		}
+	}
+
+	_ = hosts.Insert("mitm.mihomo", true)
+
 	return &Mitm{
 		Port:  rawMitm.Port,
-		Rules: rewrites.NewRewriteRules(req, res),
+		Hosts: hosts,
+		Rules: mitm.NewRewriteRules(req, res),
 	}, nil
 }

constant/metadata.go

@@ -160,6 +160,7 @@ type Metadata struct {
 	SniffHost string `json:"sniffHost"`
 	// Only Mitm rule
 	UserAgent string `json:"userAgent"`
+	Url       string `json:"url"`
 }
 
 func (m *Metadata) RemoteAddress() string {
@@ -176,7 +177,7 @@ func (m *Metadata) SourceAddrPort() netip.AddrPort {
 
 func (m *Metadata) SourceDetail() string {
 	if m.Type == INNER {
-		return fmt.Sprintf("%s", MihomoName)
+		return MihomoName
 	} else if m.Type == MITM {
 		return fmt.Sprintf("%s-MITM", MihomoName)
 	}
@@ -189,7 +190,7 @@ func (m *Metadata) SourceDetail() string {
 	case m.Process != "":
 		return fmt.Sprintf("%s(%s)", m.SourceAddress(), m.Process)
 	default:
-		return fmt.Sprintf("%s", m.SourceAddress())
+		return m.SourceAddress()
 	}
 }
 

constant/rule.go

@@ -29,6 +29,7 @@ const (
 	Uid
 	SubRules
 	UserAgent
+	UrlRegex
 	MATCH
 	AND
 	OR
@@ -83,6 +84,8 @@ func (rt RuleType) String() string {
 		return "ProcessPath"
 	case UserAgent:
 		return "UserAgent"
+	case UrlRegex:
+		return "UrlRegex"
 	case MATCH:
 		return "Match"
 	case RuleSet:

hub/executor/executor.go

@@ -91,7 +91,7 @@ func ApplyConfig(cfg *config.Config, force bool) {
 	}
 
 	updateUsers(cfg.Users)
-	updateProxies(cfg.Mitm, cfg.Proxies, cfg.Providers)
+	updateProxies(cfg.Proxies, cfg.Providers)
 	updateRules(cfg.Rules, cfg.SubRules, cfg.RuleProviders)
 	updateSniffer(cfg.Sniffer)
 	updateHosts(cfg.Hosts)
@@ -268,7 +268,7 @@ func updateHosts(tree *trie.DomainTrie[resolver.HostValue]) {
 	resolver.DefaultHosts = resolver.NewHosts(tree)
 }
 
-func updateProxies(mitm *config.Mitm, proxies map[string]C.Proxy, providers map[string]provider.ProxyProvider) {
+func updateProxies(proxies map[string]C.Proxy, providers map[string]provider.ProxyProvider) {
 	tunnel.UpdateProxies(proxies, providers)
 }
 
@@ -523,7 +523,7 @@ func updateIPTables(cfg *config.Config) {
 
 func updateMitm(mitm *config.Mitm) {
 	listener.ReCreateMitm(mitm.Port, tunnel.Tunnel)
-	tunnel.UpdateRewrites(mitm.Rules)
+	tunnel.UpdateRewrites(mitm.Hosts, mitm.Rules)
 }
 
 func Shutdown() {

listener/listener.go

@@ -21,7 +21,7 @@ import (
 	"github.com/metacubex/mihomo/listener/autoredir"
 	LC "github.com/metacubex/mihomo/listener/config"
 	"github.com/metacubex/mihomo/listener/http"
-	"github.com/metacubex/mihomo/listener/mitm"
+	LM "github.com/metacubex/mihomo/listener/mitm"
 	"github.com/metacubex/mihomo/listener/mixed"
 	"github.com/metacubex/mihomo/listener/redir"
 	embedSS "github.com/metacubex/mihomo/listener/shadowsocks"
@@ -33,8 +33,8 @@ import (
 	"github.com/metacubex/mihomo/listener/tuic"
 	LT "github.com/metacubex/mihomo/listener/tunnel"
 	"github.com/metacubex/mihomo/log"
+	"github.com/metacubex/mihomo/mitm"
 
-	rewrites "github.com/metacubex/mihomo/rewrite"
 	"github.com/samber/lo"
 )
 
@@ -61,7 +61,7 @@ var (
 	autoRedirListener   *autoredir.Listener
 	autoRedirProgram    *ebpf.TcEBpfProgram
 	tcProgram           *ebpf.TcEBpfProgram
-	mitmListener        *mitm.Listener
+	mitmListener        *LM.Listener
 
 	// lock for recreate function
 	socksMux     sync.Mutex
@@ -817,14 +817,14 @@ func ReCreateMitm(port int, tunnel C.Tunnel) {
 	certOption.SetValidity(time.Hour * 24 * 365 * 2) // 2 years
 	certOption.SetOrganization("Clash ManInTheMiddle Proxy Services")
 
-	opt := &mitm.Option{
+	opt := &LM.Option{
 		Addr:       addr,
 		ApiHost:    "mitm.clash",
 		CertConfig: certOption,
-		Handler:    &rewrites.RewriteHandler{},
+		Handler:    &mitm.RewriteHandler{},
 	}
 
-	mitmListener, err = mitm.New(opt, tunnel)
+	mitmListener, err = LM.New(opt, tunnel)
 	if err != nil {
 		return
 	}

listener/mitm/client.go

@@ -33,7 +33,7 @@ func getServerConn(serverConn *N.BufferedConn, srcConn net.Conn, request *http.R
 
 	left, right := net.Pipe()
 
-	go tunnel.HandleTCPConn(inbound.NewMitm(dstAddr, srcConn, request.Header.Get("User-Agent"), right, additions...))
+	go tunnel.HandleTCPConn(inbound.NewMitm(dstAddr, srcConn, request.Header.Get("User-Agent"), request.URL.String(), right, additions...))
 
 	if request.TLS != nil {
 		tlsConn := tls.Client(left, &tls.Config{

rewrite/base.go → mitm/base.go

@@ -1,9 +1,8 @@
-package rewrites
+package mitm
 
 import (
 	"bytes"
 	"io"
-	"io/ioutil"
 
 	C "github.com/metacubex/mihomo/constant"
 )
@@ -25,7 +24,7 @@ type ResponseBody struct {
 }
 
 func (r *ResponseBody) Body() io.ReadCloser {
-	return ioutil.NopCloser(bytes.NewReader(r.data))
+	return io.NopCloser(bytes.NewReader(r.data))
 }
 
 func (r *ResponseBody) ContentLength() int64 {

rewrite/handler.go → mitm/handler.go

@@ -1,16 +1,17 @@
-package rewrites
+package mitm
 
 import (
 	"bufio"
 	"bytes"
 	"errors"
-	log "github.com/sirupsen/logrus"
 	"io"
 	"net/http"
 	"net/textproto"
 	"strconv"
 	"strings"
 
+	log "github.com/sirupsen/logrus"
+
 	C "github.com/metacubex/mihomo/constant"
 	"github.com/metacubex/mihomo/listener/mitm"
 	"github.com/metacubex/mihomo/tunnel"

rewrite/parser.go → mitm/parser.go

@@ -1,9 +1,10 @@
-package rewrites
+package mitm
 
 import (
-	regexp "github.com/dlclark/regexp2"
 	"strings"
 
+	regexp "github.com/dlclark/regexp2"
+
 	C "github.com/metacubex/mihomo/constant"
 )
 

rewrite/rewrite.go → mitm/rewrite.go

@@ -1,10 +1,11 @@
-package rewrites
+package mitm
 
 import (
-	regexp "github.com/dlclark/regexp2"
 	"strconv"
 	"strings"
 
+	regexp "github.com/dlclark/regexp2"
+
 	C "github.com/metacubex/mihomo/constant"
 
 	"github.com/gofrs/uuid"
@@ -46,6 +47,9 @@ func (r *RewriteRule) RulePayload() string {
 }
 
 func (r *RewriteRule) ReplaceURLPayload(matchSub []string) string {
+	if len(r.RulePayload()) == 0 {
+		return ""
+	}
 	url := r.rulePayload
 
 	l := len(matchSub)

rewrite/util.go → mitm/util.go

@@ -1,4 +1,4 @@
-package rewrites
+package mitm
 
 import (
 	"strings"