adulau/crl-monitor
1
0
Fork 0
mirror of https://github.com/adulau/crl-monitor.git synced 2024-11-25 11:37:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

JSON output added

Browse source
This commit is contained in:
Alexandre Dulaunoy 2015-01-08 20:51:03 +01:00
parent 679445ab42
commit 7a46ffd8e6
1 changed files with 28 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
bin/x509/ip-ssl-subject.py
View file

@ -12,12 +12,14 @@ import argparse
import redis import redis
import sys import sys
import netaddr import netaddr
import json
argParser = argparse.ArgumentParser(description='Tool to lookup IP for known fingerprints and X.509 subjects') argParser = argparse.ArgumentParser(description='Tool to lookup IP for known fingerprints and X.509 subjects')
argParser.add_argument('-b', default='127.0.0.1', help='Redis host (default is 127.0.0.1)') argParser.add_argument('-b', default='127.0.0.1', help='Redis host (default is 127.0.0.1)')
argParser.add_argument('-p', default=6379, help='Redis TCP port (default is 6379)') argParser.add_argument('-p', default=6379, help='Redis TCP port (default is 6379)')
argParser.add_argument('-s', action='append', help='IPv4 subnet to lookup') argParser.add_argument('-s', action='append', help='IPv4 subnet to lookup')
argParser.add_argument('-v', action='store_true', help='Verbose output') argParser.add_argument('-v', action='store_true', help='Verbose output')
argParser.add_argument('-o', default='readable', help='readable (default), json')
args = argParser.parse_args() args = argParser.parse_args()
if args.s is None: if args.s is None:
@ -28,18 +30,38 @@ try:
r = redis.StrictRedis(host=args.b, port=args.p) r = redis.StrictRedis(host=args.b, port=args.p)
except: except:
print "Unable to connect to the Redis server" print "Unable to connect to the Redis server"
sys.exit(1) sys.exit(255)
if args.o == 'json':
out = {}
elif args.o == 'readable':
pass
else:
print "Unknown output format"
sys.exit(255)
for subnet in args.s: for subnet in args.s:
iplist = netaddr.IPNetwork(subnet) iplist = netaddr.IPNetwork(subnet)
for ip in iplist: for ip in iplist:
s = r.smembers(ip) s = r.smembers(ip)
if s: if s:
if args.o == 'readable':
print ip print ip
for x in s: else:
subjects = r.smembers(x) out[str(ip)] = []
for fingerprint in s:
subjects = r.smembers(fingerprint)
if subjects: if subjects:
for subject in subjects: for subject in subjects:
if args.o == 'readable':
print " " + subject print " " + subject
else: else:
print " " + x out[str(ip)].append(subject)
else:
if args.o == 'readable':
print " " + fingerprint
else:
out[str(ip)].append(fingerprint)
if args.o == 'json':
print json.dumps(out)