Catch SSL errors

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

diff --git a/src/ddns/system.py b/src/ddns/system.py
index 79bf19212c04ea08a1fdb80117bbceb5ceee1365..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
@@ -180,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)
@@ -193,6 +200,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
@@ -205,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