GuanM/certimate
1
0
Fork 0
mirror of https://github.com/usual2970/certimate.git synced 2025-06-08 13:39:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: nil poiner dereference

Browse Source
This commit is contained in:
Fu Diwei 2025-02-21 14:48:04 +08:00
parent 92528edbfb
commit 316a3c950f
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
internal/pkg/core/applicant/acme-dns-01/lego-providers/jdcloud/internal/lego.go
View File

@ -132,7 +132,7 @@ func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
func (d *DNSProvider) getDNSZone(domain string) (*jdDnsModel.DomainInfo, error) { func (d *DNSProvider) getDNSZone(domain string) (*jdDnsModel.DomainInfo, error) {
pageNumber := 1 pageNumber := 1
pageSize := 100 pageSize := 10
for { for {
request := jdDnsApi.NewDescribeDomainsRequest(d.config.RegionId, pageNumber, pageSize) request := jdDnsApi.NewDescribeDomainsRequest(d.config.RegionId, pageNumber, pageSize)
request.SetDomainName(domain) request.SetDomainName(domain)
@ -165,9 +165,9 @@ func (d *DNSProvider) getDNSZoneAndRecord(zoneName, subDomain string) (*jdDnsMod
} }
pageNumber := 1 pageNumber := 1
pageSize := 100 pageSize := 10
for { for {
request := jdDnsApi.NewDescribeResourceRecordRequest(d.config.RegionId, fmt.Sprintf("%d", &zone.Id)) request := jdDnsApi.NewDescribeResourceRecordRequest(d.config.RegionId, fmt.Sprintf("%d", zone.Id))
request.SetSearch(subDomain) request.SetSearch(subDomain)
request.SetPageNumber(pageNumber) request.SetPageNumber(pageNumber)
request.SetPageSize(pageSize) request.SetPageSize(pageSize)
@ -190,7 +190,7 @@ func (d *DNSProvider) getDNSZoneAndRecord(zoneName, subDomain string) (*jdDnsMod
pageNumber++ pageNumber++
} }
return nil, nil, nil return zone, nil, nil
} }
func (d *DNSProvider) addOrUpdateDNSRecord(zoneName, subDomain, value string) error { func (d *DNSProvider) addOrUpdateDNSRecord(zoneName, subDomain, value string) error {
@ -200,20 +200,22 @@ func (d *DNSProvider) addOrUpdateDNSRecord(zoneName, subDomain, value string) er
} }
if record == nil { if record == nil {
request := jdDnsApi.NewCreateResourceRecordRequest(d.config.RegionId, fmt.Sprintf("%d", &zone.Id), &jdDnsModel.AddRR{ request := jdDnsApi.NewCreateResourceRecordRequest(d.config.RegionId, fmt.Sprintf("%d", zone.Id), &jdDnsModel.AddRR{
Type: "TXT", Type: "TXT",
HostRecord: subDomain, HostRecord: subDomain,
HostValue: value, HostValue: value,
Ttl: int(d.config.TTL), Ttl: int(d.config.TTL),
ViewValue: -1,
}) })
_, err := d.client.CreateResourceRecord(request) _, err := d.client.CreateResourceRecord(request)
return err return err
} else { } else {
request := jdDnsApi.NewModifyResourceRecordRequest(d.config.RegionId, fmt.Sprintf("%d", &zone.Id), fmt.Sprintf("%d", &record.Id), &jdDnsModel.UpdateRR{ request := jdDnsApi.NewModifyResourceRecordRequest(d.config.RegionId, fmt.Sprintf("%d", zone.Id), fmt.Sprintf("%d", record.Id), &jdDnsModel.UpdateRR{
Type: "TXT", Type: "TXT",
HostRecord: subDomain, HostRecord: subDomain,
HostValue: value, HostValue: value,
Ttl: int(d.config.TTL), Ttl: int(d.config.TTL),
ViewValue: -1,
}) })
_, err := d.client.ModifyResourceRecord(request) _, err := d.client.ModifyResourceRecord(request)
return err return err
@ -229,8 +231,8 @@ func (d *DNSProvider) removeDNSRecord(zoneName, subDomain string) error {
if record == nil { if record == nil {
return nil return nil
} else { } else {
req := jdDnsApi.NewDeleteResourceRecordRequest(d.config.RegionId, fmt.Sprintf("%d", &zone.Id), fmt.Sprintf("%d", &record.Id)) request := jdDnsApi.NewDeleteResourceRecordRequest(d.config.RegionId, fmt.Sprintf("%d", zone.Id), fmt.Sprintf("%d", record.Id))
_, err = d.client.DeleteResourceRecord(req) _, err = d.client.DeleteResourceRecord(request)
return err return err
} }
} }

2
internal/pkg/core/uploader/providers/jdcloud-ssl/jdcloud_ssl.go
View File

@ -64,7 +64,7 @@ func (u *UploaderProvider) Upload(ctx context.Context, certPem string, privkeyPe
// 遍历查看证书列表，避免重复上传 // 遍历查看证书列表，避免重复上传
// REF: https://docs.jdcloud.com/cn/ssl-certificate/api/describecerts // REF: https://docs.jdcloud.com/cn/ssl-certificate/api/describecerts
describeCertsPageNumber := 1 describeCertsPageNumber := 1
describeCertsPageSize := 100 describeCertsPageSize := 10
for { for {
describeCertsReq := jdSslApi.NewDescribeCertsRequest() describeCertsReq := jdSslApi.NewDescribeCertsRequest()
describeCertsReq.SetDomainName(certX509.Subject.CommonName) describeCertsReq.SetDomainName(certX509.Subject.CommonName)