From dd9e60fb9ad8cae8a452bacd95074436b17adaf4 Mon Sep 17 00:00:00 2001 From: Klaus-Uwe Mitterer Date: Thu, 28 Apr 2016 23:05:40 +0200 Subject: [PATCH] portsopen.py: Take list of ports per host to test sslexpiry.py: Handle unreachable port --- portsopen.py | 9 +++++---- sslexpiry.py | 17 ++++++++++------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/portsopen.py b/portsopen.py index 977dda8..0a088a2 100755 --- a/portsopen.py +++ b/portsopen.py @@ -7,7 +7,8 @@ retry = int(setuptools.getSetting("Ports", "retry")) two = twitools.twObject() for h in hosts: - if not porttools.isPortOpen(h[0], h[1]): - time.sleep(retry) - if not porttools.isPortOpen(h[0], h[1]): - two.tweet("@%s Port %s is not open on host %s!" % (h[2], h[1], h[0])) + for p in h[1]: + if not porttools.isPortOpen(h[0], p): + time.sleep(retry) + if not porttools.isPortOpen(h[0], p): + two.tweet("@%s Port %s is not open on host %s!" % (h[2], p, h[0])) diff --git a/sslexpiry.py b/sslexpiry.py index 220f986..7802df6 100755 --- a/sslexpiry.py +++ b/sslexpiry.py @@ -8,10 +8,13 @@ pafter = int(setuptools.getSetting("SSL", "pafter")) two = twitools.twObject() for h in hosts: - expiry = ssltools.getRemoteExpiry(h[0], h[1]) - diff = expiry - datetime.datetime.now() - if diff < datetime.timedelta(days=pbefore): - if expiry > datetime.datetime.now(): - two.tweet("@%s %s certificate expiring soon (%s). Please renew." % (h[2], h[0], expiry)) - elif expiry + datetime.timedelta(days=pafter) < datetime.datetime.now(): - two.tweet("@%s %s certificate has expired! (%s) Please renew ASAP!" % (h[2], h[0], expiry)) + try: + expiry = ssltools.getRemoteExpiry(h[0], h[1]) + diff = expiry - datetime.datetime.now() + if diff < datetime.timedelta(days=pbefore): + if expiry > datetime.datetime.now(): + two.tweet("@%s %s certificate expiring soon (%s). Please renew." % (h[2], h[0], expiry)) + elif expiry + datetime.timedelta(days=pafter) < datetime.datetime.now(): + two.tweet("@%s %s certificate has expired! (%s) Please renew ASAP!" % (h[2], h[0], expiry)) + except: + two.tweet("@%s Could not verify SSL certificate on %s:%i. Is the server down?" % (h[2], h[0], h[1]))