From 98ecde04b134a7a32cd6f448e4d5caaa50723bb3 Mon Sep 17 00:00:00 2001 From: josef Date: Fri, 2 Oct 2015 10:09:00 +0200 Subject: removing all sys.exit() from lib --- monitor/josef_lib.py | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) (limited to 'monitor/josef_lib.py') diff --git a/monitor/josef_lib.py b/monitor/josef_lib.py index 2fe3872..afb066b 100644 --- a/monitor/josef_lib.py +++ b/monitor/josef_lib.py @@ -120,7 +120,8 @@ def get_cert_info(s): parsed = p.communicate(s) if parsed[1]: print "ERROR:", parsed[1] - sys.exit(1) + # sys.exit(1) + raise Exception result = {} for line in parsed[0].split("\n"): (key, sep, value) = line.partition("=") @@ -136,7 +137,8 @@ def my_get_cert_info(s): parsed = p.communicate(s) if parsed[1]: print "ERROR:", parsed[1] - sys.exit(1) + # sys.exit(1) + raise Exception result = {} prev = "" for line in parsed[0].split("\n"): @@ -161,7 +163,8 @@ def my_get_all_cert_info(s): parsed = p.communicate(s) if parsed[1]: print "ERROR:", parsed[1] - sys.exit(1) + # sys.exit(1) + raise Exception return parsed[0] @@ -271,26 +274,27 @@ def get_sth(baseurl): return json.loads(result) def get_proof_by_hash(baseurl, hash, tree_size): - try: + # try: params = urllib.urlencode({"hash":base64.b64encode(hash), "tree_size":tree_size}) result = \ urlopen(baseurl + "ct/v1/get-proof-by-hash?" + params).read() return json.loads(result) - except urllib2.HTTPError, e: - print "ERROR:", e.read() - sys.exit(1) + # except urllib2.HTTPError, e: + # print "ERROR:", e.read() + # sys.exit(1) + # raise Exception def get_consistency_proof(baseurl, tree_size1, tree_size2): - try: + # try: params = urllib.urlencode({"first":tree_size1, "second":tree_size2}) result = \ urlopen(baseurl + "ct/v1/get-sth-consistency?" + params).read() return json.loads(result)["consistency"] - except urllib2.HTTPError, e: - print "ERROR:", e.read() - sys.exit(1) + # except urllib2.HTTPError, e: + # print "ERROR:", e.read() + # sys.exit(1) def tls_array(data, length_len): length_bytes = struct.pack(">Q", len(data))[-length_len:] @@ -383,7 +387,8 @@ def check_signature(baseurl, signature, data, publickey=None): else: print >>sys.stderr, "Public key for", baseurl, \ "not found, specify key file with --publickey" - sys.exit(1) + # sys.exit(1) + raise Exception (hash_alg, signature_alg, unpacked_signature) = decode_signature(signature) assert hash_alg == 4, \ "hash_alg is %d, expected 4" % (hash_alg,) # sha256 @@ -693,7 +698,8 @@ def get_tree_head(store, treesize): print >>sys.stderr, "Couldn't read until tree size", treesize (incompletelength, hash) = result print >>sys.stderr, "Stopped at", blocknumber * 65536 + incompletelength - sys.exit(1) + # sys.exit(1) + raise Exception assert resulttype == "hash" hash = result merkle_64klayer.append(hash) @@ -718,7 +724,8 @@ def get_intermediate_hash(store, treesize, level, index): print >>sys.stderr, "Couldn't read until tree size", treesize (incompletelength, hash) = result print >>sys.stderr, "Stopped at", blocknumber * 65536 + incompletelength - sys.exit(1) + # sys.exit(1) + raise Exception assert resulttype == "hash" hash = result #print "block hash", base64.b16encode(hash) -- cgit v1.1