home/cert-manager
2
0
Fork 0
mirror of https://github.com/wahyd4/cert-manager.git synced 2026-08-09 05:06:38 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4465 from andrewmwhite/show-invalid-access-token

Browse Source 
Clouldflare: Show API error messages (e.g., invalid access token)
This commit is contained in:
jetstack-bot
2021-09-27 15:20:46 +01:00
committed by GitHub
parent 5a8b970c97 4e336d28f4
commit f4be63c208
2 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/issuer/acme/dns/cloudflare/cloudflare.go
+6
View File
@@ -102,6 +102,7 @@ func FindNearestZoneForFQDN(c DNSProviderType, fqdn string) (DNSZone, error) {
}
mappedFQDN := strings.Split(fqdn, ".")
nextName := util.UnFqdn(fqdn) //remove the trailing dot
var lastErr error
for i := 0; i < len(mappedFQDN)-1; i++ {
var from, to = len(mappedFQDN[i]) + 1, len(nextName)
if from > to {
@@ -111,8 +112,10 @@ func FindNearestZoneForFQDN(c DNSProviderType, fqdn string) (DNSZone, error) {
nextName = string([]rune(nextName)[from:to])
continue
}
lastErr = nil
result, err := c.makeRequest("GET", "/zones?name="+nextName, nil)
if err != nil {
lastErr = err
continue
}
var zones []DNSZone
@@ -126,6 +129,9 @@ func FindNearestZoneForFQDN(c DNSProviderType, fqdn string) (DNSZone, error) {
}
nextName = string([]rune(nextName)[from:to])
}
if lastErr != nil {
return DNSZone{}, fmt.Errorf("while attempting to find Zones for domain %s\n%s", fqdn, lastErr)
}
return DNSZone{}, fmt.Errorf("Found no Zones for domain %s (neither in the sub-domain nor in the SLD) please make sure your domain-entries in the config are correct and the API key is correctly setup with Zone.read rights.", fqdn)
}
pkg/issuer/acme/dns/cloudflare/cloudflare_test.go
+21 -1
View File
@@ -10,6 +10,7 @@ package cloudflare
import (
"encoding/json"
"fmt"
"io"
"os"
"testing"
@@ -42,8 +43,9 @@ func (c *DNSProviderMock) makeRequest(method, uri string, body io.Reader) (json.
func init() {
cflareEmail = os.Getenv("CLOUDFLARE_EMAIL")
cflareAPIKey = os.Getenv("CLOUDFLARE_API_KEY")
cflareAPIToken = os.Getenv("CLOUDFLARE_API_TOKEN")
cflareDomain = os.Getenv("CLOUDFLARE_DOMAIN")
if len(cflareEmail) > 0 && len(cflareAPIKey) > 0 && len(cflareDomain) > 0 {
if len(cflareEmail) > 0 && (len(cflareAPIKey) > 0 || len(cflareAPIToken) > 0) && len(cflareDomain) > 0 {
cflareLiveTest = true
}
}
@@ -108,7 +110,25 @@ func TestFindNearestZoneForFQDN(t *testing.T) {
assert.NoError(t, err)
assert.Equal(t, zone, DNSZone{ID: "1a23cc4567b8def91a01c23a456e78cd", Name: "sub.domain.com"})
}
func TestFindNearestZoneForFQDNInvalidToken(t *testing.T) {
dnsProvider := new(DNSProviderMock)
noResult := []byte(`[]`)
dnsProvider.On("makeRequest", "GET", "/zones?name=_acme-challenge.test.sub.domain.com", mock.Anything).Maybe().Return(noResult, nil)
dnsProvider.On("makeRequest", "GET", "/zones?name=test.sub.domain.com", mock.Anything).Maybe().Return(noResult, nil)
dnsProvider.On("makeRequest", "GET", "/zones?name=sub.domain.com", mock.Anything).Maybe().Return(noResult, nil)
dnsProvider.On("makeRequest", "GET", "/zones?name=domain.com", mock.Anything).Return(noResult,
fmt.Errorf(`while attempting to find Zones for domain _acme-challenge.test.sub.domain.com
while querying the Cloudflare API for GET "/zones?name=_acme-challenge.test.sub.domain.com"
Error: 9109: Invalid access token`))
_, err := FindNearestZoneForFQDN(dnsProvider, "_acme-challenge.test.sub.domain.com.")
assert.Error(t, err)
assert.Contains(t, err.Error(), "Invalid access token")
}
func TestCloudFlarePresent(t *testing.T) {