增加DNS域名管理

This commit is contained in:
刘祥超
2020-11-12 14:41:34 +08:00
parent a697ec65ac
commit a609a36795
16 changed files with 350 additions and 19 deletions

View File

@@ -0,0 +1,60 @@
package domains
import (
"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains/domainutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/actions"
"strings"
)
type CreatePopupAction struct {
actionutils.ParentAction
}
func (this *CreatePopupAction) Init() {
this.Nav("", "", "")
}
func (this *CreatePopupAction) RunGet(params struct {
ProviderId int64
}) {
this.Data["providerId"] = params.ProviderId
this.Show()
}
func (this *CreatePopupAction) RunPost(params struct {
ProviderId int64
Name string
Must *actions.Must
CSRF *actionutils.CSRF
}) {
// TODO 检查ProviderId
params.Must.
Field("name", params.Name).
Require("请输入域名")
// 校验域名
domain := strings.ToLower(params.Name)
domain = strings.Replace(domain, " ", "", -1)
if !domainutils.ValidateDomainFormat(domain) {
this.Fail("域名格式不正确,请修改后重新提交")
}
createResp, err := this.RPC().DNSDomainRPC().CreateDNSDomain(this.AdminContext(), &pb.CreateDNSDomainRequest{
DnsProviderId: params.ProviderId,
Name: domain,
})
if err != nil {
this.ErrorPage(err)
return
}
this.CreateLog(oplogs.LevelInfo, "添加管理域名到DNS服务商 %d", createResp.DnsDomainId)
this.Success()
}

View File

@@ -0,0 +1,38 @@
package domains
import (
"github.com/TeaOSLab/EdgeAdmin/internal/oplogs"
"github.com/TeaOSLab/EdgeAdmin/internal/utils/numberutils"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
)
type DeleteAction struct {
actionutils.ParentAction
}
func (this *DeleteAction) RunPost(params struct {
DomainId int64
}) {
// 记录日志
this.CreateLog(oplogs.LevelInfo, "从DNS服务商中删除域名 %d", params.DomainId)
// 检查是否正在使用
countResp, err := this.RPC().NodeClusterRPC().CountAllEnabledNodeClustersWithDNSDomainId(this.AdminContext(), &pb.CountAllEnabledNodeClustersWithDNSDomainIdRequest{DnsDomainId: params.DomainId})
if err != nil {
this.ErrorPage(err)
return
}
if countResp.Count > 0 {
this.Fail("当前域名正在被" + numberutils.FormatInt64(countResp.Count) + "个集群所使用,所以不能删除。请修改后再操作。")
}
// 执行删除
_, err = this.RPC().DNSDomainRPC().DeleteDNSDomain(this.AdminContext(), &pb.DeleteDNSDomainRequest{DnsDomainId: params.DomainId})
if err != nil {
this.ErrorPage(err)
return
}
this.Success()
}

View File

@@ -0,0 +1,18 @@
package domainutils
import (
"regexp"
"strings"
)
// 校验域名格式
func ValidateDomainFormat(domain string) bool {
pieces := strings.Split(domain, ".")
for _, piece := range pieces {
if !regexp.MustCompile(`^[a-z0-9-]+$`).MatchString(piece) {
return false
}
}
return true
}

View File

@@ -0,0 +1,15 @@
package domains
import "github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
type UpdatePopupAction struct {
actionutils.ParentAction
}
func (this *UpdatePopupAction) Init() {
this.Nav("", "", "")
}
func (this *UpdatePopupAction) RunGet(params struct{}) {
this.Show()
}

View File

@@ -1,6 +1,7 @@
package dns
import (
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/domains"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/dns/providers"
"github.com/TeaOSLab/EdgeAdmin/internal/web/helpers"
"github.com/iwind/TeaGo"
@@ -14,12 +15,22 @@ func init() {
Prefix("/dns").
Get("", new(IndexAction)).
// 服务商
Prefix("/dns/providers").
Data("teaSubMenu", "provider").
Get("", new(providers.IndexAction)).
GetPost("/createPopup", new(providers.CreatePopupAction)).
GetPost("/updatePopup", new(providers.UpdatePopupAction)).
Post("/delete", new(providers.DeleteAction)).
Get("/provider", new(providers.ProviderAction)).
EndData().
// 域名
Prefix("/dns/domains").
Data("teaSubMenu", "provider").
GetPost("/createPopup", new(domains.CreatePopupAction)).
GetPost("/updatePopup", new(domains.UpdatePopupAction)).
Post("/delete", new(domains.DeleteAction)).
EndData().
EndAll()

View File

@@ -71,7 +71,6 @@ func (this *CreatePopupAction) RunPost(params struct {
Name: params.Name,
Type: params.Type,
ApiParamsJSON: apiParams.AsJSON(),
RoutesJSON: nil,
})
if err != nil {
this.ErrorPage(err)

View File

@@ -40,12 +40,21 @@ func (this *IndexAction) RunGet(params struct{}) {
dataUpdatedTime = timeutil.FormatTime("Y-m-d H:i:s", provider.DataUpdatedAt)
}
// 域名
countDomainsResp, err := this.RPC().DNSDomainRPC().CountAllEnabledDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.CountAllEnabledDNSDomainsWithDNSProviderIdRequest{DnsProviderId: provider.Id})
if err != nil {
this.ErrorPage(err)
return
}
countDomains := countDomainsResp.Count
providerMaps = append(providerMaps, maps.Map{
"id": provider.Id,
"name": provider.Name,
"type": provider.Type,
"typeName": provider.TypeName,
"dataUpdatedTime": dataUpdatedTime,
"countDomains": countDomains,
})
}
this.Data["providers"] = providerMaps

View File

@@ -0,0 +1,72 @@
package providers
import (
"encoding/json"
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
"github.com/iwind/TeaGo/maps"
timeutil "github.com/iwind/TeaGo/utils/time"
)
type ProviderAction struct {
actionutils.ParentAction
}
func (this *ProviderAction) Init() {
this.Nav("", "", "")
}
func (this *ProviderAction) RunGet(params struct {
ProviderId int64
}) {
providerResp, err := this.RPC().DNSProviderRPC().FindEnabledDNSProvider(this.AdminContext(), &pb.FindEnabledDNSProviderRequest{DnsProviderId: params.ProviderId})
if err != nil {
this.ErrorPage(err)
return
}
provider := providerResp.DnsProvider
if provider == nil {
this.NotFound("dnsProvider", params.ProviderId)
return
}
apiParams := maps.Map{}
if len(provider.ApiParamsJSON) > 0 {
err = json.Unmarshal(provider.ApiParamsJSON, &apiParams)
if err != nil {
this.ErrorPage(err)
return
}
}
this.Data["provider"] = maps.Map{
"id": provider.Id,
"name": provider.Name,
"type": provider.Type,
"typeName": provider.TypeName,
"apiParams": apiParams,
}
// 域名
domainsResp, err := this.RPC().DNSDomainRPC().FindAllEnabledDNSDomainsWithDNSProviderId(this.AdminContext(), &pb.FindAllEnabledDNSDomainsWithDNSProviderIdRequest{DnsProviderId: provider.Id})
if err != nil {
this.ErrorPage(err)
return
}
domainMaps := []maps.Map{}
for _, domain := range domainsResp.DnsDomains {
dataUpdatedTime := ""
if domain.DataUpdatedAt > 0 {
dataUpdatedTime = timeutil.FormatTime("Y-m-d H:i:s", domain.DataUpdatedAt)
}
domainMaps = append(domainMaps, maps.Map{
"id": domain.Id,
"name": domain.Name,
"isOn": domain.IsOn,
"dataUpdatedTime": dataUpdatedTime,
})
}
this.Data["domains"] = domainMaps
this.Show()
}

View File

@@ -38,7 +38,6 @@ func (this *UpdatePopupAction) RunGet(params struct {
this.ErrorPage(err)
return
}
}
this.Data["provider"] = maps.Map{
@@ -107,7 +106,6 @@ func (this *UpdatePopupAction) RunPost(params struct {
DnsProviderId: params.ProviderId,
Name: params.Name,
ApiParamsJSON: apiParams.AsJSON(),
RoutesJSON: nil,
})
if err != nil {
this.ErrorPage(err)