tcjlj/nezha
1
0
Fork 0
mirror of https://github.com/nezhahq/nezha.git synced 2025-02-12 22:18:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

ddns: allow overriding domains per configuration (#979)
Some checks are pending
CodeQL / Analyze (go) (push) Waiting to run
Details
CodeQL / Analyze (javascript) (push) Waiting to run
Details
Contributors / contributors (push) Waiting to run
Details
Sync / sync-to-jihulab (push) Waiting to run
Details
Run Tests / tests (macos) (push) Waiting to run
Details
Run Tests / tests (ubuntu) (push) Waiting to run
Details
Run Tests / tests (windows) (push) Waiting to run
Details

Browse Source
This commit is contained in:
UUBulb 2025-01-30 12:19:40 +08:00 committed by GitHub
parent b9fbeb347e
commit 82d40d49fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 48 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/dashboard/controller/server.go
View File

@ -84,12 +84,20 @@ func updateServer(c *gin.Context) (any, error) {
s.HideForGuest = sf.HideForGuest s.HideForGuest = sf.HideForGuest
s.EnableDDNS = sf.EnableDDNS s.EnableDDNS = sf.EnableDDNS
s.DDNSProfiles = sf.DDNSProfiles s.DDNSProfiles = sf.DDNSProfiles
s.OverrideDDNSDomains = sf.OverrideDDNSDomains
ddnsProfilesRaw, err := utils.Json.Marshal(s.DDNSProfiles) ddnsProfilesRaw, err := utils.Json.Marshal(s.DDNSProfiles)
if err != nil { if err != nil {
return nil, err return nil, err
} }
s.DDNSProfilesRaw = string(ddnsProfilesRaw) s.DDNSProfilesRaw = string(ddnsProfilesRaw)
overrideDomainsRaw, err := utils.Json.Marshal(sf.OverrideDDNSDomains)
if err != nil {
return nil, err
}
s.OverrideDDNSDomainsRaw = string(overrideDomainsRaw)
if err := singleton.DB.Save(&s).Error; err != nil { if err := singleton.DB.Save(&s).Error; err != nil {
return nil, newGormError("%v", err) return nil, newGormError("%v", err)
} }

26
model/server.go
View File

@ -14,16 +14,18 @@ import (
type Server struct { type Server struct {
Common Common
Name string `json:"name"` Name string `json:"name"`
UUID string `json:"uuid,omitempty" gorm:"unique"` UUID string `json:"uuid,omitempty" gorm:"unique"`
Note string `json:"note,omitempty"` // 管理员可见备注 Note string `json:"note,omitempty"` // 管理员可见备注
PublicNote string `json:"public_note,omitempty"` // 公开备注 PublicNote string `json:"public_note,omitempty"` // 公开备注
DisplayIndex int `json:"display_index"` // 展示排序，越大越靠前 DisplayIndex int `json:"display_index"` // 展示排序，越大越靠前
HideForGuest bool `json:"hide_for_guest,omitempty"` // 对游客隐藏 HideForGuest bool `json:"hide_for_guest,omitempty"` // 对游客隐藏
EnableDDNS bool `json:"enable_ddns,omitempty"` // 启用DDNS EnableDDNS bool `json:"enable_ddns,omitempty"` // 启用DDNS
DDNSProfilesRaw string `gorm:"default:'[]';column:ddns_profiles_raw" json:"-"` DDNSProfilesRaw string `gorm:"default:'[]';column:ddns_profiles_raw" json:"-"`
OverrideDDNSDomainsRaw string `gorm:"default:'{}';column:override_ddns_domains_raw" json:"-"`
DDNSProfiles []uint64 `gorm:"-" json:"ddns_profiles,omitempty" validate:"optional"` // DDNS配置 DDNSProfiles []uint64 `gorm:"-" json:"ddns_profiles,omitempty" validate:"optional"` // DDNS配置
OverrideDDNSDomains map[uint64][]string `gorm:"-" json:"override_ddns_domains,omitempty" validate:"optional"`
Host *Host `gorm:"-" json:"host,omitempty"` Host *Host `gorm:"-" json:"host,omitempty"`
State *HostState `gorm:"-" json:"state,omitempty"` State *HostState `gorm:"-" json:"state,omitempty"`
@ -53,6 +55,12 @@ func (s *Server) AfterFind(tx *gorm.DB) error {
return nil return nil
} }
} }
if s.OverrideDDNSDomainsRaw != "" {
if err := utils.Json.Unmarshal([]byte(s.OverrideDDNSDomainsRaw), &s.OverrideDDNSDomains); err != nil {
log.Println("NEZHA>> Server.AfterFind:", err)
return nil
}
}
return nil return nil
} }

15
model/server_api.go
View File

@ -21,13 +21,14 @@ type StreamServerData struct {
} }
type ServerForm struct { type ServerForm struct {
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Note string `json:"note,omitempty" validate:"optional"` // 管理员可见备注 Note string `json:"note,omitempty" validate:"optional"` // 管理员可见备注
PublicNote string `json:"public_note,omitempty" validate:"optional"` // 公开备注 PublicNote string `json:"public_note,omitempty" validate:"optional"` // 公开备注
DisplayIndex int `json:"display_index,omitempty" default:"0"` // 展示排序，越大越靠前 DisplayIndex int `json:"display_index,omitempty" default:"0"` // 展示排序，越大越靠前
HideForGuest bool `json:"hide_for_guest,omitempty" validate:"optional"` // 对游客隐藏 HideForGuest bool `json:"hide_for_guest,omitempty" validate:"optional"` // 对游客隐藏
EnableDDNS bool `json:"enable_ddns,omitempty" validate:"optional"` // 启用DDNS EnableDDNS bool `json:"enable_ddns,omitempty" validate:"optional"` // 启用DDNS
DDNSProfiles []uint64 `gorm:"-" json:"ddns_profiles,omitempty" validate:"optional"` // DDNS配置 DDNSProfiles []uint64 `json:"ddns_profiles,omitempty" validate:"optional"` // DDNS配置
OverrideDDNSDomains map[uint64][]string `json:"override_ddns_domains,omitempty" validate:"optional"`
} }
type ForceUpdateResponse struct { type ForceUpdateResponse struct {

22
pkg/ddns/ddns.go
View File

@ -28,7 +28,6 @@ type Provider struct {
ctx context.Context ctx context.Context
ipAddr string ipAddr string
recordType string recordType string
domain string
prefix string prefix string
zone string zone string
@ -43,25 +42,28 @@ func InitDNSServers(s string) {
} }
} }
func (provider *Provider) UpdateDomain(ctx context.Context) { func (provider *Provider) GetProfileID() uint64 {
return provider.DDNSProfile.ID
}
func (provider *Provider) UpdateDomain(ctx context.Context, overrideDomains ...string) {
provider.ctx = ctx provider.ctx = ctx
for _, domain := range provider.DDNSProfile.Domains { for _, domain := range utils.IfOr(len(overrideDomains) > 0, overrideDomains, provider.DDNSProfile.Domains) {
for retries := 0; retries < int(provider.DDNSProfile.MaxRetries); retries++ { for retries := 0; retries < int(provider.DDNSProfile.MaxRetries); retries++ {
provider.domain = domain log.Printf("NEZHA>> Updating DNS Record of domain %s: %d/%d", domain, retries+1, provider.DDNSProfile.MaxRetries)
log.Printf("NEZHA>> Updating DNS Record of domain %s: %d/%d", provider.domain, retries+1, provider.DDNSProfile.MaxRetries) if err := provider.updateDomain(domain); err != nil {
if err := provider.updateDomain(); err != nil { log.Printf("NEZHA>> Failed to update DNS record of domain %s: %v", domain, err)
log.Printf("NEZHA>> Failed to update DNS record of domain %s: %v", provider.domain, err)
} else { } else {
log.Printf("NEZHA>> Update DNS record of domain %s succeed", provider.domain) log.Printf("NEZHA>> Update DNS record of domain %s succeed", domain)
break break
} }
} }
} }
} }
func (provider *Provider) updateDomain() error { func (provider *Provider) updateDomain(domain string) error {
var err error var err error
provider.prefix, provider.zone, err = splitDomainSOA(provider.domain) provider.prefix, provider.zone, err = splitDomainSOA(domain)
if err != nil { if err != nil {
return err return err
} }

4
service/rpc/nezha.go
View File

@ -231,11 +231,13 @@ func (s *NezhaHandler) ReportGeoIP(c context.Context, r *pb.GeoIP) (*pb.GeoIP, e
(server.GeoIP == nil || server.GeoIP.IP != geoip.IP) { (server.GeoIP == nil || server.GeoIP.IP != geoip.IP) {
ipv4 := geoip.IP.IPv4Addr ipv4 := geoip.IP.IPv4Addr
ipv6 := geoip.IP.IPv6Addr ipv6 := geoip.IP.IPv6Addr
providers, err := singleton.GetDDNSProvidersFromProfiles(server.DDNSProfiles, &ddns.IP{Ipv4Addr: ipv4, Ipv6Addr: ipv6}) providers, err := singleton.GetDDNSProvidersFromProfiles(server.DDNSProfiles, &ddns.IP{Ipv4Addr: ipv4, Ipv6Addr: ipv6})
if err == nil { if err == nil {
for _, provider := range providers { for _, provider := range providers {
domains := server.OverrideDDNSDomains[provider.GetProfileID()]
go func(provider *ddns.Provider) { go func(provider *ddns.Provider) {
provider.UpdateDomain(context.Background()) provider.UpdateDomain(context.Background(), domains...)
}(provider) }(provider)
} }
} else { } else {