TRKJ/EdgeAdmin
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAdmin.git synced 2025-11-25 03:00:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复域名检查时递归查询的问题

Browse Source
This commit is contained in:
刘祥超
2021-01-05 14:10:11 +08:00
parent 0de2d5772a
commit 0940fce743
5 changed files with 50 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
internal/web/actions/default/servers/status.go
View File

@@ -9,7 +9,6 @@ import (
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
"github.com/iwind/TeaGo/maps"
"net"
"sync"
)
@@ -129,13 +128,19 @@ func (this *StatusAction) RunPost(params struct {
for _, serverName := range serverNames {
if len(serverName.SubNames) == 0 {
// TODO 可以指定查找解析记录的DNSResolver
result, err := net.LookupCNAME(serverName.Name)
result, err := utils.LookupCNAME(serverName.Name)
if err != nil {
m["type"] = "dnsResolveErr"
m["message"] = "域名解析错误"
m["todo"] = "错误信息：解析域名'" + serverName.Name + "' CNAME记录时出错：" + err.Error() + "，请修复此问题。如果已经修改，请等待一个小时后再试。"
return
}
if len(result) == 0 {
m["type"] = "dnsResolveErr"
m["message"] = "域名解析错误"
m["todo"] = "错误信息：找不到域名'" + serverName.Name + "'的CNAME记录，请修复此问题。如果已经修改，请等待一个小时后再试。"
return
}
if result == serverName.Name+"." {
m["type"] = "dnsResolveErr"
m["message"] = "域名解析错误"
@@ -151,13 +156,19 @@ func (this *StatusAction) RunPost(params struct {
} else {
for _, subName := range serverName.SubNames {
// TODO 可以指定查找解析记录的DNSResolver
result, err := net.LookupCNAME(subName)
result, err := utils.LookupCNAME(subName)
if err != nil {
m["type"] = "dnsResolveErr"
m["message"] = "域名解析错误"
m["todo"] = "错误信息：解析域名'" + subName + "' CNAME记录时出错：" + err.Error() + "，请修复此问题。如果已经修改，请等待一个小时后再试。"
return
}
if len(result) == 0 {
m["type"] = "dnsResolveErr"
m["message"] = "域名解析错误"
m["todo"] = "错误信息：找不到域名'" + subName + "'的CNAME记录，请修复此问题。如果已经修改，请等待一个小时后再试。"
return
}
if result == cname+"." {
m["type"] = "dnsResolveErr"
m["message"] = "域名解析错误"