ddns August 2015

ddns@lists.ipfire.org

2 participants
3 discussions

[PATCH] Silently fall back to the guess the IP address with a remote server
by Michael Tremer 15 Jan '16

15 Jan '16

For most OSes we do not implement a way to read the current IP address from the local configuration. In that case ddns used to throw an exception and stop. This patch changes that in the way that ddns will fall back to guess the IP address with help of a remote server. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- src/ddns/system.py | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/ddns/system.py b/src/ddns/system.py index 0d90ce6..c268ba5 100644 --- a/src/ddns/system.py +++ b/src/ddns/system.py @@ -66,6 +66,13 @@ class DDNSSystem(object): return proxy def get_local_ip_address(self, proto): + ip_address = self._get_local_ip_address(proto) + + # Check if the IP address is usable and only return it then + if self._is_usable_ip_address(proto, ip_address): + return ip_address + + def _get_local_ip_address(self, proto): # Legacy code for IPFire 2. if self.distro == "ipfire-2" and proto == "ipv4": try: @@ -281,16 +288,18 @@ class DDNSSystem(object): guess_ip = self.core.settings.get("guess_external_ip", "true") guess_ip = guess_ip in ("true", "yes", "1") - # If the external IP address should be used, we just do that. - if guess_ip: - return self.guess_external_ip_address(proto) - # Get the local IP address. - local_ip_address = self.get_local_ip_address(proto) + local_ip_address = None + + if not guess_ip: + try: + local_ip_address = self.get_local_ip_address(proto) + except NotImplementedError: + logger.warning(_("Falling back to check the IP address with help of a public server")) - # If the local IP address is not usable, we must guess - # the correct IP address... - if not self._is_usable_ip_address(proto, local_ip_address): + # If no local IP address could be determined, we will fall back to the guess + # it with help of an external server... + if not local_ip_address: local_ip_address = self.guess_external_ip_address(proto) return local_ip_address -- 2.4.3

1 1

ddns patches for desec.io provider support
by Jonas 15 Oct '15

15 Oct '15

Hi, i'd like to add support for the desec.io dyndns service. It is DynDNS 2 compatible, so the patch is small. Regards, Jonas

4 9

[PATCH] Catch SSL errors
by Michael Tremer 03 Aug '15

03 Aug '15

Properly catch SSL errors. When a connection could not be established, the ddns client will try again. If an invalid certificate is presented future updates are held back for the usual time. Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org> --- src/ddns/errors.py | 15 +++++++++++++++ src/ddns/system.py | 11 +++++++++++ 2 files changed, 26 insertions(+) diff --git a/src/ddns/errors.py b/src/ddns/errors.py index 58928f3..637cf59 100644 --- a/src/ddns/errors.py +++ b/src/ddns/errors.py @@ -64,6 +64,13 @@ class DDNSBlockedError(DDNSError): reason = N_("The server denies any updates from this client") +class DDNSCertificateError(DDNSError): + """ + Thrown when a server presented an invalid certificate. + """ + reason = N_("Invalid certificate") + + class DDNSConfigurationError(DDNSError): """ Thrown when invalid or insufficient @@ -125,6 +132,14 @@ class DDNSResolveError(DDNSNetworkError): reason = N_("Could not resolve DNS entry") +class DDNSSSLError(DDNSNetworkError): + """ + Raised when a SSL connection could not be + negotiated. + """ + reason = N_("SSL negotiation error") + + class DDNSServiceUnavailableError(DDNSNetworkError): """ Equivalent to HTTP error code 503. diff --git a/src/ddns/system.py b/src/ddns/system.py index 79bf192..832de6b 100644 --- a/src/ddns/system.py +++ b/src/ddns/system.py @@ -21,6 +21,7 @@ import base64 import re +import ssl import socket import urllib import urllib2 @@ -193,6 +194,16 @@ class DDNSSystem(object): except urllib2.URLError, e: if e.reason: + # Handle SSL errors + if isinstance(e.reason, ssl.SSLError): + e = e.reason + + if e.reason == "CERTIFICATE_VERIFY_FAILED": + raise DDNSCertificateError + + # Raise all other SSL errors + raise DDNSSSLError(e.reason) + # Name or service not known if e.reason.errno == -2: raise DDNSResolveError -- 2.4.3

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

ddns August 2015