From 87e5dd2bfd293f229bab472e946ef12580facf6c Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 25 Sep 2015 19:49:39 +0200
Subject: Add a test for when merge backup fails.
Also, avoid tracebacks on ECONNREFUSED by catching urrllib2.URLError.
---
tools/certtools.py | 3 +++
tools/loginfo.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
tools/mergetools.py | 40 ++++++++++++++++++++++++++++++++++++++--
3 files changed, 89 insertions(+), 2 deletions(-)
create mode 100755 tools/loginfo.py
(limited to 'tools')
diff --git a/tools/certtools.py b/tools/certtools.py
index 49f4b34..6cb4f55 100644
--- a/tools/certtools.py
+++ b/tools/certtools.py
@@ -311,6 +311,9 @@ def get_signature(baseurl, data, key=None):
result = http_request(baseurl + "plop/v1/signing/sth", params, key=key)
parsed_result = json.loads(result)
return base64.b64decode(parsed_result.get(u"result"))
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: get_signature", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print "ERROR: get_signature", e.read()
raise e
diff --git a/tools/loginfo.py b/tools/loginfo.py
new file mode 100755
index 0000000..c61ad1b
--- /dev/null
+++ b/tools/loginfo.py
@@ -0,0 +1,48 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2015, NORDUnet A/S.
+# See LICENSE for licensing information.
+
+import sys
+import argparse
+import yaml
+from certtools import create_ssl_context, get_sth
+
+def main():
+ parser = argparse.ArgumentParser(description='')
+ parser.add_argument('--raw', action='store_true',
+ help="Print all")
+ parser.add_argument('--timestamp', action='store_true',
+ help="Print timestamp")
+ parser.add_argument('--roothash', action='store_true',
+ help="Print root hash")
+ parser.add_argument('--treesize', action='store_true',
+ help="Print tree size")
+ parser.add_argument('--signature', action='store_true',
+ help="Print signature")
+ parser.add_argument('--config', help="System configuration", required=True)
+ parser.add_argument('--localconfig', help="Local configuration",
+ required=True)
+ parser.add_argument('baseurl', help="Log base URL")
+ args = parser.parse_args()
+ #config = yaml.load(open(args.config))
+ localconfig = yaml.load(open(args.localconfig))
+ paths = localconfig["paths"]
+
+ create_ssl_context(cafile=paths["https_cacertfile"])
+ sth = get_sth(args.baseurl)
+
+ if args.raw:
+ print sth
+ if args.timestamp:
+ print sth['timestamp']
+ if args.roothash:
+ print sth['sha256_root_hash']
+ if args.treesize:
+ print sth['tree_size']
+ if args.signature:
+ print sth['tree_head_signature']
+
+if __name__ == '__main__':
+ sys.exit(main())
diff --git a/tools/mergetools.py b/tools/mergetools.py
index 7b674de..89ba7b2 100644
--- a/tools/mergetools.py
+++ b/tools/mergetools.py
@@ -172,6 +172,9 @@ def get_new_entries(node, baseurl, own_key, paths):
entry in parsed_result[u"entries"]]
print >>sys.stderr, "ERROR: fetchnewentries", parsed_result
sys.exit(1)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: fetchnewentries", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: fetchnewentries", e.read()
sys.exit(1)
@@ -193,6 +196,9 @@ def get_entries(node, baseurl, own_key, paths, hashes):
return entries
print >>sys.stderr, "ERROR: getentry", parsed_result
sys.exit(1)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: getentry", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: getentry", e.read()
sys.exit(1)
@@ -207,6 +213,9 @@ def get_curpos(node, baseurl, own_key, paths):
return parsed_result[u"position"]
print >>sys.stderr, "ERROR: currentposition", parsed_result
sys.exit(1)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: currentposition", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: currentposition", e.read()
sys.exit(1)
@@ -221,6 +230,9 @@ def get_verifiedsize(node, baseurl, own_key, paths):
return parsed_result[u"size"]
print >>sys.stderr, "ERROR: verifiedsize", parsed_result
sys.exit(1)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: verifiedsize", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: verifiedsize", e.read()
sys.exit(1)
@@ -232,6 +244,9 @@ def sendlog(node, baseurl, own_key, paths, submission):
json.dumps(submission), key=own_key,
verifynode=node, publickeydir=paths["publickeys"])
return json.loads(result)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: sendlog", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: sendlog", e.read()
sys.stderr.flush()
@@ -251,8 +266,11 @@ def backup_sendlog(node, baseurl, own_key, paths, submission):
json.dumps(submission), key=own_key,
verifynode=node, publickeydir=paths["publickeys"])
return json.loads(result)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: backup_sendlog", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
- print >>sys.stderr, "ERROR: sendlog", e.read()
+ print >>sys.stderr, "ERROR: backup_sendlog", e.read()
sys.stderr.flush()
return None
except ValueError, e:
@@ -272,6 +290,9 @@ def sendentry(node, baseurl, own_key, paths, entry, ehash):
"treeleafhash":base64.b64encode(ehash)}),
key=own_key, verifynode=node, publickeydir=paths["publickeys"])
return json.loads(result)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: sendentry", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: sendentry", e.read()
sys.exit(1)
@@ -292,8 +313,11 @@ def sendentry_merge(node, baseurl, own_key, paths, entry, ehash):
"treeleafhash":base64.b64encode(ehash)}),
key=own_key, verifynode=node, publickeydir=paths["publickeys"])
return json.loads(result)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: sendentry_merge", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
- print >>sys.stderr, "ERROR: sendentry", e.read()
+ print >>sys.stderr, "ERROR: sendentry_merge", e.read()
sys.exit(1)
except ValueError, e:
print >>sys.stderr, "==== FAILED REQUEST ===="
@@ -328,6 +352,9 @@ def verifyroot(node, baseurl, own_key, paths, treesize):
json.dumps({"tree_size":treesize}), key=own_key,
verifynode=node, publickeydir=paths["publickeys"])
return json.loads(result)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: verifyroot", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: verifyroot", e.read()
sys.exit(1)
@@ -346,6 +373,9 @@ def setverifiedsize(node, baseurl, own_key, paths, treesize):
json.dumps({"size":treesize}), key=own_key,
verifynode=node, publickeydir=paths["publickeys"])
return json.loads(result)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: setverifiedsize", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: setverifiedsize", e.read()
sys.exit(1)
@@ -368,6 +398,9 @@ def get_missingentries(node, baseurl, own_key, paths):
return parsed_result[u"entries"]
print >>sys.stderr, "ERROR: missingentries", parsed_result
sys.exit(1)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: missingentries", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: missingentries", e.read()
sys.exit(1)
@@ -382,6 +415,9 @@ def get_missingentriesforbackup(node, baseurl, own_key, paths):
return parsed_result[u"entries"]
print >>sys.stderr, "ERROR: missingentriesforbackup", parsed_result
sys.exit(1)
+ except urllib2.URLError, e:
+ print >>sys.stderr, "ERROR: missingentriesforbackup", e.reason
+ sys.exit(1)
except urllib2.HTTPError, e:
print >>sys.stderr, "ERROR: missingentriesforbackup", e.read()
sys.exit(1)
--
cgit v1.1