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

[SSL证书]免费证书申请增加HTTP认证方式

Browse Source
This commit is contained in:
刘祥超
2020-12-03 18:19:09 +08:00
parent 94ca1f1fe1
commit 5c8b7c6cf6
9 changed files with 107 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
internal/web/actions/default/servers/certs/acme/create.go
View File

@@ -66,6 +66,7 @@ func (this *CreateAction) RunGet(params struct{}) {
func (this *CreateAction) RunPost(params struct {
TaskId int64
AuthType string
AcmeUserId int64
DnsProviderId int64
DnsDomain string
@@ -74,18 +75,26 @@ func (this *CreateAction) RunPost(params struct {
Must *actions.Must
}) {
if params.AuthType != "dns" && params.AuthType != "http" {
this.Fail("无法识别的认证方式'" + params.AuthType + "'")
}
if params.AcmeUserId <= 0 {
this.Fail("请选择一个申请证书的用户")
}
if params.DnsProviderId <= 0 {
this.Fail("请选择DNS服务商")
}
if len(params.DnsDomain) == 0 {
this.Fail("请输入顶级域名")
}
// 校验DNS相关信息
dnsDomain := strings.ToLower(params.DnsDomain)
if !domainutils.ValidateDomainFormat(dnsDomain) {
this.Fail("请输入正确的顶级域名")
if params.AuthType == "dns" {
if params.DnsProviderId <= 0 {
this.Fail("请选择DNS服务商")
}
if len(params.DnsDomain) == 0 {
this.Fail("请输入顶级域名")
}
if !domainutils.ValidateDomainFormat(dnsDomain) {
this.Fail("请输入正确的顶级域名")
}
}
if len(params.Domains) == 0 {
@@ -94,14 +103,21 @@ func (this *CreateAction) RunPost(params struct {
realDomains := []string{}
for _, domain := range params.Domains {
domain = strings.ToLower(domain)
if !strings.HasSuffix(domain, "."+dnsDomain) && domain != dnsDomain {
this.Fail("证书域名中的" + domain + "和顶级域名不一致")
if params.AuthType == "dns" { // DNS认证
if !strings.HasSuffix(domain, "."+dnsDomain) && domain != dnsDomain {
this.Fail("证书域名中的" + domain + "和顶级域名不一致")
}
} else if params.AuthType == "http" { // HTTP认证
if strings.Contains(domain, "*") {
this.Fail("在HTTP认证时域名" + domain + "不能包含通配符")
}
}
realDomains = append(realDomains, domain)
}
if params.TaskId == 0 {
createResp, err := this.RPC().ACMETaskRPC().CreateACMETask(this.AdminContext(), &pb.CreateACMETaskRequest{
AuthType: params.AuthType,
AcmeUserId: params.AcmeUserId,
DnsProviderId: params.DnsProviderId,
DnsDomain: dnsDomain,

27
internal/web/actions/default/servers/certs/acme/index.go
View File

@@ -42,9 +42,16 @@ func (this *IndexAction) RunGet(params struct{}) {
taskMaps := []maps.Map{}
for _, task := range tasksResp.AcmeTasks {
if task.AcmeUser == nil || task.DnsProvider == nil {
if task.AcmeUser == nil {
continue
}
dnsProviderMap := maps.Map{}
if task.AuthType == "dns" && task.DnsProvider != nil {
dnsProviderMap = maps.Map{
"id": task.DnsProvider.Id,
"name": task.DnsProvider.Name,
}
}
// 证书
var certMap maps.Map = nil
@@ -69,20 +76,18 @@ func (this *IndexAction) RunGet(params struct{}) {
}
taskMaps = append(taskMaps, maps.Map{
"id": task.Id,
"id": task.Id,
"authType": task.AuthType,
"acmeUser": maps.Map{
"id": task.AcmeUser.Id,
"email": task.AcmeUser.Email,
},
"dnsProvider": maps.Map{
"id": task.DnsProvider.Id,
"name": task.DnsProvider.Name,
},
"dnsDomain": task.DnsDomain,
"domains": task.Domains,
"autoRenew": task.AutoRenew,
"cert": certMap,
"log": logMap,
"dnsProvider": dnsProviderMap,
"dnsDomain": task.DnsDomain,
"domains": task.Domains,
"autoRenew": task.AutoRenew,
"cert": certMap,
"log": logMap,
})
}
this.Data["tasks"] = taskMaps

50
internal/web/actions/default/servers/certs/acme/updateTaskPopup.go
View File

@@ -54,14 +54,14 @@ func (this *UpdateTaskPopupAction) RunGet(params struct {
}
this.Data["task"] = maps.Map{
"id": task.Id,
"acmeUser": acmeUserMap,
"dnsProviderId": task.DnsProvider.Id,
"dnsDomain": task.DnsDomain,
"domains": task.Domains,
"autoRenew": task.AutoRenew,
"isOn": task.IsOn,
"dnsProvider": dnsProviderMap,
"id": task.Id,
"authType": task.AuthType,
"acmeUser": acmeUserMap,
"dnsDomain": task.DnsDomain,
"domains": task.Domains,
"autoRenew": task.AutoRenew,
"isOn": task.IsOn,
"dnsProvider": dnsProviderMap,
}
// 域名解析服务商
@@ -88,6 +88,7 @@ func (this *UpdateTaskPopupAction) RunGet(params struct {
func (this *UpdateTaskPopupAction) RunPost(params struct {
TaskId int64
AuthType string
AcmeUserId int64
DnsProviderId int64
DnsDomain string
@@ -99,18 +100,25 @@ func (this *UpdateTaskPopupAction) RunPost(params struct {
}) {
defer this.CreateLogInfo("修改证书申请任务 %d", params.TaskId)
if params.AuthType != "dns" && params.AuthType != "http" {
this.Fail("无法识别的认证方式'" + params.AuthType + "'")
}
if params.AcmeUserId <= 0 {
this.Fail("请选择一个申请证书的用户")
}
if params.DnsProviderId <= 0 {
this.Fail("请选择DNS服务商")
}
if len(params.DnsDomain) == 0 {
this.Fail("请输入顶级域名")
}
dnsDomain := strings.ToLower(params.DnsDomain)
if !domainutils.ValidateDomainFormat(dnsDomain) {
this.Fail("请输入正确的顶级域名")
if params.AuthType == "dns" {
if params.DnsProviderId <= 0 {
this.Fail("请选择DNS服务商")
}
if len(params.DnsDomain) == 0 {
this.Fail("请输入顶级域名")
}
if !domainutils.ValidateDomainFormat(dnsDomain) {
this.Fail("请输入正确的顶级域名")
}
}
if len(params.Domains) == 0 {
@@ -119,8 +127,14 @@ func (this *UpdateTaskPopupAction) RunPost(params struct {
realDomains := []string{}
for _, domain := range params.Domains {
domain = strings.ToLower(domain)
if !strings.HasSuffix(domain, "."+dnsDomain) && domain != dnsDomain {
this.Fail("证书域名中的" + domain + "和顶级域名不一致")
if params.AuthType == "dns" {
if !strings.HasSuffix(domain, "."+dnsDomain) && domain != dnsDomain {
this.Fail("证书域名中的" + domain + "和顶级域名不一致")
}
} else if params.AuthType == "http" { // HTTP认证
if strings.Contains(domain, "*") {
this.Fail("在HTTP认证时域名" + domain + "不能包含通配符")
}
}
realDomains = append(realDomains, domain)
}