upstream/opnsense-plugins
1
0
Fork 0
mirror of https://github.com/opnsense/plugins.git synced 2026-05-28 04:34:15 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

dns/dyndns: Fix for using apex domains with cloudflare DDNS

Browse source 
When refactoring the Cloudflare DDNS code, I removed a bunch of assumptions
but inadvertently added one. The refactored code did not allow for "apex"
domain records, records for which there is no hostname, just the bare
domain. (Traditionally, these have been referred to as '@' records but
with the Cloudflare API, you just hand it the name of the zone.)

Ideally there would be a checkbox or something in the UI for this, or
even better a way to specify the record and zone separately but in lieu of
that, we first try to break the provided string down into hostname and
domain portions and look up the zoneId from that. If that fails, we try
to look up the zondId using the whole string. And then finally fail if
neither return a zone from the API.

Hopefully fixes #926 and possibly the issue reported in PR #861.

(cherry picked from commit 2b4f2c8750)
(cherry picked from commit ddb72d981d)
This commit is contained in:
Charles Ulrich 2018-12-16 19:11:13 -05:00 committed by Franco Fichtner
parent 1d96fa4dbd
commit de633be28a
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dns/dyndns/Makefile
View file

@ -1,6 +1,5 @@
PLUGIN_NAME= dyndns
PLUGIN_VERSION= 1.10
PLUGIN_REVISION= 1
PLUGIN_VERSION= 1.11
PLUGIN_COMMENT= Dynamic DNS Support
PLUGIN_MAINTAINER= franco@opnsense.org

17
dns/dyndns/src/etc/inc/plugins.inc.d/dyndns/phpDynDNS.inc
View file

@ -713,9 +713,6 @@ class updatedns
case 'cloudflare-v6':
$baseUrl = 'https://api.cloudflare.com/client/v4';
$fqdn = str_replace(' ', '', $this->_dnsHost);
$fqdnParts = explode('.', $fqdn);
$hostName = array_shift($fqdnParts);
$domainName = implode('.', $fqdnParts);
$recordType = ($this->_useIPv6) ? 'AAAA' : 'A';
$hostData = array(
"content" => "{$this->_dnsIP}",
@ -732,10 +729,24 @@ class updatedns
// Get zone ID
$zonesUrl = "$baseUrl/zones";
// First, try removing the first part of the FQDN,
// under the assumption that it is probably the hostname,
// and look up the zone from what's left
$fqdnParts = explode('.', $fqdn);
$hostName = array_shift($fqdnParts);
$domainName = implode('.', $fqdnParts);
$getZoneId = "$zonesUrl/?name=$domainName";
curl_setopt($ch, CURLOPT_URL, $getZoneId);
$output = json_decode(curl_exec($ch));
$zoneId = $output->result[0]->id;
if (empty($zoneId)) {
// now try the full "hostname" as provided by the UI
$getZoneId = "$zonesUrl/?name=$fqdn";
curl_setopt($ch, CURLOPT_URL, $getZoneId);
$output = json_decode(curl_exec($ch));
$zoneId = $output->result[0]->id;
}
if ($zoneId) { // If zone ID was found get host ID
$dnsRecordsUrl = "$zonesUrl/$zoneId/dns_records";
$getHostId = "$dnsRecordsUrl?name=$fqdn&type=$recordType";