rebuild actual zonefiles

[tools.git] / tls-check

diff --git a/tls-check b/tls-check
index d8bdc9b2c18158281cde21b567029ff6d2a3a03c..19a8dfc65d061f4c7e5d5e5dd6db4de564a8d906 100644 (file)
--- a/tls-check
+++ b/tls-check
@@ -34,10 +34,10 @@ class Verifier:
         response = connection.recv(4096).decode('utf-8')
 
         if not '</stream:features>' in response:
-            response = response + connection.recv(4096).decode('utf-8')
+            connection.recv(4096)
 
         connection.sendall(xmpp_starttls.encode('utf-8'))
-        response = response + "\n\n" + connection.recv(4096).decode('utf-8')
+        connection.recv(4096)
 
         connection = context.wrap_socket(connection, server_hostname=name)
         connection.do_handshake()
@@ -71,12 +71,13 @@ class Verifier:
     def check_cert(self, data, host, port, name):
         expiretimestamp = cert_time_to_seconds(data['notAfter'])
         delta = datetime.utcfromtimestamp(expiretimestamp) - datetime.utcnow()
+        deltastr = str(delta).split(",")
 
         if delta < self.crit:
-            print("CRIT (expires in %s) %s:%d" % (delta, name, port))
+            print("CRIT (expires in %8s,%16s) %s:%d" % (deltastr[0], deltastr[1], name, port))
             return 2
         elif delta < self.warn:
-            print("WARN (expires in %s) %s:%d" % (delta, name, port))
+            print("WARN (expires in %8s,%16s) %s:%d" % (deltastr[0], deltastr[1], name, port))
             return 1
 
 def main():