Catch SSL errors

[oddments/ddns.git] / src / ddns / system.py

diff --git a/src/ddns/system.py b/src/ddns/system.py
index 396a339b363529ea4fd769fd45e8fcf4439f6fdb..0d90ce66ee38e6d604420449aa2cfabdecb7ffc8 100644 (file)
--- 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
@@ -166,6 +167,11 @@ class DDNSSystem(object):
                        return resp
 
                except urllib2.HTTPError, e:
+                       # Log response header.
+                       logger.debug(_("Response header (Status Code %s):") % e.code)
+                       for k, v in e.hdrs.items():
+                               logger.debug("  %s: %s" % (k, v))
+
                        # 400 - Bad request
                        if e.code == 400:
                                raise DDNSRequestError(e.reason)
@@ -175,6 +181,12 @@ class DDNSSystem(object):
                        elif e.code in (401, 403):
                                raise DDNSAuthenticationError(e.reason)
 
+                       # 404 - Not found
+                       # Either the provider has changed the API, or
+                       # there is an error on the server
+                       elif e.code == 404:
+                               raise DDNSNotFound(e.reason)
+
                        # 500 - Internal Server Error
                        elif e.code == 500:
                                raise DDNSInternalServerError(e.reason)
@@ -188,6 +200,20 @@ 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
+
                                # Network Unreachable (e.g. no IPv6 access)
                                if e.reason.errno == 101:
                                        raise DDNSNetworkUnreachableError
@@ -196,6 +222,10 @@ class DDNSSystem(object):
                                elif e.reason.errno == 111:
                                        raise DDNSConnectionRefusedError
 
+                               # No route to host
+                               elif e.reason.errno == 113:
+                                       raise DDNSNoRouteToHostError(req.host)
+
                        # Raise all other unhandled exceptions.
                        raise
 
@@ -282,7 +312,7 @@ class DDNSSystem(object):
                                r"^172\.(1[6-9]|2[0-9]|31)\.\d+\.\d+$",
 
                                # Dual Stack Lite address space
-                               r"^100\.(6[4-9]|[7-9][0-9]|1[01][0-9]|12[0-7])\.\d+\.\d+",
+                               r"^100\.(6[4-9]|[7-9][0-9]|1[01][0-9]|12[0-7])\.\d+\.\d+$",
                        )
 
                        for match in matches:
@@ -316,6 +346,10 @@ class DDNSSystem(object):
                        if e.errno == -2:
                                return []
 
+                       # Temporary failure in name resolution
+                       elif e.errno == -3:
+                               raise DDNSResolveError(hostname)
+
                        # No record for requested family available (e.g. no AAAA)
                        elif e.errno == -5:
                                return []