Skip to content

Fix zone lookup and handle "An identical record already exists" error #10

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
yzqzss wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix zone lookup and handle "An identical record already exists" error #10

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09e4881
fix: missed CFZone.id property
yzqzss Nov 12, 2024
b99f397
fix:acmedns: handle "An identical record already exists"
yzqzss Nov 12, 2024
67ef5a5
fix: INCORRECT zone matching logic !!!
yzqzss Nov 14, 2024
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
14 changes: 10 additions & 4 deletions worker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ class CFAPI {
static async getZoneByName(name, exactMatch = false) {
const zones = await CFAPI.listZones();
for (let zone of zones) {
if ((exactMatch && name === zone.name) || !exactMatch || name.endsWith(zone.name))
if ((exactMatch && name === zone.name) || (!exactMatch && name.endsWith(zone.name)))
return { id: zone.id, name: zone.name };
}
return null;
Expand Down Expand Up @@ -779,7 +779,7 @@ class Listener {
const tok_parts = authtok.decodeToken(bearertoken[1]);
// Get CloudFlare Zone ID
try {
zone_id = tok_parts.aud || DNS01CF.config.CF_ZONE_ID || (await CFAPI.getZoneByName(json.fqdn));
zone_id = tok_parts.aud || DNS01CF.config.CF_ZONE_ID || (await CFAPI.getZoneByName(json.fqdn)).id;
} catch (e) {
return dns01cfError(`Unable to list zones: ${e.message}`, { status: 500 });
}
Expand Down Expand Up @@ -848,7 +848,7 @@ class Listener {
// Get CloudFlare Zone ID
let zone_id;
try {
zone_id = tok_parts.aud || DNS01CF.config.CF_ZONE_ID || (await CFAPI.getZoneByName(json.subdomain));
zone_id = tok_parts.aud || DNS01CF.config.CF_ZONE_ID || ((await CFAPI.getZoneByName(json.subdomain)).id);
} catch (e) {
return dns01cfError(`Unable to list zones: ${e.message}`, { status: 500 });
}
Expand All @@ -862,12 +862,18 @@ class Listener {
try {
actres = await CFAPI.setRecord(zone_id, json.subdomain, json.txt);
} catch (e) {
return dns01cfError(`Error during DNS update: ${e.message}`, { status: 500 });
if (e.message.includes("An identical record already exists")) {
// it's a duplicate, so we'll just return success
actres = { message: e.message };
} else {
return dns01cfError(`Error during DNS update: ${e.message}`, { status: 500 });
}
}
return dns01cfResponse(
{
result: "ok",
message: `'${json.subdomain}' set to value '${json.txt}'`,
acmedns_success_msg: `${json.txt}`,
response: actres,
},
{ status: 200 },
Expand Down