mbiryukova/lego
1
0
Fork 0
forked from TrueCloudLab/lego
Code Pull requests Activity

dnsimple: fix challenge. (#666)

Browse source
This commit is contained in:
Ludovic Fernandez 2018-10-09 18:51:49 +02:00 committed by GitHub
parent 7701a8983b
commit 21f6cd8a12
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 121 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
providers/dns/dnsimple/dnsimple.go
View file

@ -78,7 +78,7 @@ func NewDNSProviderConfig(config *Config) (*DNSProvider, error) {
client.BaseURL = config.BaseURL
}
return &DNSProvider{client: client}, nil
return &DNSProvider{client: client, config: config}, nil
}
// Present creates a TXT record to fulfill the dns-01 challenge.
@ -87,18 +87,18 @@ func (d *DNSProvider) Present(domain, token, keyAuth string) error {
zoneName, err := d.getHostedZone(domain)
if err != nil {
return err
return fmt.Errorf("dnsimple: %v", err)
}
accountID, err := d.getAccountID()
if err != nil {
return err
return fmt.Errorf("dnsimple: %v", err)
}
recordAttributes := d.newTxtRecord(zoneName, fqdn, value, d.config.TTL)
recordAttributes := newTxtRecord(zoneName, fqdn, value, d.config.TTL)
_, err = d.client.Zones.CreateRecord(accountID, zoneName, recordAttributes)
if err != nil {
return fmt.Errorf("API call failed: %v", err)
return fmt.Errorf("dnsimple: API call failed: %v", err)
}
return nil
@ -110,22 +110,23 @@ func (d *DNSProvider) CleanUp(domain, token, keyAuth string) error {
records, err := d.findTxtRecords(domain, fqdn)
if err != nil {
return err
return fmt.Errorf("dnsimple: %v", err)
}
accountID, err := d.getAccountID()
if err != nil {
return err
return fmt.Errorf("dnsimple: %v", err)
}
var lastErr error
for _, rec := range records {
_, err := d.client.Zones.DeleteRecord(accountID, rec.ZoneID, rec.ID)
if err != nil {
return err
lastErr = fmt.Errorf("dnsimple: %v", err)
}
}
return nil
return lastErr
}
// Timeout returns the timeout and interval to use when checking for DNS propagation.
@ -177,7 +178,7 @@ func (d *DNSProvider) findTxtRecords(domain, fqdn string) ([]dnsimple.ZoneRecord
return nil, err
}
recordName := d.extractRecordName(fqdn, zoneName)
recordName := extractRecordName(fqdn, zoneName)
result, err := d.client.Zones.ListRecords(accountID, zoneName, &dnsimple.ZoneRecordListOptions{Name: recordName, Type: "TXT", ListOptions: dnsimple.ListOptions{}})
if err != nil {
@ -187,8 +188,8 @@ func (d *DNSProvider) findTxtRecords(domain, fqdn string) ([]dnsimple.ZoneRecord
return result.Data, nil
}
func (d *DNSProvider) newTxtRecord(zoneName, fqdn, value string, ttl int) dnsimple.ZoneRecord {
name := d.extractRecordName(fqdn, zoneName)
func newTxtRecord(zoneName, fqdn, value string, ttl int) dnsimple.ZoneRecord {
name := extractRecordName(fqdn, zoneName)
return dnsimple.ZoneRecord{
Type: "TXT",
@ -198,7 +199,7 @@ func (d *DNSProvider) newTxtRecord(zoneName, fqdn, value string, ttl int) dnsimp
}
}
func (d *DNSProvider) extractRecordName(fqdn, domain string) string {
func extractRecordName(fqdn, domain string) string {
name := acme.UnFqdn(fqdn)
if idx := strings.Index(name, "."+domain); idx != -1 {
return name[:idx]

163
providers/dns/dnsimple/dnsimple_test.go
View file

@ -38,84 +38,125 @@ func restoreEnv() {
os.Setenv("DNSIMPLE_BASE_URL", dnsimpleBaseURL)
}
//
// NewDNSProvider
//
func TestNewDNSProviderValid(t *testing.T) {
defer restoreEnv()
os.Setenv("DNSIMPLE_OAUTH_TOKEN", "123")
acme.UserAgent = "lego"
provider, err := NewDNSProvider()
assert.NotNil(t, provider)
assert.Equal(t, "lego", provider.client.UserAgent)
assert.NoError(t, err)
func TestNewDNSProvider(t *testing.T) {
testCases := []struct {
desc string
userAgent string
envVars map[string]string
expected string
}{
{
desc: "success",
userAgent: "lego",
envVars: map[string]string{
"DNSIMPLE_OAUTH_TOKEN": "my_token",
},
},
{
desc: "success: base url",
envVars: map[string]string{
"DNSIMPLE_OAUTH_TOKEN": "my_token",
"DNSIMPLE_BASE_URL": "https://api.dnsimple.test",
},
},
{
desc: "missing oauth token",
envVars: map[string]string{
"DNSIMPLE_OAUTH_TOKEN": "",
},
expected: "dnsimple: OAuth token is missing",
},
}
func TestNewDNSProviderValidWithBaseUrl(t *testing.T) {
for _, test := range testCases {
t.Run(test.desc, func(t *testing.T) {
defer restoreEnv()
os.Setenv("DNSIMPLE_OAUTH_TOKEN", "123")
os.Setenv("DNSIMPLE_BASE_URL", "https://api.dnsimple.test")
provider, err := NewDNSProvider()
assert.NotNil(t, provider)
assert.NoError(t, err)
assert.Equal(t, provider.client.BaseURL, "https://api.dnsimple.test")
for key, value := range test.envVars {
if len(value) == 0 {
os.Unsetenv(key)
} else {
os.Setenv(key, value)
}
}
func TestNewDNSProviderInvalidWithMissingOauthToken(t *testing.T) {
defer restoreEnv()
os.Setenv("DNSIMPLE_OAUTH_TOKEN", "")
provider, err := NewDNSProvider()
assert.Nil(t, provider)
assert.EqualError(t, err, "dnsimple: OAuth token is missing")
if test.userAgent != "" {
acme.UserAgent = test.userAgent
}
//
// NewDNSProviderCredentials
//
p, err := NewDNSProvider()
func TestNewDNSProviderCredentialsValid(t *testing.T) {
config := NewDefaultConfig()
config.AccessToken = "123"
config.BaseURL = ""
provider, err := NewDNSProviderConfig(config)
if len(test.expected) == 0 {
require.NoError(t, err)
require.NotNil(t, provider)
require.NotNil(t, p)
require.NotNil(t, p.config)
require.NotNil(t, p.client)
assert.Equal(t, "lego", provider.client.UserAgent)
assert.NoError(t, err)
baseURL := os.Getenv("DNSIMPLE_BASE_URL")
if baseURL != "" {
assert.Equal(t, baseURL, p.client.BaseURL)
}
func TestNewDNSProviderCredentialsValidWithBaseUrl(t *testing.T) {
config := NewDefaultConfig()
config.AccessToken = "123"
config.BaseURL = "https://api.dnsimple.test"
if test.userAgent != "" {
assert.Equal(t, "lego", p.client.UserAgent)
}
provider, err := NewDNSProviderConfig(config)
} else {
require.EqualError(t, err, test.expected)
}
})
}
}
func TestNewDNSProviderConfig(t *testing.T) {
testCases := []struct {
desc string
accessToken string
baseURL string
expected string
}{
{
desc: "success",
accessToken: "my_token",
baseURL: "",
},
{
desc: "success: base url",
accessToken: "my_token",
baseURL: "https://api.dnsimple.test",
},
{
desc: "missing oauth token",
expected: "dnsimple: OAuth token is missing",
},
}
for _, test := range testCases {
t.Run(test.desc, func(t *testing.T) {
defer restoreEnv()
os.Unsetenv("DNSIMPLE_OAUTH_TOKEN")
os.Unsetenv("DNSIMPLE_BASE_URL")
config := NewDefaultConfig()
config.AccessToken = test.accessToken
config.BaseURL = test.baseURL
p, err := NewDNSProviderConfig(config)
if len(test.expected) == 0 {
require.NoError(t, err)
require.NotNil(t, provider)
require.NotNil(t, p)
require.NotNil(t, p.config)
require.NotNil(t, p.client)
assert.Equal(t, provider.client.BaseURL, "https://api.dnsimple.test")
if test.baseURL != "" {
assert.Equal(t, test.baseURL, p.client.BaseURL)
}
func TestNewDNSProviderCredentialsInvalidWithMissingOauthToken(t *testing.T) {
config := NewDefaultConfig()
config.AccessToken = ""
config.BaseURL = ""
provider, err := NewDNSProviderConfig(config)
assert.Nil(t, provider)
assert.EqualError(t, err, "dnsimple: OAuth token is missing")
} else {
require.EqualError(t, err, test.expected)
}
})
}
}
//