Fixed bug: Some exceptions were not caught.

diff --git a/cgi-bin/dyndns.py b/cgi-bin/dyndns.py
index d62ebfc79e31720dcd92fff306da96da5b45d778..1d3e2d2567c0637ee1f37f45ceee88ee42f36e9c 100755 (executable)
--- a/cgi-bin/dyndns.py
+++ b/cgi-bin/dyndns.py
@@ -89,24 +89,23 @@ system   = fields.getvalue('system')
 url      = fields.getvalue('url')
 
 
 url      = fields.getvalue('url')
 
 

-# Optional Auth Basic
-auth = os.environ.get('HTTP_AUTHORIZATION') # auth == 'Basic cGhpbGlwcDpka2ZhamRrZg=='
-if auth: # empty string if HTTP_AUTHORIZATION not present
-       auth_parts = auth.split(' ')
-       auth_method = 'Basic'
-       if len(auth_parts) != 2 or auth_parts[0] != auth_method:
-               raise AuthWrongMethod()
-       try:
-               auth_decoded = base64.b64decode(auth_parts[1]) # auth_decoded == 'philipp:dkfajdkf'
-       except TypeError:
-               raise AuthBasicError()
-       auth_decoded_parts = auth_decoded.split(':')
-       if len(auth_decoded_parts) != 2:
-               raise AuthBasicError()
-       username, password = auth_decoded_parts
-
-

 try:
 try:

+       # Optional Auth Basic
+       auth = os.environ.get('HTTP_AUTHORIZATION') # auth == 'Basic cGhpbGlwcDpka2ZhamRrZg=='
+       if auth: # empty string if HTTP_AUTHORIZATION not present
+               auth_parts = auth.split(' ')
+               auth_method = 'Basic'
+               if len(auth_parts) != 2 or auth_parts[0] != auth_method:
+                       raise AuthWrongMethod()
+               try:
+                       auth_decoded = base64.b64decode(auth_parts[1]) # auth_decoded == 'philipp:dkfajdkf'
+               except TypeError:
+                       raise AuthBasicError()
+               auth_decoded_parts = auth_decoded.split(':')
+               if len(auth_decoded_parts) != 2:
+                       raise AuthBasicError()
+               username, password = auth_decoded_parts
+

        # check username and password
        if username is None and password is None:
                raise CredentialsMissing()
        # check username and password
        if username is None and password is None:
                raise CredentialsMissing()