Add DNS provider for JDCloud (#2782)

This commit is contained in:
Ludovic Fernandez 2026-01-07 18:03:32 +01:00 committed by GitHub
commit dd6ab7ca95
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 775 additions and 22 deletions

View file

@ -0,0 +1,15 @@
{
"domainId": "20",
"regionId": "cn-north-1",
"req": {
"hostRecord": "_acme-challenge",
"hostValue": "ADw2sEd82DUgXcQ9hNBZThJs7zVJkR5v9JeSbAb9mZY",
"jcloudRes": null,
"mxPriority": null,
"port": null,
"ttl": 120,
"type": "TXT",
"viewValue": -1,
"weight": null
}
}

View file

@ -0,0 +1,25 @@
{
"requestId": "azerty",
"error": {
"code": 0,
"status": "",
"message": ""
},
"result": {
"dataList": {
"id": 123,
"hostRecord": "_acme-challenge",
"hostValue": "ADw2sEd82DUgXcQ9hNBZThJs7zVJkR5v9JeSbAb9mZY",
"jcloudRes": false,
"mxPriority": 0,
"port": 0,
"ttl": 120,
"type": "TXT",
"weight": 0,
"viewValue": [
1,
2
]
}
}
}

View file

@ -0,0 +1,9 @@
{
"requestId": "azerty",
"error": {
"code": 0,
"status": "",
"message": ""
},
"result": {}
}

View file

@ -0,0 +1,55 @@
{
"requestId": "azerty",
"error": {
"code": 0,
"status": "",
"message": ""
},
"result": {
"dataList": [
{
"id": 1,
"domainName": "1.example"
},
{
"id": 2,
"domainName": "2.example"
},
{
"id": 3,
"domainName": "3.example"
},
{
"id": 4,
"domainName": "4.example"
},
{
"id": 5,
"domainName": "5.example"
},
{
"id": 6,
"domainName": "6.example"
},
{
"id": 7,
"domainName": "7.example"
},
{
"id": 8,
"domainName": "8.example"
},
{
"id": 9,
"domainName": "9.example"
},
{
"id": 10,
"domainName": "10.example"
}
],
"currentCount": 10,
"totalCount": 20,
"totalPage": 2
}
}

View file

@ -0,0 +1,55 @@
{
"requestId": "azerty",
"error": {
"code": 0,
"status": "",
"message": ""
},
"result": {
"dataList": [
{
"id": 11,
"domainName": "11.example"
},
{
"id": 12,
"domainName": "12.example"
},
{
"id": 13,
"domainName": "13.example"
},
{
"id": 14,
"domainName": "14.example"
},
{
"id": 15,
"domainName": "15.example"
},
{
"id": 16,
"domainName": "16.example"
},
{
"id": 17,
"domainName": "17.example"
},
{
"id": 18,
"domainName": "18.example"
},
{
"id": 19,
"domainName": "19.example"
},
{
"id": 20,
"domainName": "example.com"
}
],
"currentCount": 10,
"totalCount": 20,
"totalPage": 2
}
}

View file

@ -0,0 +1,217 @@
// Package jdcloud implements a DNS provider for solving the DNS-01 challenge using JD Cloud.
package jdcloud
import (
"errors"
"fmt"
"strconv"
"sync"
"time"
"github.com/go-acme/jdcloud-sdk-go/core"
"github.com/go-acme/jdcloud-sdk-go/services/domainservice/apis"
jdcclient "github.com/go-acme/jdcloud-sdk-go/services/domainservice/client"
domainservice "github.com/go-acme/jdcloud-sdk-go/services/domainservice/models"
"github.com/go-acme/lego/v4/challenge/dns01"
"github.com/go-acme/lego/v4/platform/config/env"
)
// Environment variables names.
const (
envNamespace = "JDCLOUD_"
EnvAccessKeyID = envNamespace + "ACCESS_KEY_ID"
EnvAccessKeySecret = envNamespace + "ACCESS_KEY_SECRET"
EnvRegionID = envNamespace + "REGION_ID"
EnvTTL = envNamespace + "TTL"
EnvPropagationTimeout = envNamespace + "PROPAGATION_TIMEOUT"
EnvPollingInterval = envNamespace + "POLLING_INTERVAL"
EnvHTTPTimeout = envNamespace + "HTTP_TIMEOUT"
)
// Config is used to configure the creation of the DNSProvider.
type Config struct {
AccessKeyID string
AccessKeySecret string
RegionID string
PropagationTimeout time.Duration
PollingInterval time.Duration
TTL int
HTTPTimeout time.Duration
}
// NewDefaultConfig returns a default configuration for the DNSProvider.
func NewDefaultConfig() *Config {
return &Config{
TTL: env.GetOrDefaultInt(EnvTTL, dns01.DefaultTTL),
PropagationTimeout: env.GetOrDefaultSecond(EnvPropagationTimeout, dns01.DefaultPropagationTimeout),
PollingInterval: env.GetOrDefaultSecond(EnvPollingInterval, dns01.DefaultPollingInterval),
HTTPTimeout: env.GetOrDefaultSecond(EnvHTTPTimeout, 30*time.Second),
}
}
// DNSProvider implements the challenge.Provider interface.
type DNSProvider struct {
config *Config
client *jdcclient.DomainserviceClient
recordIDs map[string]int
domainIDs map[string]int
recordIDsMu sync.Mutex
}
// NewDNSProvider returns a DNSProvider instance configured for JD Cloud.
func NewDNSProvider() (*DNSProvider, error) {
values, err := env.Get(EnvAccessKeyID, EnvAccessKeySecret)
if err != nil {
return nil, fmt.Errorf("jdcloud: %w", err)
}
config := NewDefaultConfig()
config.AccessKeyID = values[EnvAccessKeyID]
config.AccessKeySecret = values[EnvAccessKeySecret]
// https://docs.jdcloud.com/en/common-declaration/api/introduction#Region%20Code
config.RegionID = env.GetOrDefaultString(EnvRegionID, "cn-north-1")
return NewDNSProviderConfig(config)
}
// NewDNSProviderConfig return a DNSProvider instance configured for JD Cloud.
func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
if config == nil {
return nil, errors.New("jdcloud: the configuration of the DNS provider is nil")
}
if config.AccessKeyID == "" || config.AccessKeySecret == "" {
return nil, errors.New("jdcloud: missing credentials")
}
cred := core.NewCredentials(config.AccessKeyID, config.AccessKeySecret)
client := jdcclient.NewDomainserviceClient(cred)
client.DisableLogger()
client.Config.SetTimeout(config.HTTPTimeout)
return &DNSProvider{
config: config,
client: client,
recordIDs: make(map[string]int),
domainIDs: make(map[string]int),
}, nil
}
// Present creates a TXT record using the specified parameters.
func (d *DNSProvider) Present(domain, token, keyAuth string) error {
info := dns01.GetChallengeInfo(domain, keyAuth)
authZone, err := dns01.FindZoneByFqdn(info.EffectiveFQDN)
if err != nil {
return fmt.Errorf("jdcloud: could not find zone for domain %q: %w", domain, err)
}
subDomain, err := dns01.ExtractSubDomain(info.EffectiveFQDN, authZone)
if err != nil {
return fmt.Errorf("jdcloud: %w", err)
}
zone, err := d.findZone(dns01.UnFqdn(authZone))
if err != nil {
return fmt.Errorf("jdcloud: %w", err)
}
// https://docs.jdcloud.com/cn/jd-cloud-dns/api/createresourcerecord
crrr := apis.NewCreateResourceRecordRequestWithAllParams(
d.config.RegionID,
strconv.Itoa(zone.Id),
&domainservice.AddRR{
HostRecord: subDomain,
HostValue: info.Value,
Ttl: d.config.TTL,
Type: "TXT",
ViewValue: -1,
},
)
record, err := jdcclient.CreateResourceRecord(d.client, crrr)
if err != nil {
return fmt.Errorf("jdcloud: create resource record: %w", err)
}
d.recordIDsMu.Lock()
d.domainIDs[token] = zone.Id
d.recordIDs[token] = record.Result.DataList.Id
d.recordIDsMu.Unlock()
return nil
}
// CleanUp removes the TXT record matching the specified parameters.
func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
info := dns01.GetChallengeInfo(domain, keyAuth)
d.recordIDsMu.Lock()
recordID, recordOK := d.recordIDs[token]
domainID, domainOK := d.domainIDs[token]
d.recordIDsMu.Unlock()
if !recordOK {
return fmt.Errorf("jdcloud: unknown record ID for '%s' '%s'", info.EffectiveFQDN, token)
}
if !domainOK {
return fmt.Errorf("jdcloud: unknown domain ID for '%s' '%s'", info.EffectiveFQDN, token)
}
// https://docs.jdcloud.com/cn/jd-cloud-dns/api/deleteresourcerecord
drrr := apis.NewDeleteResourceRecordRequestWithAllParams(
d.config.RegionID,
strconv.Itoa(domainID),
strconv.Itoa(recordID),
)
_, err := jdcclient.DeleteResourceRecord(d.client, drrr)
if err != nil {
return fmt.Errorf("jdcloud: delete resource record: %w", err)
}
return nil
}
// Timeout returns the timeout and interval to use when checking for DNS propagation.
// Adjusting here to cope with spikes in propagation times.
func (d *DNSProvider) Timeout() (timeout, interval time.Duration) {
return d.config.PropagationTimeout, d.config.PollingInterval
}
func (d *DNSProvider) findZone(zone string) (*domainservice.DomainInfo, error) {
// https://docs.jdcloud.com/cn/jd-cloud-dns/api/describedomains
ddr := apis.NewDescribeDomainsRequestWithoutParam()
ddr.SetRegionId(d.config.RegionID)
ddr.SetPageNumber(1)
ddr.SetPageSize(10)
ddr.SetDomainName(zone)
for {
response, err := jdcclient.DescribeDomains(d.client, ddr)
if err != nil {
return nil, fmt.Errorf("describe domains: %w", err)
}
for _, d := range response.Result.DataList {
if d.DomainName == zone {
return &d, nil
}
}
if len(response.Result.DataList) < ddr.PageSize || response.Result.TotalPage <= ddr.PageNumber {
break
}
ddr.SetPageNumber(ddr.PageNumber + 1)
}
return nil, errors.New("zone not found")
}

View file

@ -0,0 +1,27 @@
Name = "JD Cloud"
Description = ''''''
URL = "https://www.jdcloud.com/"
Code = "jdcloud"
Since = "v4.31.0"
Example = '''
JDCLOUD_ACCESS_KEY_ID="xxx" \
JDCLOUD_ACCESS_KEY_SECRET="yyy" \
lego --dns jdcloud -d '*.example.com' -d example.com run
'''
[Configuration]
[Configuration.Credentials]
JDCLOUD_ACCESS_KEY_ID = "Access key ID"
JDCLOUD_ACCESS_KEY_SECRET = "Access key secret"
[Configuration.Additional]
JDCLOUD_REGION_ID = "Region ID (Default: cn-north-1)"
JDCLOUD_POLLING_INTERVAL = "Time between DNS propagation check in seconds (Default: 2)"
JDCLOUD_PROPAGATION_TIMEOUT = "Maximum waiting time for DNS propagation in seconds (Default: 60)"
JDCLOUD_TTL = "The TTL of the TXT record used for the DNS challenge in seconds (Default: 120)"
JDCLOUD_HTTP_TIMEOUT = "API request timeout in seconds (Default: 30)"
[Links]
API = "https://docs.jdcloud.com/cn/jd-cloud-dns/api/overview"
Common = "https://docs.jdcloud.com/en/common-declaration/api/introduction"
GoClient = "https://github.com/jdcloud-api/jdcloud-sdk-go"

View file

@ -0,0 +1,242 @@
package jdcloud
import (
"fmt"
"net"
"net/http"
"net/http/httptest"
"net/url"
"testing"
"github.com/go-acme/lego/v4/platform/tester"
"github.com/go-acme/lego/v4/platform/tester/servermock"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
const envDomain = envNamespace + "DOMAIN"
var envTest = tester.NewEnvTest(
EnvAccessKeyID,
EnvAccessKeySecret,
EnvRegionID,
).WithDomain(envDomain)
func TestNewDNSProvider(t *testing.T) {
testCases := []struct {
desc string
envVars map[string]string
expected string
}{
{
desc: "success",
envVars: map[string]string{
EnvAccessKeyID: "abc123",
EnvAccessKeySecret: "secret",
},
},
{
desc: "missing access key ID",
envVars: map[string]string{
EnvAccessKeyID: "",
EnvAccessKeySecret: "secret",
},
expected: "jdcloud: some credentials information are missing: JDCLOUD_ACCESS_KEY_ID",
},
{
desc: "missing access key secret",
envVars: map[string]string{
EnvAccessKeyID: "abc123",
EnvAccessKeySecret: "",
},
expected: "jdcloud: some credentials information are missing: JDCLOUD_ACCESS_KEY_SECRET",
},
{
desc: "missing credentials",
envVars: map[string]string{},
expected: "jdcloud: some credentials information are missing: JDCLOUD_ACCESS_KEY_ID,JDCLOUD_ACCESS_KEY_SECRET",
},
}
for _, test := range testCases {
t.Run(test.desc, func(t *testing.T) {
defer envTest.RestoreEnv()
envTest.ClearEnv()
envTest.Apply(test.envVars)
p, err := NewDNSProvider()
if test.expected == "" {
require.NoError(t, err)
require.NotNil(t, p)
require.NotNil(t, p.config)
require.NotNil(t, p.client)
} else {
require.EqualError(t, err, test.expected)
}
})
}
}
func TestNewDNSProviderConfig(t *testing.T) {
testCases := []struct {
desc string
accessKeyID string
accessKeySecret string
expected string
}{
{
desc: "success",
accessKeyID: "abc123",
accessKeySecret: "secret",
},
{
desc: "missing access key ID",
accessKeySecret: "secret",
expected: "jdcloud: missing credentials",
},
{
desc: "missing access key secret",
accessKeyID: "abc123",
expected: "jdcloud: missing credentials",
},
{
desc: "missing credentials",
expected: "jdcloud: missing credentials",
},
}
for _, test := range testCases {
t.Run(test.desc, func(t *testing.T) {
config := NewDefaultConfig()
config.AccessKeyID = test.accessKeyID
config.AccessKeySecret = test.accessKeySecret
config.RegionID = "cn-north-1"
p, err := NewDNSProviderConfig(config)
if test.expected == "" {
require.NoError(t, err)
require.NotNil(t, p)
require.NotNil(t, p.config)
require.NotNil(t, p.client)
} else {
require.EqualError(t, err, test.expected)
}
})
}
}
func TestLivePresent(t *testing.T) {
if !envTest.IsLiveTest() {
t.Skip("skipping live test")
}
envTest.RestoreEnv()
provider, err := NewDNSProvider()
require.NoError(t, err)
err = provider.Present(envTest.GetDomain(), "", "123d==")
require.NoError(t, err)
}
func TestLiveCleanUp(t *testing.T) {
if !envTest.IsLiveTest() {
t.Skip("skipping live test")
}
envTest.RestoreEnv()
provider, err := NewDNSProvider()
require.NoError(t, err)
err = provider.CleanUp(envTest.GetDomain(), "", "123d==")
require.NoError(t, err)
}
func mockBuilder() *servermock.Builder[*DNSProvider] {
return servermock.NewBuilder(
func(server *httptest.Server) (*DNSProvider, error) {
config := NewDefaultConfig()
config.AccessKeyID = "abc123"
config.AccessKeySecret = "secret"
config.RegionID = "cn-north-1"
p, err := NewDNSProviderConfig(config)
if err != nil {
return nil, err
}
serverURL, _ := url.Parse(server.URL)
p.client.Config.SetEndpoint(net.JoinHostPort(serverURL.Hostname(), serverURL.Port()))
p.client.Config.SetScheme(serverURL.Scheme)
p.client.Config.SetTimeout(server.Client().Timeout)
return p, nil
},
)
}
func TestDNSProvider_Present(t *testing.T) {
provider := mockBuilder().
Route("GET /v2/regions/cn-north-1/domain",
http.HandlerFunc(func(rw http.ResponseWriter, req *http.Request) {
pageNumber := req.URL.Query().Get("pageNumber")
servermock.ResponseFromFixture(
fmt.Sprintf("describe_domains_page%s.json", pageNumber),
).ServeHTTP(rw, req)
}),
servermock.CheckQueryParameter().Strict().
With("domainName", "example.com").
WithRegexp("pageNumber", `(1|2)`).
With("pageSize", "10"),
servermock.CheckHeader().
WithRegexp("Authorization",
`JDCLOUD2-HMAC-SHA256 Credential=abc123/\d{8}/cn-north-1/domainservice/jdcloud2_request, SignedHeaders=content-type;host;x-jdcloud-date;x-jdcloud-nonce, Signature=\w+`).
WithRegexp("X-Jdcloud-Date", `\d{8}T\d{6}Z`).
WithRegexp("X-Jdcloud-Nonce", `[\w-]+`),
).
Route("POST /v2/regions/cn-north-1/domain/20/ResourceRecord",
servermock.ResponseFromFixture("create_record.json"),
servermock.CheckRequestJSONBodyFromFixture("create_record-request.json"),
servermock.CheckHeader().
WithRegexp("Authorization",
`JDCLOUD2-HMAC-SHA256 Credential=abc123/\d{8}/cn-north-1/domainservice/jdcloud2_request, SignedHeaders=content-type;host;x-jdcloud-date;x-jdcloud-nonce, Signature=\w+`).
WithRegexp("X-Jdcloud-Date", `\d{8}T\d{6}Z`).
WithRegexp("X-Jdcloud-Nonce", `[\w-]+`),
).
Build(t)
err := provider.Present("example.com", "abc", "123d==")
require.NoError(t, err)
require.Len(t, provider.domainIDs, 1)
require.Len(t, provider.recordIDs, 1)
assert.Equal(t, 20, provider.domainIDs["abc"])
assert.Equal(t, 123, provider.recordIDs["abc"])
}
func TestDNSProvider_CleanUp(t *testing.T) {
provider := mockBuilder().
Route("DELETE /v2/regions/cn-north-1/domain/20/ResourceRecord/123",
servermock.ResponseFromFixture("delete_record.json"),
servermock.CheckHeader().
WithRegexp("Authorization",
`JDCLOUD2-HMAC-SHA256 Credential=abc123/\d{8}/cn-north-1/domainservice/jdcloud2_request, SignedHeaders=content-type;host;x-jdcloud-date;x-jdcloud-nonce, Signature=\w+`).
WithRegexp("X-Jdcloud-Date", `\d{8}T\d{6}Z`).
WithRegexp("X-Jdcloud-Nonce", `[\w-]+`),
).
Build(t)
provider.domainIDs["abc"] = 20
provider.recordIDs["abc"] = 123
err := provider.CleanUp("example.com", "abc", "123d==")
require.NoError(t, err)
}

View file

@ -99,6 +99,7 @@ import (
"github.com/go-acme/lego/v4/providers/dns/ispconfig"
"github.com/go-acme/lego/v4/providers/dns/ispconfigddns"
"github.com/go-acme/lego/v4/providers/dns/iwantmyname"
"github.com/go-acme/lego/v4/providers/dns/jdcloud"
"github.com/go-acme/lego/v4/providers/dns/joker"
"github.com/go-acme/lego/v4/providers/dns/keyhelp"
"github.com/go-acme/lego/v4/providers/dns/liara"
@ -377,6 +378,8 @@ func NewDNSChallengeProviderByName(name string) (challenge.Provider, error) {
return ispconfigddns.NewDNSProvider()
case "iwantmyname":
return iwantmyname.NewDNSProvider()
case "jdcloud":
return jdcloud.NewDNSProvider()
case "joker":
return joker.NewDNSProvider()
case "keyhelp":