Skip to content

fix: expand token regex to support newer cfut_ format tokens #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Toothless5143 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix: expand token regex to support newer cfut_ format tokens #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
757f68b
fix: expand token regex to support newer cfut_ format tokens
Toothless5143 Mar 22, 2026
24a06d7
fix: expand token regex to support newer cfut_ format tokens
Toothless5143 Mar 22, 2026
3544756
fix: expand token regex to support newer cfut_ format tokens
Toothless5143 Mar 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions cloudflare.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
28 changes: 17 additions & 11 deletions cloudflare_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
)
}
}
}