MAAS: fix issues with url_helper and oauth module

This would cause problems in the event that we actually had a bad
clock.  We add a retry in the main (for test) also, to ensure that
the oauth timestamp fix gets in place.

LP: #1499869

1 files changed, 6 insertions, 2 deletions

diff --git a/cloudinit/url_helper.py b/cloudinit/url_helper.py
index a93847ce..f2e1390e 100644
--- a/cloudinit/url_helper.py
+++ b/cloudinit/url_helper.py
@@ -264,7 +264,9 @@ def readurl(url, data=None, timeout=None, retries=0, sec_between=1,
                     # ssl exceptions are not going to get fixed by waiting a
                     # few seconds
                     break
-            if exception_cb and not exception_cb(req_args.copy(), excps[-1]):
+            if exception_cb and exception_cb(req_args.copy(), excps[-1]):
+                # if an exception callback was given it should return None
+                # a true-ish value means to break and re-raise the exception
                 break
             if i + 1 < manual_tries and sec_between > 0:
                 LOG.debug("Please wait %s seconds while we wait to try again",
@@ -404,7 +406,7 @@ class OauthUrlHelper(object):
     def read_skew_file(self):
         if self.skew_data_file and os.path.isfile(self.skew_data_file):
             with open(self.skew_data_file, mode="r") as fp:
-                return json.load(fp.read())
+                return json.load(fp)
         return None
 
     def update_skew_file(self, host, value):
@@ -412,6 +414,8 @@ class OauthUrlHelper(object):
         if not self.skew_data_file:
             return
         cur = self.read_skew_file()
+        if cur is None:
+            cur = {}
         cur[host] = value
         with open(self.skew_data_file, mode="w") as fp:
             fp.write(json.dumps(cur))