diff --git a/cloudflare.go b/cloudflare.go index 10b159b..e23044e 100644 --- a/cloudflare.go +++ b/cloudflare.go @@ -23,8 +23,8 @@ import ( "github.com/libdns/cloudflare" ) -// cloudflareTokenRegexp matches Cloudflare tokens consisting of 35 to 50 alphanumeric characters, dashes, or underscores. -var cloudflareTokenRegexp = regexp.MustCompile(`^[A-Za-z0-9_-]{35,50}$`) +// cloudflareTokenRegexp matches Cloudflare tokens consisting of 35 to 70 alphanumeric characters, dashes, or underscores. +var cloudflareTokenRegexp = regexp.MustCompile(`^[A-Za-z0-9_-]{35,70}$`) // Provider wraps the provider implementation as a Caddy module. type Provider struct{ *cloudflare.Provider } diff --git a/cloudflare_test.go b/cloudflare_test.go index e9d81e2..1b69049 100644 --- a/cloudflare_test.go +++ b/cloudflare_test.go @@ -163,17 +163,23 @@ func TestInvalidTokens(t *testing.T) { } func TestValidToken(t *testing.T) { - goodToken := "Sqqty8-Vn0iOP29rvqYgwKz_xqGQ4y5JhuVL1-qU" - config := fmt.Sprintf(`cloudflare %s`, goodToken) - dispenser := caddyfile.NewTestDispenser(config) - p := Provider{&cloudflare.Provider{}} + goodTokens := []string{ + "Sqqty8-Vn0iOP29rvqYgwKz_xqGQ4y5JhuVL1-qU", + "cfut_o05zJzvjuYIAytVYUGhzuGlGnuxbKDINWqnVk6mP560d0f24", + } - err := p.UnmarshalCaddyfile(dispenser) - if err != nil { - t.Errorf( - "Expected valid token '%s', but validation failed: %v", - goodToken, - err, - ) + for _, goodToken := range goodTokens { + config := fmt.Sprintf(`cloudflare %s`, goodToken) + dispenser := caddyfile.NewTestDispenser(config) + p := Provider{&cloudflare.Provider{}} + + err := p.UnmarshalCaddyfile(dispenser) + if err != nil { + t.Errorf( + "Expected valid token '%s', but validation failed: %v", + goodToken, + err, + ) + } } }