Fabio/ddclient
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support for cloudflare API tokens. (#102)

Browse source 
* Added support for cloudflare API tokens. Do not provide a login if using one. The token must have permissions for All zones - Zone:Read, DNS:Edit.

* Fixed the grammar in the comments.

Co-authored-by: Greg Best <greg@NinjaCatServer>
This commit is contained in:
Greg Best 2020-04-07 06:46:50 +12:00 committed by GitHub
parent 45ae9913f9
commit 18cc3a99e9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 261 additions and 250 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
ddclient
View file

@ -443,6 +443,7 @@ my %variables = (
'cloudflare-common-defaults' => { 'cloudflare-common-defaults' => {
'server' => setv(T_FQDNP, 1, 0, 1, 'api.cloudflare.com/client/v4', undef), 'server' => setv(T_FQDNP, 1, 0, 1, 'api.cloudflare.com/client/v4', undef),
'zone' => setv(T_FQDN, 1, 0, 1, '', undef), 'zone' => setv(T_FQDN, 1, 0, 1, '', undef),
'login' => setv(T_LOGIN, 0, 0, 1, 'token', undef),
'static' => setv(T_BOOL, 0, 1, 1, 0, undef), 'static' => setv(T_BOOL, 0, 1, 1, 0, undef),
'wildcard' => setv(T_BOOL, 0, 1, 1, 0, undef), 'wildcard' => setv(T_BOOL, 0, 1, 1, 0, undef),
'mx' => setv(T_OFQDN, 0, 1, 1, '', undef), 'mx' => setv(T_OFQDN, 0, 1, 1, '', undef),
@ -4524,23 +4525,29 @@ The 'cloudflare' protocol is used by DNS service offered by www.cloudflare.com.
Configuration variables applicable to the 'cloudflare' protocol are: Configuration variables applicable to the 'cloudflare' protocol are:
protocol=cloudflare ## protocol=cloudflare ##
server=fqdn.of.service ## defaults to api.cloudflare.com/client/v4 server=fqdn.of.service ## defaults to api.cloudflare.com/client/v4
login=service-login ## login name and password registered with the service login=service-login ## login email when using a global API key
password=service-password ## password=service-password ## Global API key, or an API token. If using an API token, it must have the permissions "Zone - DNS - Edit" and "Zone - Zone - Read". The Zone resources must be "Include - All zones".
fully.qualified.host ## the host registered with the service. fully.qualified.host ## the host registered with the service.
Example ${program}.conf file entries: Example ${program}.conf file entries:
## single host update ## single host update using a global API key
protocol=cloudflare, \\ protocol=cloudflare, \\
zone=dns.zone, \\ zone=dns.zone, \\
login=my-cloudflare.com-login, \\ login=my-cloudflare.com-login, \\
password=my-cloudflare.com-secure-token \\ password=my-cloudflare-global-key \\
myhost.com
## single host update using an API token
protocol=cloudflare, \\
zone=dns.zone, \\
password=cloudflare-api-token \\
myhost.com myhost.com
## multiple host update to the custom DNS service ## multiple host update to the custom DNS service
protocol=cloudflare, \\ protocol=cloudflare, \\
zone=dns.zone, \\ zone=dns.zone, \\
login=my-cloudflare.com-login, \\ login=my-cloudflare.com-login, \\
password=my-cloudflare.com-secure-token \\ password=my-cloudflare-global-api-key \\
my-toplevel-domain.com,my-other-domain.com my-toplevel-domain.com,my-other-domain.com
EoEXAMPLE EoEXAMPLE
} }
@ -4560,9 +4567,13 @@ sub nic_cloudflare_update {
my $key = $hosts[0]; my $key = $hosts[0];
my $ip = $config{$key}{'wantip'}; my $ip = $config{$key}{'wantip'};
my $headers = "X-Auth-Email: $config{$key}{'login'}\n"; my $headers = "Content-Type: application/json\n";
$headers .= "X-Auth-Key: $config{$key}{'password'}\n"; if ($config{$key}{'login'} eq 'token') {
$headers .= "Content-Type: application/json"; $headers .= "Authorization: Bearer $config{$key}{'password'}";
} else {
$headers .= "X-Auth-Email: $config{$key}{'login'}\n";
$headers .= "X-Auth-Key: $config{$key}{'password'}";
}
# FQDNs # FQDNs
for my $domain (@hosts) { for my $domain (@hosts) {

4
sample-etc_ddclient.conf
View file

@ -210,8 +210,8 @@ ssl=yes # use ssl-support. Works with
#protocol=cloudflare, \ #protocol=cloudflare, \
#zone=domain.tld, \ #zone=domain.tld, \
#ttl=1, \ #ttl=1, \
#login=your-login-email, \ #login=your-login-email, \ # Only needed if you are using your global API key.
#password=APIKey \ #password=APIKey \ # This is either your global API key, or an API token. If you are using an API token, it must have the permissions "Zone - DNS - Edit" and "Zone - Zone - Read". The Zone resources must be "Include - All zones".
#domain.tld,my.domain.tld #domain.tld,my.domain.tld
## ##