Merge remote-tracking branch 'refs/remotes/map/external-merge3' into merging-external-merge

Conflicts:
	src/v1.erl
	tools/merge.py
	tools/testcase1.py

1 files changed, 53 insertions, 4 deletions

diff --git a/tools/merge.py b/tools/merge.py
index 41144ea..e007d7c 100755
--- a/tools/merge.py
+++ b/tools/merge.py
@@ -9,8 +9,11 @@ import base64
 import urllib
 import urllib2
 import sys
+import time
+from certtools import build_merkle_tree, create_sth_signature, check_sth_signature
 
-frontendnodes = ["https://127.0.0.1:8080/"]
+ctbaseurl = "https://127.0.0.1:8080/"
+frontendnodes = ["https://127.0.0.1:8082/"]
 storagenodes = ["https://127.0.0.1:8081/"]
 
 chainsdir = "../rel/mergedb/chains"
@@ -79,6 +82,22 @@ def sendlog(baseurl, submission):
         print "========================"
         raise e
 
+def sendentry(baseurl, entry, hash):
+    try:
+        result = urllib2.urlopen(baseurl + "ct/frontend/sendentry",
+            json.dumps({"entry":base64.b64encode(entry), "treeleafhash":base64.b64encode(hash)})).read()
+        return json.loads(result)
+    except urllib2.HTTPError, e:
+        print "ERROR: sendentry", e.read()
+        sys.exit(1)
+    except ValueError, e:
+        print "==== FAILED REQUEST ===="
+        print hash
+        print "======= RESPONSE ======="
+        print result
+        print "========================"
+        raise e
+
 def sendsth(baseurl, submission):
     try:
         result = urllib2.urlopen(baseurl + "ct/frontend/sendsth",
@@ -113,6 +132,8 @@ certsinlog = set(logorder)
 
 new_entries = [entry for storagenode in storagenodes for entry in get_new_entries(storagenode)]
 
+print "adding entries"
+added_entries = 0
 for new_entry in new_entries:
     hash = base64.b64decode(new_entry["hash"])
     entry = base64.b64decode(new_entry["entry"])
@@ -121,13 +142,41 @@ for new_entry in new_entries:
         add_to_logorder(hash)
         logorder.append(hash)
         certsinlog.add(hash)
-        print "added", base64.b16encode(hash)
+        added_entries += 1
+print "added", added_entries, "entries"
+
+tree = build_merkle_tree(logorder)
+tree_size = len(logorder)
+root_hash = tree[-1][0]
+timestamp = int(time.time() * 1000)
+privatekey = base64.decodestring(
+    "MHcCAQEEIMM/FjZ4FSzfENTTwGpTve6CP+IVr"
+    "Y7p8OKV634uJI/foAoGCCqGSM49AwEHoUQDQg"
+    "AE4qWq6afhBUi0OdcWUYhyJLNXTkGqQ9PMS5l"
+    "qoCgkV2h1ZvpNjBH2u8UbgcOQwqDo66z6BWQJ"
+    "GolozZYmNHE2kQ==")
+
+tree_head_signature = create_sth_signature(tree_size, timestamp,
+                                           root_hash, privatekey)
+
+sth = {"tree_size": tree_size, "timestamp": timestamp,
+       "sha256_root_hash": base64.b64encode(root_hash),
+       "tree_head_signature": base64.b64encode(tree_head_signature)}
+
+check_sth_signature(ctbaseurl, sth)
+
+print "root hash", base64.b16encode(root_hash)
 
 for frontendnode in frontendnodes:
+    print "distributing for node", frontendnode
     curpos = get_curpos(frontendnode)
+    print "current position", curpos
     entries = [base64.b64encode(entry) for entry in logorder[curpos:]]
     sendlog(frontendnode, {"start": curpos, "hashes": entries})
+    print "log sent"
     missingentries = get_missingentries(frontendnode)
     print "missing entries:", missingentries
-    # XXX: no test case for missing entries yet, waiting to implement
-    sendsth(frontendnode, {"tree_size": len(logorder)})
+    for missingentry in missingentries:
+        hash = base64.b64decode(missingentry)
+        sendentry(frontendnode, read_chain(hash), hash)
+    sendsth(frontendnode, sth)