pushing to glog

2 files changed, 16 insertions, 20 deletions

diff --git a/monitor/josef_mover.py b/monitor/josef_mover.py
index 57f96ae..c2724d7 100755
--- a/monitor/josef_mover.py
+++ b/monitor/josef_mover.py
@@ -15,9 +15,6 @@ def print_reply(rep, entry, precert):
     t = datetime.datetime.fromtimestamp(rep['timestamp'] / 1000, UTC()).strftime("%Y-%m-%d %H:%M:%S")
     log_id = rep["id"]
 
-    # print json.dumps(rep)
-    # print entry
-
     print "Time:", t
 
     for log in ctlogs:
@@ -31,7 +28,6 @@ def print_reply(rep, entry, precert):
 
     if precert:
         print "Type: Precert"
-        print base64.b64encode(entry[2])
         signed_entry = pack_precert(cleanprecert(entry[0][0]), entry[2])
     else:
         print "Type: Cert"
@@ -39,20 +35,20 @@ def print_reply(rep, entry, precert):
 
     key = base64.b64decode(log["key"])
 
-    # try:
-    check_sct_signature(log["url"], signed_entry, rep, precert, key)
-    print "Signature: OK"
-    # except:
-    #     print "Could not verify signature!"
+    try:
+        check_sct_signature(log["url"], signed_entry, rep, precert, key)
+        print "Signature: OK"
+    except:
+        print "Could not verify signature!"
 
     print ""
 
 
 source = ctlogs[1]
-dests = [ctlogs[0]]
+dests = [ctlogs[1]]
 
-first = 153363
-last = 153365
+first = 360
+last = 365
 
 entries = get_entries(source["url"], first, last)["entries"]
 
diff --git a/monitor/monitor_conf.py b/monitor/monitor_conf.py
index ffdb1bf..1e96013 100644
--- a/monitor/monitor_conf.py
+++ b/monitor/monitor_conf.py
@@ -30,10 +30,10 @@ MONITORED_DOMAINS = [
 
 # CT logs and associated keys
 ctlogs = [
-    {"name" : "pilot",
-    "url" : "https://ct.googleapis.com/pilot/",
-    "key" : "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTDM0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==",
-    "id" : "pLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BA="},
+    # {"name" : "pilot",
+    # "url" : "https://ct.googleapis.com/pilot/",
+    # "key" : "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEfahLEimAoz2t01p3uMziiLOl/fHTDM0YDOhBRuiBARsV4UvxG2LdNgoIGLrtCzWE0J5APC2em4JlvR8EEEFMoA==",
+    # "id" : "pLkJkLQYWBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BA="},
 
     {"name" : "plausible",
     "url" : "https://plausible.ct.nordu.net/",
@@ -60,10 +60,10 @@ ctlogs = [
     # "key" : "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAE1/TMabLkDpCjiupacAlP7xNi0I1JYP8bQFAHDG1xhtolSY1l4QgNRzRrvSe8liE+NPWHdjGxfx3JhTsN9x8/6Q==",
     # "id" : "aPaY+B9kgr46jO65KB1M/HFRXWeT1ETRCmesu09P+8Q="},
 
-    # {"name" : "rocketeer",
-    # "url" : "https://ct.googleapis.com/rocketeer/",
-   	# "key" : "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIFsYyDzBi7MxCAC/oJBXK7dHjG+1aLCOkHjpoHPqTyghLpzA9BYbqvnV16mAw04vUjyYASVGJCUoI3ctBcJAeg==",
-    # "id": "7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/cs="},
+    {"name" : "rocketeer",
+    "url" : "https://ct.googleapis.com/rocketeer/",
+   	"key" : "MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEIFsYyDzBi7MxCAC/oJBXK7dHjG+1aLCOkHjpoHPqTyghLpzA9BYbqvnV16mAw04vUjyYASVGJCUoI3ctBcJAeg==",
+    "id": "7ku9t3XOYLrhQmkfq+GeZqMPfl+wctiDAMR7iXqo/cs="},
 
     {"name" : "symantec",
     "url" : "https://ct.ws.symantec.com/",