zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-12-24 13:28:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: empty match domains for fallback nameservers;

Browse Source
This commit is contained in:
VishalDalwadi
2025-12-20 15:25:26 +05:30
parent 6a5162427d
commit ccccc02e08
2 changed files with 29 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
logic/dns.go
View File

@@ -553,9 +553,8 @@ func getNameserversForNode(node *models.Node) (returnNsLi []models.Nameserver) {
if all {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {
@@ -572,9 +571,8 @@ func getNameserversForNode(node *models.Node) (returnNsLi []models.Nameserver) {
if _, ok := nsI.Nodes[node.ID.String()]; ok {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {
@@ -637,9 +635,8 @@ func getNameserversForHost(h *models.Host) (returnNsLi []models.Nameserver) {
if all {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {
@@ -656,9 +653,8 @@ func getNameserversForHost(h *models.Host) (returnNsLi []models.Nameserver) {
if _, ok := nsI.Nodes[node.ID.String()]; ok {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {

41
pro/logic/dns.go
View File

@@ -77,9 +77,8 @@ func GetNameserversForNode(node *models.Node) (returnNsLi []models.Nameserver) {
if all {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {
@@ -97,9 +96,8 @@ func GetNameserversForNode(node *models.Node) (returnNsLi []models.Nameserver) {
if _, ok := nsI.Tags[tagI.String()]; ok {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {
@@ -122,9 +120,8 @@ func GetNameserversForNode(node *models.Node) (returnNsLi []models.Nameserver) {
if _, ok := nsI.Nodes[node.ID.String()]; ok {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {
@@ -187,9 +184,8 @@ func GetNameserversForHost(h *models.Host) (returnNsLi []models.Nameserver) {
if all {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {
@@ -205,13 +201,19 @@ func GetNameserversForHost(h *models.Host) (returnNsLi []models.Nameserver) {
foundTag := false
for tagI := range node.Tags {
if _, ok := nsI.Tags[tagI.String()]; ok {
for _, domain := range nsI.Domains {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: domain.Domain,
IsSearchDomain: domain.IsSearchDomain,
IsFallback: ns.Fallback,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: domain.Domain,
IsSearchDomain: domain.IsSearchDomain,
})
}
}
foundTag = true
}
@@ -225,9 +227,8 @@ func GetNameserversForHost(h *models.Host) (returnNsLi []models.Nameserver) {
if _, ok := nsI.Nodes[node.ID.String()]; ok {
if nsI.Fallback {
returnNsLi = append(returnNsLi, models.Nameserver{
IPs: filteredIps,
MatchDomain: ".",
IsFallback: true,
IPs: filteredIps,
IsFallback: true,
})
} else {
for _, domain := range nsI.Domains {