CodeCow/certimate
1
0
Fork 0
mirror of https://github.com/certimate-go/certimate.git synced 2026-06-30 21:05:12 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: #1091

Browse Source
This commit is contained in:
Fu Diwei 2025-12-10 14:17:57 +08:00 committed by RHQYZ
parent 1b68ee1827
commit 55829c2f34
2 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/core/certmgr/providers/1panel/1panel.go
View File

@ -24,6 +24,9 @@ type CertmgrConfig struct {
ApiKey string `json:"apiKey"`
// 是否允许不安全的连接。
AllowInsecureConnections bool `json:"allowInsecureConnections,omitempty"`
// 子节点名称。
// 选填。
NodeName string `json:"nodeName,omitempty"`
}
type Certmgr struct {
@ -39,7 +42,7 @@ func NewCertmgr(config *CertmgrConfig) (*Certmgr, error) {
return nil, errors.New("the configuration of the certmgr provider is nil")
}
client, err := createSDKClient(config.ServerUrl, config.ApiVersion, config.ApiKey, config.AllowInsecureConnections)
client, err := createSDKClient(config.ServerUrl, config.ApiVersion, config.ApiKey, config.AllowInsecureConnections, config.NodeName)
if err != nil {
return nil, fmt.Errorf("could not create client: %w", err)
}
@ -287,7 +290,7 @@ const (
sdkVersionV2 = "v2"
)
func createSDKClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool) (any, error) {
func createSDKClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool, nodeName string) (any, error) {
if apiVersion == sdkVersionV1 {
client, err := onepanelsdk.NewClient(serverUrl, apiKey)
if err != nil {
@ -300,7 +303,14 @@ func createSDKClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool) (
return client, nil
} else if apiVersion == sdkVersionV2 {
client, err := onepanelsdk2.NewClient(serverUrl, apiKey)
var client *onepanelsdk2.Client
var err error
if nodeName == "" {
client, err = onepanelsdk2.NewClient(serverUrl, apiKey)
} else {
client, err = onepanelsdk2.NewClientWithNode(serverUrl, apiKey, nodeName)
}
if err != nil {
return nil, err
}

22
pkg/core/deployer/providers/1panel-site/1panel_site.go
View File

@ -66,6 +66,7 @@ func NewDeployer(config *DeployerConfig) (*Deployer, error) {
ApiVersion: config.ApiVersion,
ApiKey: config.ApiKey,
AllowInsecureConnections: config.AllowInsecureConnections,
NodeName: config.NodeName,
})
if err != nil {
return nil, fmt.Errorf("could not create certmgr: %w", err)
@ -234,7 +235,7 @@ func (d *Deployer) getMatchedWebsiteIdsByCertificate(ctx context.Context, certPE
}
for _, domainInfo := range websiteGetResp.Data.Domains {
if domainInfo.SSL {
if domainInfo.SSL || certX509.VerifyHostname(domainInfo.Domain) == nil {
websiteIds = append(websiteIds, websiteItem.ID)
break
}
@ -288,7 +289,7 @@ func (d *Deployer) getMatchedWebsiteIdsByCertificate(ctx context.Context, certPE
}
for _, domainInfo := range websiteGetResp.Data.Domains {
if domainInfo.SSL {
if domainInfo.SSL || certX509.VerifyHostname(domainInfo.Domain) == nil {
websiteIds = append(websiteIds, websiteItem.ID)
break
}
@ -411,18 +412,15 @@ func createSDKClient(serverUrl, apiVersion, apiKey string, skipTlsVerify bool, n
return client, nil
} else if apiVersion == sdkVersionV2 {
var client *onepanelsdk2.Client
var err error
if nodeName == "" {
temp, err := onepanelsdk2.NewClient(serverUrl, apiKey)
if err != nil {
return nil, err
}
client = temp
client, err = onepanelsdk2.NewClient(serverUrl, apiKey)
} else {
temp, err := onepanelsdk2.NewClientWithNode(serverUrl, apiKey, nodeName)
if err != nil {
return nil, err
}
client = temp
client, err = onepanelsdk2.NewClientWithNode(serverUrl, apiKey, nodeName)
}
if err != nil {
return nil, err
}
if skipTlsVerify {