Skip to content

Fix Cloudflare token verification #917

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

Merged
saeedvaziry merged 1 commit into from
Nov 8, 2025
Merged

Fix Cloudflare token verification #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 6 additions & 3 deletions app/DNSProviders/Cloudflare.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,16 @@ public function credentialData(array $input): array
public function connect(array $credentials): bool
{
try {
// Use /zones endpoint to verify token works for both user-scoped and account-scoped tokens
// This also verifies the token has Zone:Read permissions which we need
$response = Http::withHeaders([
'Authorization' => 'Bearer '.$credentials['token'],
'Content-Type' => 'application/json',
])->baseUrl(self::API_BASE_URL)
->get('user/tokens/verify');
])
->baseUrl(self::API_BASE_URL)
->get('zones', ['per_page' => 1]);

if ($response->successful() && $response->json('success')) {
if ($response->successful() && $response->json('success') !== false) {
return true;
}

Expand Down
14 changes: 6 additions & 8 deletions tests/Unit/DNSProviders/CloudflareTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,9 @@ public function test_credential_data(): void
public function test_connect_success(): void
{
Http::fake([
'api.cloudflare.com/client/v4/user/tokens/verify' => Http::response([
'api.cloudflare.com/client/v4/zones*' => Http::response([
'success' => true,
'result' => [
'id' => 'test-id',
'status' => 'active',
],
'result' => [],
], 200),
]);

Expand All @@ -75,7 +72,8 @@ public function test_connect_success(): void
$this->assertTrue($result);

Http::assertSent(function (Request $request) {
return str_contains($request->url(), 'api.cloudflare.com/client/v4/user/tokens/verify')
return str_contains($request->url(), 'api.cloudflare.com/client/v4/zones')
&& str_contains($request->url(), 'per_page=1')
&& $request->header('Authorization')[0] === 'Bearer test-token-123'
&& $request->header('Content-Type')[0] === 'application/json';
});
Expand All @@ -84,7 +82,7 @@ public function test_connect_success(): void
public function test_connect_failure_invalid_response(): void
{
Http::fake([
'api.cloudflare.com/client/v4/user/tokens/verify' => Http::response([
'api.cloudflare.com/client/v4/zones*' => Http::response([
'success' => false,
'errors' => [
['message' => 'Invalid token'],
Expand All @@ -102,7 +100,7 @@ public function test_connect_failure_invalid_response(): void
public function test_connect_failure_http_error(): void
{
Http::fake([
'api.cloudflare.com/client/v4/user/tokens/verify' => Http::response([], 401),
'api.cloudflare.com/client/v4/zones*' => Http::response([], 401),
]);

$credentials = ['token' => 'invalid-token'];
Expand Down