Skip to content
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

ddclient: Cloudflare - add Cloudflare dns ip check option #4184

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ddclient: Cloudflare - add Cloudflare dns ip check option #4184

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
1 change: 1 addition & 0 deletions dns/ddclient/src/opnsense/mvc/app/models/OPNsense/DynDNS/DynDNS.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@
<web_cloudflare>cloudflare</web_cloudflare>
<web_cloudflare_ipv4 value="cloudflare-ipv4">cloudflare-ipv4</web_cloudflare_ipv4>
<web_cloudflare_ipv6 value="cloudflare-ipv6">cloudflare-ipv6</web_cloudflare_ipv6>
<dns_cloudflare value="dns_cloudflare-dns">cloudflare-dns</dns_cloudflare>
<web_dyndns>dyndns</web_dyndns>
<web_freedns>freedns</web_freedns>
<web_he>he</web_he>
Expand Down
27 changes: 26 additions & 1 deletion dns/ddclient/src/opnsense/scripts/ddclient/lib/address.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@
import subprocess
import re
import ipaddress
import dns.resolver
import dns.rdataclass
from urllib.parse import urlparse

checkip_service_list = {
Expand All @@ -49,6 +51,17 @@
'zoneedit': '%s://dynamic.zoneedit.com/checkip.html'
}

checkip_dns_list = {
'cloudflare-dns': {
'nameservers': ['1.1.1.1','1.0.0.1'],
'resolve_params': {
'qname': 'whoami.cloudflare',
'rdtype': 'TXT',
'rdclass': dns.rdataclass.from_text('CH')
}
}
}


def extract_address(host, txt):
""" Extract first IPv4 or IPv6 address from provided string
Expand All @@ -68,12 +81,24 @@ def extract_address(host, txt):


def checkip(service, proto='https', timeout='10', interface=None):
""" find ip address using external services defined in checkip_service_list
""" find ip address using external web services defined in checkip_service_list or dns services defined in checkip_dns_list
:param proto: protocol
:param timeout: timeout in seconds
:param interface: bind to interface
:return: str
"""
if service.startswith('dns_'):
svc = service[4:]
if svc in checkip_dns_list:
svc_info = checkip_dns_list[svc]
resolve_params = svc_info['resolve_params']
dns_resolver = dns.resolver.Resolver()
dns_resolver.nameservers = svc_info['nameservers']
try:
dns_response = dns_resolver.resolve(**resolve_params)
return dns_response[0].to_text().strip('"')
except:
return ''
if service.startswith('web_'):
# configuration name, strip web_ part
service = service[4:]
Expand Down