管理端全部功能跑通
This commit is contained in:
robin
@@ -7,7 +7,7 @@ import (
|
||||
|
||||
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
|
||||
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/httpdnsutils"
|
||||
"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/httpdns/policies"
|
||||
"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
|
||||
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
|
||||
"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs/sslconfigs"
|
||||
"github.com/iwind/TeaGo/actions"
|
||||
@@ -27,80 +27,79 @@ func (this *ClusterSettingsAction) RunGet(params struct {
|
||||
Section string
|
||||
}) {
|
||||
httpdnsutils.AddLeftMenu(this.Parent())
|
||||
cluster := pickCluster(params.ClusterId)
|
||||
settings := loadClusterSettings(cluster)
|
||||
cluster["name"] = settings.GetString("name")
|
||||
|
||||
// 构建顶部 tabbar
|
||||
cluster, err := findClusterMap(this.Parent(), params.ClusterId)
|
||||
if err != nil {
|
||||
this.ErrorPage(err)
|
||||
return
|
||||
}
|
||||
httpdnsutils.AddClusterTabbar(this.Parent(), cluster.GetString("name"), params.ClusterId, "setting")
|
||||
|
||||
// 当前选中的 section
|
||||
section := params.Section
|
||||
section := strings.TrimSpace(params.Section)
|
||||
if len(section) == 0 {
|
||||
section = "basic"
|
||||
}
|
||||
this.Data["activeSection"] = section
|
||||
|
||||
// 左侧菜单
|
||||
settings := maps.Map{
|
||||
"name": cluster.GetString("name"),
|
||||
"gatewayDomain": cluster.GetString("gatewayDomain"),
|
||||
"cacheTtl": cluster.GetInt("defaultTTL"),
|
||||
"fallbackTimeout": cluster.GetInt("fallbackTimeout"),
|
||||
"installDir": cluster.GetString("installDir"),
|
||||
"isOn": cluster.GetBool("isOn"),
|
||||
"isDefaultCluster": cluster.GetBool("isDefault"),
|
||||
}
|
||||
if settings.GetInt("cacheTtl") <= 0 {
|
||||
settings["cacheTtl"] = 30
|
||||
}
|
||||
if settings.GetInt("fallbackTimeout") <= 0 {
|
||||
settings["fallbackTimeout"] = 300
|
||||
}
|
||||
if len(settings.GetString("installDir")) == 0 {
|
||||
settings["installDir"] = "/opt/edge-httpdns"
|
||||
}
|
||||
|
||||
listenAddresses := []*serverconfigs.NetworkAddressConfig{
|
||||
{
|
||||
Protocol: serverconfigs.ProtocolHTTPS,
|
||||
Host: "",
|
||||
PortRange: "443",
|
||||
},
|
||||
}
|
||||
sslPolicy := &sslconfigs.SSLPolicy{
|
||||
IsOn: true,
|
||||
MinVersion: "TLS 1.1",
|
||||
}
|
||||
|
||||
if rawTLS := strings.TrimSpace(cluster.GetString("tlsPolicyJSON")); len(rawTLS) > 0 {
|
||||
tlsConfig := maps.Map{}
|
||||
if err := json.Unmarshal([]byte(rawTLS), &tlsConfig); err == nil {
|
||||
if listenRaw := tlsConfig.Get("listen"); listenRaw != nil {
|
||||
if data, err := json.Marshal(listenRaw); err == nil {
|
||||
_ = json.Unmarshal(data, &listenAddresses)
|
||||
}
|
||||
}
|
||||
if sslRaw := tlsConfig.Get("sslPolicy"); sslRaw != nil {
|
||||
if data, err := json.Marshal(sslRaw); err == nil {
|
||||
_ = json.Unmarshal(data, sslPolicy)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this.Data["activeSection"] = section
|
||||
cid := strconv.FormatInt(params.ClusterId, 10)
|
||||
this.Data["leftMenuItems"] = []map[string]interface{}{
|
||||
{"name": "基础设置", "url": "/httpdns/clusters/cluster/settings?clusterId=" + cid + "§ion=basic", "isActive": section == "basic"},
|
||||
{"name": "端口设置", "url": "/httpdns/clusters/cluster/settings?clusterId=" + cid + "§ion=tls", "isActive": section == "tls"},
|
||||
{"name": "TLS", "url": "/httpdns/clusters/cluster/settings?clusterId=" + cid + "§ion=tls", "isActive": section == "tls"},
|
||||
}
|
||||
|
||||
settings["isDefaultCluster"] = (policies.LoadDefaultClusterID() == cluster.GetInt64("id"))
|
||||
|
||||
this.Data["cluster"] = cluster
|
||||
// 构造前端需要的 tlsConfig 格式
|
||||
var listenAddresses []*serverconfigs.NetworkAddressConfig
|
||||
listenAddrsRaw := settings.GetString("listenAddrsJSON")
|
||||
if len(listenAddrsRaw) > 0 {
|
||||
_ = json.Unmarshal([]byte(listenAddrsRaw), &listenAddresses)
|
||||
} else {
|
||||
// 默认 443 端口
|
||||
listenAddresses = []*serverconfigs.NetworkAddressConfig{
|
||||
{
|
||||
Protocol: serverconfigs.ProtocolHTTPS,
|
||||
Host: "",
|
||||
PortRange: "443",
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
// 构造前端需要的 SSLPolicy
|
||||
var sslPolicy *sslconfigs.SSLPolicy
|
||||
originCertPem := settings.GetString("originCertPem")
|
||||
originKeyPem := settings.GetString("originKeyPem")
|
||||
if len(originCertPem) > 0 && len(originKeyPem) > 0 {
|
||||
sslPolicy = &sslconfigs.SSLPolicy{
|
||||
IsOn: true,
|
||||
MinVersion: settings.GetString("tlsMinVersion"),
|
||||
CipherSuitesIsOn: settings.GetBool("tlsCipherSuitesOn"),
|
||||
OCSPIsOn: settings.GetBool("tlsOcspOn"),
|
||||
ClientAuthType: int(settings.GetInt32("tlsClientAuthType")),
|
||||
Certs: []*sslconfigs.SSLCertConfig{
|
||||
{
|
||||
IsOn: true,
|
||||
CertData: []byte(originCertPem),
|
||||
KeyData: []byte(originKeyPem),
|
||||
},
|
||||
},
|
||||
}
|
||||
} else {
|
||||
sslPolicy = &sslconfigs.SSLPolicy{
|
||||
IsOn: true,
|
||||
MinVersion: "TLS 1.1",
|
||||
}
|
||||
}
|
||||
|
||||
this.Data["settings"] = settings
|
||||
this.Data["tlsConfig"] = maps.Map{
|
||||
"isOn": true,
|
||||
"listen": listenAddresses,
|
||||
"sslPolicy": sslPolicy,
|
||||
}
|
||||
|
||||
this.Data["cluster"] = cluster
|
||||
this.Data["settings"] = settings
|
||||
this.Show()
|
||||
}
|
||||
|
||||
@@ -120,88 +119,80 @@ func (this *ClusterSettingsAction) RunPost(params struct {
|
||||
Must *actions.Must
|
||||
CSRF *actionutils.CSRF
|
||||
}) {
|
||||
params.Must.Field("clusterId", params.ClusterId).Gt(0, "please select cluster")
|
||||
params.Must.Field("name", params.Name).Require("please input cluster name")
|
||||
params.Must.Field("gatewayDomain", params.GatewayDomain).Require("please input service domain")
|
||||
params.Must.Field("cacheTtl", params.CacheTtl).Gt(0, "cache ttl should be greater than 0")
|
||||
params.Must.Field("fallbackTimeout", params.FallbackTimeout).Gt(0, "fallback timeout should be greater than 0")
|
||||
params.Must.Field("installDir", params.InstallDir).Require("please input install dir")
|
||||
params.Name = strings.TrimSpace(params.Name)
|
||||
params.GatewayDomain = strings.TrimSpace(params.GatewayDomain)
|
||||
params.InstallDir = strings.TrimSpace(params.InstallDir)
|
||||
|
||||
params.Must.Field("clusterId", params.ClusterId).Gt(0, "请选择集群")
|
||||
params.Must.Field("name", params.Name).Require("请输入集群名称")
|
||||
params.Must.Field("gatewayDomain", params.GatewayDomain).Require("请输入服务域名")
|
||||
|
||||
if params.CacheTtl <= 0 {
|
||||
params.CacheTtl = 30
|
||||
}
|
||||
if params.FallbackTimeout <= 0 {
|
||||
params.FallbackTimeout = 300
|
||||
}
|
||||
if len(params.InstallDir) == 0 {
|
||||
params.InstallDir = "/opt/edge-httpdns"
|
||||
}
|
||||
if params.IsDefaultCluster && !params.IsOn {
|
||||
this.Fail("默认集群必须保持启用状态")
|
||||
return
|
||||
}
|
||||
|
||||
cluster := pickCluster(params.ClusterId)
|
||||
settings := loadClusterSettings(cluster)
|
||||
settings["name"] = strings.TrimSpace(params.Name)
|
||||
settings["gatewayDomain"] = strings.TrimSpace(params.GatewayDomain)
|
||||
settings["cacheTtl"] = int(params.CacheTtl)
|
||||
settings["fallbackTimeout"] = int(params.FallbackTimeout)
|
||||
settings["installDir"] = strings.TrimSpace(params.InstallDir)
|
||||
settings["isOn"] = params.IsOn
|
||||
// 处理地址
|
||||
var addresses = []*serverconfigs.NetworkAddressConfig{}
|
||||
if len(params.Addresses) > 0 {
|
||||
err := json.Unmarshal(params.Addresses, &addresses)
|
||||
if err != nil {
|
||||
this.Fail("端口地址解析失败：" + err.Error())
|
||||
}
|
||||
|
||||
addressesJSON, _ := json.Marshal(addresses)
|
||||
settings["listenAddrsJSON"] = string(addressesJSON)
|
||||
cluster, err := findClusterMap(this.Parent(), params.ClusterId)
|
||||
if err != nil {
|
||||
this.ErrorPage(err)
|
||||
return
|
||||
}
|
||||
|
||||
// 处理 SSL 配置
|
||||
var originCertPem = ""
|
||||
var originKeyPem = ""
|
||||
var tlsMinVersion = "TLS 1.1"
|
||||
var tlsCipherSuitesOn = false
|
||||
var tlsOcspOn = false
|
||||
var tlsClientAuthType = sslconfigs.SSLClientAuthType(0)
|
||||
tlsConfig := maps.Map{}
|
||||
if rawTLS := strings.TrimSpace(cluster.GetString("tlsPolicyJSON")); len(rawTLS) > 0 {
|
||||
_ = json.Unmarshal([]byte(rawTLS), &tlsConfig)
|
||||
}
|
||||
|
||||
if len(params.Addresses) > 0 {
|
||||
var addresses []*serverconfigs.NetworkAddressConfig
|
||||
if err := json.Unmarshal(params.Addresses, &addresses); err != nil {
|
||||
this.Fail("监听端口配置格式不正确")
|
||||
return
|
||||
}
|
||||
tlsConfig["listen"] = addresses
|
||||
}
|
||||
|
||||
if len(params.SslPolicyJSON) > 0 {
|
||||
sslPolicy := &sslconfigs.SSLPolicy{}
|
||||
err := json.Unmarshal(params.SslPolicyJSON, sslPolicy)
|
||||
if err == nil {
|
||||
tlsMinVersion = sslPolicy.MinVersion
|
||||
tlsCipherSuitesOn = sslPolicy.CipherSuitesIsOn
|
||||
tlsOcspOn = sslPolicy.OCSPIsOn
|
||||
tlsClientAuthType = sslconfigs.SSLClientAuthType(sslPolicy.ClientAuthType)
|
||||
if err := json.Unmarshal(params.SslPolicyJSON, sslPolicy); err != nil {
|
||||
this.Fail("TLS 配置格式不正确")
|
||||
return
|
||||
}
|
||||
tlsConfig["sslPolicy"] = sslPolicy
|
||||
}
|
||||
|
||||
if len(sslPolicy.Certs) > 0 {
|
||||
cert := sslPolicy.Certs[0]
|
||||
originCertPem = string(cert.CertData)
|
||||
originKeyPem = string(cert.KeyData)
|
||||
}
|
||||
var tlsPolicyJSON []byte
|
||||
if len(tlsConfig) > 0 {
|
||||
tlsPolicyJSON, err = json.Marshal(tlsConfig)
|
||||
if err != nil {
|
||||
this.ErrorPage(err)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
if len(originCertPem) == 0 || len(originKeyPem) == 0 {
|
||||
this.Fail("请上传或选择证书")
|
||||
}
|
||||
|
||||
settings["originHttps"] = true
|
||||
settings["originCertPem"] = originCertPem
|
||||
settings["originKeyPem"] = originKeyPem
|
||||
if len(tlsMinVersion) == 0 {
|
||||
tlsMinVersion = "TLS 1.1"
|
||||
}
|
||||
settings["tlsMinVersion"] = tlsMinVersion
|
||||
settings["tlsCipherSuitesOn"] = tlsCipherSuitesOn
|
||||
settings["tlsOcspOn"] = tlsOcspOn
|
||||
settings["tlsClientAuthType"] = int(tlsClientAuthType)
|
||||
settings["lastModifiedAt"] = nowDateTime()
|
||||
settings["certUpdatedAt"] = nowDateTime()
|
||||
|
||||
saveClusterSettings(params.ClusterId, settings)
|
||||
|
||||
currentDefaultClusterId := policies.LoadDefaultClusterID()
|
||||
if params.IsDefaultCluster {
|
||||
policies.SaveDefaultClusterID(params.ClusterId)
|
||||
} else if currentDefaultClusterId == params.ClusterId {
|
||||
policies.SaveDefaultClusterID(0)
|
||||
_, err = this.RPC().HTTPDNSClusterRPC().UpdateHTTPDNSCluster(this.AdminContext(), &pb.UpdateHTTPDNSClusterRequest{
|
||||
ClusterId: params.ClusterId,
|
||||
Name: params.Name,
|
||||
ServiceDomain: params.GatewayDomain,
|
||||
DefaultTTL: params.CacheTtl,
|
||||
FallbackTimeoutMs: params.FallbackTimeout,
|
||||
InstallDir: params.InstallDir,
|
||||
TlsPolicyJSON: tlsPolicyJSON,
|
||||
IsOn: params.IsOn,
|
||||
IsDefault: params.IsDefaultCluster,
|
||||
})
|
||||
if err != nil {
|
||||
this.ErrorPage(err)
|
||||
return
|
||||
}
|
||||
|
||||
this.Success()
|
||||
|
||||
Reference in New Issue
Block a user