ddns: remove ipv6 nameservers, support custom nameservers (#439)

* do not check description file for theme-custom

* deprecation note

cmd/dashboard/controller/controller.go

@@ -96,6 +96,13 @@ func loadThirdPartyTemplates(tmpl *template.Template) *template.Template {
 		}
 
 		themeDir := theme.Name()
+		if themeDir == "theme-custom" {
+			// for backward compatibility
+			// note: will remove this in future versions
+			ret = loadTemplates(ret, themeDir)
+			continue
+		}
+
 		if strings.HasPrefix(themeDir, "dashboard-") {
 			// load dashboard templates, ignore desc file
 			ret = loadTemplates(ret, themeDir)

cmd/dashboard/controller/member_api.go

@@ -781,6 +781,7 @@ type ddnsForm struct {
 	AccessSecret       string
 	WebhookURL         string
 	WebhookMethod      uint8
+	WebhookRequestType uint8
 	WebhookRequestBody string
 	WebhookHeaders     string
 }
@@ -809,6 +810,7 @@ func (ma *memberAPI) addOrEditDDNS(c *gin.Context) {
 		p.AccessSecret = df.AccessSecret
 		p.WebhookURL = df.WebhookURL
 		p.WebhookMethod = df.WebhookMethod
+		p.WebhookRequestType = df.WebhookRequestType
 		p.WebhookRequestBody = df.WebhookRequestBody
 		p.WebhookHeaders = df.WebhookHeaders
 
@@ -1010,6 +1012,7 @@ type settingForm struct {
 	DashboardTheme          string
 	CustomCode              string
 	CustomCodeDashboard     string
+	CustomNameservers       string
 	ViewPassword            string
 	IgnoredIPNotification   string
 	IPChangeNotificationTag string // IP变更提醒的通知组
@@ -1076,6 +1079,7 @@ func (ma *memberAPI) updateSetting(c *gin.Context) {
 	singleton.Conf.Site.DashboardTheme = sf.DashboardTheme
 	singleton.Conf.Site.CustomCode = sf.CustomCode
 	singleton.Conf.Site.CustomCodeDashboard = sf.CustomCodeDashboard
+	singleton.Conf.DNSServers = sf.CustomNameservers
 	singleton.Conf.Site.ViewPassword = sf.ViewPassword
 	singleton.Conf.Oauth2.Admin = sf.Admin
 	// 保证NotificationTag不为空
@@ -1091,6 +1095,8 @@ func (ma *memberAPI) updateSetting(c *gin.Context) {
 	}
 	// 更新系统语言
 	singleton.InitLocalizer()
+	// 更新DNS服务器
+	singleton.OnNameserverUpdate()
 	c.JSON(http.StatusOK, model.Response{
 		Code: http.StatusOK,
 	})

model/config.go

@@ -125,6 +125,8 @@ type Config struct {
 	IgnoredIPNotificationServerIDs map[uint64]bool // [ServerID] -> bool(值为true代表当前ServerID在特定服务器列表内）
 	MaxTCPPingValue                int32
 	AvgPingCount                   int
+
+	DNSServers string
 }
 
 // Read 读取配置文件并应用

model/ddns.go

@@ -51,6 +51,7 @@ var ProviderList = []DDNSProvider{
 		AccessSecret:       true,
 		WebhookURL:         true,
 		WebhookMethod:      true,
+		WebhookRequestType: true,
 		WebhookRequestBody: true,
 		WebhookHeaders:     true,
 	},
@@ -93,6 +94,7 @@ type DDNSProvider struct {
 	AccessSecret       bool
 	WebhookURL         bool
 	WebhookMethod      bool
+	WebhookRequestType bool
 	WebhookRequestBody bool
 	WebhookHeaders     bool
 }

pkg/ddns/ddns.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"log"
+	"strings"
 	"time"
 
 	"github.com/libdns/libdns"
@@ -13,7 +14,10 @@ import (
 	"github.com/naiba/nezha/pkg/utils"
 )
 
-var dnsTimeOut = 10 * time.Second
+var (
+	dnsTimeOut       = 10 * time.Second
+	customDNSServers []string
+)
 
 type IP struct {
 	Ipv4Addr string
@@ -33,6 +37,12 @@ type Provider struct {
 	Setter      libdns.RecordSetter
 }
 
+func InitDNSServers(s string) {
+	if s != "" {
+		customDNSServers = strings.Split(s, ",")
+	}
+}
+
 func (provider *Provider) UpdateDomain(ctx context.Context) {
 	provider.ctx = ctx
 	for _, domain := range provider.DDNSProfile.Domains {
@@ -95,12 +105,17 @@ func splitDomainSOA(domain string) (prefix string, zone string, err error) {
 	domain += "."
 	indexes := dns.Split(domain)
 
+	servers := utils.DNSServers
+	if len(customDNSServers) > 0 {
+		servers = customDNSServers
+	}
+
 	var r *dns.Msg
 	for _, idx := range indexes {
 		m := new(dns.Msg)
 		m.SetQuestion(domain[idx:], dns.TypeSOA)
 
-		for _, server := range utils.DNSServers {
+		for _, server := range servers {
 			r, _, err = c.Exchange(m, server)
 			if err != nil {
 				return
@@ -108,7 +123,7 @@ func splitDomainSOA(domain string) (prefix string, zone string, err error) {
 			if len(r.Answer) > 0 {
 				if soa, ok := r.Answer[0].(*dns.SOA); ok {
 					zone = soa.Hdr.Name
-					prefix = domain[:len(domain)-len(zone)-1]
+					prefix = libdns.RelativeName(domain, zone)
 					return
 				}
 			}

pkg/ddns/ddns_test.go

@@ -27,6 +27,11 @@ func TestSplitDomainSOA(t *testing.T) {
 			zone:   "example.com.",
 			prefix: "abc",
 		},
+		{
+			domain: "example.com",
+			zone:   "example.com.",
+			prefix: "",
+		},
 	}
 
 	for _, c := range cases {

pkg/ddns/webhook/webhook.go

@@ -159,6 +159,8 @@ func (provider *Provider) formatWebhookString(s string) string {
 		"#domain#", provider.domain,
 		"#type#", provider.ipType,
 		"#record#", provider.recordType,
+		"#access_id#", provider.DDNSProfile.AccessID,
+		"#access_secret#", provider.DDNSProfile.AccessSecret,
 		"\r", "",
 	)
 

pkg/utils/utils.go

@@ -13,7 +13,7 @@ import (
 var (
 	Json = jsoniter.ConfigCompatibleWithStandardLibrary
 
-	DNSServers = []string{"1.1.1.1:53", "223.5.5.5:53", "[2606:4700:4700::1111]:53", "[2400:3200::1]:53"}
+	DNSServers = []string{"1.1.1.1:53", "223.5.5.5:53"}
 )
 
 func IsWindows() bool {

resource/l10n/en-US.toml

@@ -670,6 +670,9 @@ other = "Webhook URL"
 [WebhookMethod]
 other = "Webhook Request Method"
 
+[WebhookRequestType]
+other = "Webhook Request Type"
+
 [WebhookHeaders]
 other = "Webhook Request Headers"
 
@@ -744,3 +747,6 @@ other = "Expired"
 
 [Days]
 other = "d"
+
+[CustomNameservers]
+other = "Custom Public DNS Nameservers for DDNS (separate with comma)"

resource/l10n/es-ES.toml

@@ -670,6 +670,9 @@ other = "URL del Webhook"
 [WebhookMethod]
 other = "Método de Solicitud del Webhook"
 
+[WebhookRequestType]
+other = "Tipo de solicitud del Webhook"
+
 [WebhookHeaders]
 other = "Encabezados de Solicitud del Webhook"
 
@@ -744,3 +747,6 @@ other = "Expired"
 
 [Days]
 other = "d"
+
+[CustomNameservers]
+other = "Servidores DNS públicos personalizados para DDNS (separar con coma)"

resource/l10n/zh-CN.toml

@@ -632,22 +632,22 @@ other = "DDNS配置"
 other = "新配置"
 
 [EnableDDNS]
-other = "启用DDNS"
+other = "启用 DDNS"
 
 [EnableIPv4]
-other = "启用DDNS IPv4"
+other = "启用 DDNS IPv4"
 
 [EnableIPv6]
-other = "启用DDNS IPv6"
+other = "启用 DDNS IPv6"
 
 [DDNSDomain]
-other = "DDNS域名"
+other = "DDNS 域名"
 
 [DDNSDomains]
 other = "域名（逗号分隔）"
 
 [DDNSProvider]
-other = "DDNS供应商"
+other = "DDNS 供应商"
 
 [MaxRetries]
 other = "最大重试次数"
@@ -670,6 +670,9 @@ other = "Webhook 地址"
 [WebhookMethod]
 other = "Webhook 请求方式"
 
+[WebhookRequestType]
+other = "Webhook 请求类型"
+
 [WebhookHeaders]
 other = "Webhook 请求头"
 
@@ -744,3 +747,6 @@ other = "已到期"
 
 [Days]
 other = "天"
+
+[CustomNameservers]
+other = "自定义DDNS使用的公共DNS服务器（逗号分隔）"

resource/l10n/zh-TW.toml

@@ -632,49 +632,52 @@ other = "DDNS配置"
 other = "新增配置"
 
 [EnableDDNS]
-other = "啟用DDNS"
+other = "啟用 DDNS"
 
 [EnableIPv4]
-other = "啟用DDNS IPv4"
+other = "啟用 DDNS IPv4"
 
 [EnableIPv6]
-other = "啟用DDNS IPv6"
+other = "啟用 DDNS IPv6"
 
 [DDNSDomain]
-other = "DDNS域名"
+other = "DDNS 域名"
 
 [DDNSDomains]
 other = "域名（逗號分隔）"
 
 [DDNSProvider]
-other = "DDNS供應商"
+other = "DDN S供應商"
 
 [MaxRetries]
 other = "最大重試次數"
 
 [DDNSAccessID]
-other = "DDNS憑據1"
+other = "DDNS 憑據 1"
 
 [DDNSAccessSecret]
-other = "DDNS憑據2"
+other = "DDNS 憑據 2"
 
 [DDNSTokenID]
-other = "令牌ID"
+other = "令牌 ID"
 
 [DDNSTokenSecret]
-other = "令牌Secret"
+other = "令牌 Secret"
 
 [WebhookURL]
-other = "Webhook地址"
+other = "Webhook 地址"
 
 [WebhookMethod]
-other = "Webhook請求方式"
+other = "Webhook 請求方式"
+
+[WebhookRequestType]
+other = "Webhook 請求類型"
 
 [WebhookHeaders]
-other = "Webhook請求頭"
+other = "Webhook 請求頭"
 
 [WebhookRequestBody]
-other = "Webhook請求體"
+other = "Webhook 請求體"
 
 [Feature]
 other = "功能"
@@ -744,3 +747,6 @@ other = "已到期"
 
 [Days]
 other = "天"
+
+[CustomNameservers]
+other = "自訂DDNS使用的公共DNS伺服器（逗號分隔）"

resource/static/main.js

@@ -102,7 +102,8 @@ function showFormModal(modelSelector, formID, URL, getData) {
                 item.name === "Duration" ||
                 item.name === "MaxRetries" ||
                 item.name === "Provider" ||
-                item.name === "WebhookMethod"
+                item.name === "WebhookMethod" ||
+                item.name === "WebhookRequestType"
               ) {
                 obj[item.name] = parseInt(item.value);
               } else if (item.name.endsWith("Latency")) {
@@ -299,6 +300,9 @@ function addOrEditDDNS(ddns) {
   modal
     .find("select[name=WebhookMethod]")
     .val(ddns ? ddns.WebhookMethod : 1);
+  modal
+    .find("select[name=WebhookRequestType]")
+    .val(ddns ? ddns.WebhookRequestType : 1);
   if (ddns && ddns.EnableIPv4) {
     modal.find(".ui.enableipv4.checkbox").checkbox("set checked");
   } else {

resource/template/component/ddns.html

@@ -48,6 +48,13 @@
                     <option value="5">PUT</option>
                 </select>
             </div>
+            <div class="field">
+                <label>{{tr "WebhookRequestType"}}</label>
+                <select name="WebhookRequestType" class="ui fluid dropdown">
+                    <option value="1">JSON</option>
+                    <option value="2">Form</option>
+                </select>
+            </div>
             <div class="field">
                 <label>{{tr "WebhookHeaders"}}</label>
                 <textarea name="WebhookHeaders" placeholder='{"User-Agent":"Nezha-Agent"}'></textarea>

resource/template/dashboard-default/setting.html

@@ -53,6 +53,10 @@
                 <label>{{tr "PanelServerDomainAndIP"}}</label>
                 <input type="text" name="GRPCHost" placeholder="" value="{{.Conf.GRPCHost}}">
             </div>
+            <div class="field">
+                <label>{{tr "CustomNameservers"}}</label>
+                <input type="text" name="CustomNameservers" placeholder="" value="{{.Conf.DNSServers}}">
+            </div>
             <div class="field">
                 <label>{{tr "IPChangeAlert"}}</label>
             </div>

service/singleton/ddns.go

@@ -20,6 +20,7 @@ var (
 
 func initDDNS() {
 	OnDDNSUpdate()
+	OnNameserverUpdate()
 }
 
 func OnDDNSUpdate() {
@@ -33,6 +34,10 @@ func OnDDNSUpdate() {
 	}
 }
 
+func OnNameserverUpdate() {
+	ddns2.InitDNSServers(Conf.DNSServers)
+}
+
 func GetDDNSProvidersFromProfiles(profileId []uint64, ip *ddns2.IP) ([]*ddns2.Provider, error) {
 	profiles := make([]*model.DDNSProfile, 0, len(profileId))
 	ddnsCacheLock.RLock()