diff options
Diffstat (limited to 'monitor')
| -rwxr-xr-x | monitor/josef_experimental.py | 17 | ||||
| -rwxr-xr-x | monitor/josef_logreader.py | 2 | ||||
| -rwxr-xr-x | monitor/josef_mover.py | 7 | ||||
| -rwxr-xr-x | monitor/josef_reader.py | 17 |
4 files changed, 20 insertions, 23 deletions
diff --git a/monitor/josef_experimental.py b/monitor/josef_experimental.py index 3c7e590..3e34584 100755 --- a/monitor/josef_experimental.py +++ b/monitor/josef_experimental.py @@ -50,21 +50,10 @@ def verify_sct(baseurl, sctentry, key, sth_in=None): if __name__ == '__main__': - f = open("sct_example") - s = f.read() - sctentry = json.loads(s) - - logpublickey = get_public_key_from_file("sct_example_logkey.pem") - if "sth" in sctentry: - print "found sth in sct" - sth = sctentry["sth"] - else: - sth = None - verify_sct(None, sctentry, logpublickey, sth) - # print sctentry - # print base64.b64decode(sctentry["leafcert"]) - # print base64.b64decode(get_entries("https://plausible.ct.nordu.net:/", 1234,1234)["entries"][0]["leaf_input"]) + + + diff --git a/monitor/josef_logreader.py b/monitor/josef_logreader.py index d261fd4..4be2a55 100755 --- a/monitor/josef_logreader.py +++ b/monitor/josef_logreader.py @@ -87,7 +87,7 @@ def print_errors(l): if "ERROR" in line: print item[:-1] if line[:len(START_STR)] == START_STR: - # break # comment this line to print all errors ever + break # comment this line to print all errors ever pass diff --git a/monitor/josef_mover.py b/monitor/josef_mover.py index 3de0cb4..511a156 100755 --- a/monitor/josef_mover.py +++ b/monitor/josef_mover.py @@ -34,10 +34,10 @@ def print_reply(rep, entry, precert): source = ctlogs[0] -dests = [ctlogs[8]] +dests = [ctlogs[1]] -first = 20001 -last = 20100 +first = 21001 +last = 22000 entries = get_entries(source["url"], first, last)["entries"] @@ -61,6 +61,7 @@ for log in dests: res = add_chain(log["url"], {"chain" : submission}) print_reply(res, entry, precert) + time.sleep(5) diff --git a/monitor/josef_reader.py b/monitor/josef_reader.py index 1906587..1a1bdec 100755 --- a/monitor/josef_reader.py +++ b/monitor/josef_reader.py @@ -138,6 +138,12 @@ def db_monitor_domain(domain, log=None, exclude_invalid=None, get_cert=None): else: success = False + if issuer: + if issuer in entry["issuer"]: + pass: + else: + success = False + if cur_time > not_after_time: valid = False expired = True @@ -178,11 +184,11 @@ def db_monitor_domain(domain, log=None, exclude_invalid=None, get_cert=None): res.append(me) - # print str(count_all) + " matches found. " \ - # + str(count_valid) + " valid, " \ - # + str(count_expired) + " expired and " \ - # + str(count_not_yet_valid) + " not yet valid for " \ - # + domain + print str(count_all) + " matches found. " \ + + str(count_valid) + " valid, " \ + + str(count_expired) + " expired and " \ + + str(count_not_yet_valid) + " not yet valid for " \ + + domain return res if __name__ == "__main__": @@ -190,6 +196,7 @@ if __name__ == "__main__": parser = argparse.ArgumentParser(description="") parser.add_argument('--domain', default=None) parser.add_argument('--log', default=None) + parser.add_argument('--issuer', default=None) parser.add_argument('--exclude-invalid', action='store_true') parser.add_argument('--get-cert', action='store_true') |