diff options
| author | Josef Gustafsson <josef.gson@gmail.com> | 2015-09-10 15:06:17 +0200 |
|---|---|---|
| committer | Josef Gustafsson <josef.gson@gmail.com> | 2015-09-10 15:06:17 +0200 |
| commit | 1f9cea67e982df1b9e35eb415d25093f24b9fcc1 (patch) | |
| tree | 3db9aaad7226d90a2c4986ffa870038cc4bf51ab /monitor | |
| parent | c7a4e747cda24b1d500becbb0c836e86ae537290 (diff) | |
bugfix
Diffstat (limited to 'monitor')
| -rwxr-xr-x | monitor/josef_experimental.py | 6 | ||||
| -rwxr-xr-x | monitor/josef_leveldb.py | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/monitor/josef_experimental.py b/monitor/josef_experimental.py index 7f1f7d6..b23eb49 100755 --- a/monitor/josef_experimental.py +++ b/monitor/josef_experimental.py @@ -30,11 +30,15 @@ monitored_domains = [ db = db_open("./tmpdatabase") db_add_domain(db, "www.cox.a.com", "{dummydata}") +print db_lookup_domain(db, "www.cox.a.com") +db_add_domain(db, "www.cox.b.com", "{dummydata}") +print db_lookup_domain(db, "www.cox.a.com") +db_add_domain(db, "www.cox.a.com", "{dummydata2}") +print db_lookup_domain(db, "www.cox.a.com") # print db.Get("com") # print db.Get("a.com") # print db.Get("cox.a.com") # print db.Get("www.cox.a.com") -print db_lookup_domain(db, "www.cox.a.com") # if args.domain: diff --git a/monitor/josef_leveldb.py b/monitor/josef_leveldb.py index e5bf581..5a8917b 100755 --- a/monitor/josef_leveldb.py +++ b/monitor/josef_leveldb.py @@ -35,6 +35,7 @@ def db_open(fn='./cert_db'): return db def db_append(db, key, val): + # print "Appending " + val if db is None: print "ERROR: NO DATABASE SET!" return @@ -43,12 +44,16 @@ def db_append(db, key, val): tmp = db.Get(key) except KeyError: tmp = "" + # print "Key: ", key, "Val: ", val, "Found: ", tmp tmpl = tmp.split(SEP) if val in tmpl: pass else: + # print tmpl tmpl.append(val) + # print tmpl db.Put(key,SEP.join(tmpl)) + # print "Storing " + SEP.join(tmpl) def db_add_domain(db, domain, data): if db is None: @@ -80,7 +85,7 @@ def db_add_certs(db, data): try: for line in cert["SAN"].split("DNS:")[1:]: db_add_domain(db, line, str(cert)) - except IndexError: + except IndexError, KeyError: pass @@ -105,7 +110,7 @@ def db_lookup_domain(db, domain): next_level = [] for item in intermediate: if match_domain(cur_domain, item): - print item + # print item try: tmp = db.Get(item) if tmp[1] == '{': |