From a24679fb5674d73429491281d68af9fdaee91f38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sat, 15 Mar 2025 15:58:12 +0800 Subject: [PATCH] option: Fix marshal legacy DNS options --- dns/transport/https.go | 2 +- dns/transport/quic/http3.go | 2 +- dns/transport/quic/quic.go | 2 +- dns/transport/tcp.go | 2 +- dns/transport/tls.go | 2 +- dns/transport/udp.go | 2 +- option/dns.go | 100 +++++++++++++++++++++++++----------- option/outbound.go | 4 +- 8 files changed, 79 insertions(+), 37 deletions(-) diff --git a/dns/transport/https.go b/dns/transport/https.go index 1cfb2574..bd150d5f 100644 --- a/dns/transport/https.go +++ b/dns/transport/https.go @@ -91,7 +91,7 @@ func NewHTTPS(ctx context.Context, logger log.ContextLogger, tag string, options if err != nil { return nil, err } - serverAddr := options.ServerOptions.Build() + serverAddr := options.DNSServerAddressOptions.Build() if serverAddr.Port == 0 { serverAddr.Port = 443 } diff --git a/dns/transport/quic/http3.go b/dns/transport/quic/http3.go index 73ae7c13..e2a75b50 100644 --- a/dns/transport/quic/http3.go +++ b/dns/transport/quic/http3.go @@ -88,7 +88,7 @@ func NewHTTP3(ctx context.Context, logger log.ContextLogger, tag string, options if err != nil { return nil, err } - serverAddr := options.ServerOptions.Build() + serverAddr := options.DNSServerAddressOptions.Build() if serverAddr.Port == 0 { serverAddr.Port = 443 } diff --git a/dns/transport/quic/quic.go b/dns/transport/quic/quic.go index d3844c2b..4ae9ac16 100644 --- a/dns/transport/quic/quic.go +++ b/dns/transport/quic/quic.go @@ -54,7 +54,7 @@ func NewQUIC(ctx context.Context, logger log.ContextLogger, tag string, options if len(tlsConfig.NextProtos()) == 0 { tlsConfig.SetNextProtos([]string{"doq"}) } - serverAddr := options.ServerOptions.Build() + serverAddr := options.DNSServerAddressOptions.Build() if serverAddr.Port == 0 { serverAddr.Port = 853 } diff --git a/dns/transport/tcp.go b/dns/transport/tcp.go index 6061585e..4abeee2f 100644 --- a/dns/transport/tcp.go +++ b/dns/transport/tcp.go @@ -35,7 +35,7 @@ func NewTCP(ctx context.Context, logger log.ContextLogger, tag string, options o if err != nil { return nil, err } - serverAddr := options.ServerOptions.Build() + serverAddr := options.DNSServerAddressOptions.Build() if serverAddr.Port == 0 { serverAddr.Port = 53 } diff --git a/dns/transport/tls.go b/dns/transport/tls.go index 28fa885a..ce88d425 100644 --- a/dns/transport/tls.go +++ b/dns/transport/tls.go @@ -52,7 +52,7 @@ func NewTLS(ctx context.Context, logger log.ContextLogger, tag string, options o if err != nil { return nil, err } - serverAddr := options.ServerOptions.Build() + serverAddr := options.DNSServerAddressOptions.Build() if serverAddr.Port == 0 { serverAddr.Port = 853 } diff --git a/dns/transport/udp.go b/dns/transport/udp.go index 289b1fe2..8c905c4c 100644 --- a/dns/transport/udp.go +++ b/dns/transport/udp.go @@ -42,7 +42,7 @@ func NewUDP(ctx context.Context, logger log.ContextLogger, tag string, options o if err != nil { return nil, err } - serverAddr := options.ServerOptions.Build() + serverAddr := options.DNSServerAddressOptions.Build() if serverAddr.Port == 0 { serverAddr.Port = 53 } diff --git a/option/dns.go b/option/dns.go index 04eb442d..1a42b0f4 100644 --- a/option/dns.go +++ b/option/dns.go @@ -19,10 +19,10 @@ import ( ) type RawDNSOptions struct { - Servers []NewDNSServerOptions `json:"servers,omitempty"` - Rules []DNSRule `json:"rules,omitempty"` - Final string `json:"final,omitempty"` - ReverseMapping bool `json:"reverse_mapping,omitempty"` + Servers []DNSServerOptions `json:"servers,omitempty"` + Rules []DNSRule `json:"rules,omitempty"` + Final string `json:"final,omitempty"` + ReverseMapping bool `json:"reverse_mapping,omitempty"` DNSClientOptions } @@ -35,32 +35,47 @@ type DNSOptions struct { LegacyDNSOptions } +type contextKeyDontUpgrade struct{} + +func ContextWithDontUpgrade(ctx context.Context) context.Context { + return context.WithValue(ctx, (*contextKeyDontUpgrade)(nil), true) +} + +func dontUpgradeFromContext(ctx context.Context) bool { + return ctx.Value((*contextKeyDontUpgrade)(nil)) == true +} + func (o *DNSOptions) UnmarshalJSONContext(ctx context.Context, content []byte) error { err := json.UnmarshalContext(ctx, content, &o.LegacyDNSOptions) if err != nil { return err } - if o.FakeIP != nil && o.FakeIP.Enabled { - deprecated.Report(ctx, deprecated.OptionLegacyDNSFakeIPOptions) - ctx = context.WithValue(ctx, (*LegacyDNSFakeIPOptions)(nil), o.FakeIP) - } + dontUpgrade := dontUpgradeFromContext(ctx) legacyOptions := o.LegacyDNSOptions - o.LegacyDNSOptions = LegacyDNSOptions{} + if !dontUpgrade { + if o.FakeIP != nil && o.FakeIP.Enabled { + deprecated.Report(ctx, deprecated.OptionLegacyDNSFakeIPOptions) + ctx = context.WithValue(ctx, (*LegacyDNSFakeIPOptions)(nil), o.FakeIP) + } + o.LegacyDNSOptions = LegacyDNSOptions{} + } err = badjson.UnmarshallExcludedContext(ctx, content, legacyOptions, &o.RawDNSOptions) if err != nil { return err } - rcodeMap := make(map[string]int) - o.Servers = common.Filter(o.Servers, func(it NewDNSServerOptions) bool { - if it.Type == C.DNSTypeLegacyRcode { - rcodeMap[it.Tag] = it.Options.(int) - return false - } - return true - }) - if len(rcodeMap) > 0 { - for i := 0; i < len(o.Rules); i++ { - rewriteRcode(rcodeMap, &o.Rules[i]) + if !dontUpgrade { + rcodeMap := make(map[string]int) + o.Servers = common.Filter(o.Servers, func(it DNSServerOptions) bool { + if it.Type == C.DNSTypeLegacyRcode { + rcodeMap[it.Tag] = it.Options.(int) + return false + } + return true + }) + if len(rcodeMap) > 0 { + for i := 0; i < len(o.Rules); i++ { + rewriteRcode(rcodeMap, &o.Rules[i]) + } } } return nil @@ -107,20 +122,24 @@ type DNSTransportOptionsRegistry interface { CreateOptions(transportType string) (any, bool) } -type _NewDNSServerOptions struct { +type _DNSServerOptions struct { Type string `json:"type,omitempty"` Tag string `json:"tag,omitempty"` Options any `json:"-"` } -type NewDNSServerOptions _NewDNSServerOptions +type DNSServerOptions _DNSServerOptions -func (o *NewDNSServerOptions) MarshalJSONContext(ctx context.Context) ([]byte, error) { - return badjson.MarshallObjectsContext(ctx, (*_NewDNSServerOptions)(o), o.Options) +func (o *DNSServerOptions) MarshalJSONContext(ctx context.Context) ([]byte, error) { + switch o.Type { + case C.DNSTypeLegacy: + o.Type = "" + } + return badjson.MarshallObjectsContext(ctx, (*_DNSServerOptions)(o), o.Options) } -func (o *NewDNSServerOptions) UnmarshalJSONContext(ctx context.Context, content []byte) error { - err := json.UnmarshalContext(ctx, content, (*_NewDNSServerOptions)(o)) +func (o *DNSServerOptions) UnmarshalJSONContext(ctx context.Context, content []byte) error { + err := json.UnmarshalContext(ctx, content, (*_DNSServerOptions)(o)) if err != nil { return err } @@ -141,12 +160,12 @@ func (o *NewDNSServerOptions) UnmarshalJSONContext(ctx context.Context, content return E.New("unknown transport type: ", o.Type) } } - err = badjson.UnmarshallExcludedContext(ctx, content, (*_NewDNSServerOptions)(o), options) + err = badjson.UnmarshallExcludedContext(ctx, content, (*_DNSServerOptions)(o), options) if err != nil { return err } o.Options = options - if o.Type == C.DNSTypeLegacy { + if o.Type == C.DNSTypeLegacy && !dontUpgradeFromContext(ctx) { err = o.Upgrade(ctx) if err != nil { return err @@ -155,7 +174,7 @@ func (o *NewDNSServerOptions) UnmarshalJSONContext(ctx context.Context, content return nil } -func (o *NewDNSServerOptions) Upgrade(ctx context.Context) error { +func (o *DNSServerOptions) Upgrade(ctx context.Context) error { if o.Type != C.DNSTypeLegacy { return nil } @@ -305,6 +324,27 @@ func (o *NewDNSServerOptions) Upgrade(ctx context.Context) error { return nil } +type DNSServerAddressOptions struct { + Server string `json:"server"` + ServerPort uint16 `json:"server_port,omitempty"` +} + +func (o DNSServerAddressOptions) Build() M.Socksaddr { + return M.ParseSocksaddrHostPort(o.Server, o.ServerPort) +} + +func (o DNSServerAddressOptions) ServerIsDomain() bool { + return M.IsDomainName(o.Server) +} + +func (o *DNSServerAddressOptions) TakeServerOptions() ServerOptions { + return ServerOptions(*o) +} + +func (o *DNSServerAddressOptions) ReplaceServerOptions(options ServerOptions) { + *o = DNSServerAddressOptions(options) +} + type LegacyDNSServerOptions struct { Address string `json:"address"` AddressResolver string `json:"address_resolver,omitempty"` @@ -329,7 +369,7 @@ type LocalDNSServerOptions struct { type RemoteDNSServerOptions struct { LocalDNSServerOptions - ServerOptions + DNSServerAddressOptions LegacyAddressResolver string `json:"-"` LegacyAddressStrategy DomainStrategy `json:"-"` LegacyAddressFallbackDelay badoption.Duration `json:"-"` diff --git a/option/outbound.go b/option/outbound.go index 30ed4e79..4abc597c 100644 --- a/option/outbound.go +++ b/option/outbound.go @@ -99,7 +99,9 @@ type _DomainResolveOptions struct { type DomainResolveOptions _DomainResolveOptions func (o DomainResolveOptions) MarshalJSON() ([]byte, error) { - if o.Strategy == DomainStrategy(C.DomainStrategyAsIS) && + if o.Server == "" { + return []byte("{}"), nil + } else if o.Strategy == DomainStrategy(C.DomainStrategyAsIS) && !o.DisableCache && o.RewriteTTL == nil && o.ClientSubnet == nil {