[Nagiosplug-checkins] SF.net SVN: nagiosplug:[2169] nagiosplug/trunk/plugins

[dermoth at users.sourceforge.net]

Revision: 2169
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2169&view=rev
Author:   dermoth
Date:     2009-03-18 07:39:16 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
Add timezone support and fix checks around cert expiration

From: Thomas Guyot-Sionnest <dermoth at aei.ca>

Modified Paths:
--------------
    nagiosplug/trunk/plugins/sslutils.c
    nagiosplug/trunk/plugins/tests/check_http.t

Modified: nagiosplug/trunk/plugins/sslutils.c
===================================================================
--- nagiosplug/trunk/plugins/sslutils.c	2009-03-17 06:57:24 UTC (rev 2168)
+++ nagiosplug/trunk/plugins/sslutils.c	2009-03-18 07:39:16 UTC (rev 2169)
@@ -30,6 +30,10 @@
 #include "common.h"
 #include "netutils.h"
 
+/* Max length of timestamps, ex: "03/05/2009 00:13 GMT". Calculate up to 6
+ * chars for the timezone (ex: "GMT-10") and one terminating \0 */
+#define TS_LENGTH 24
+
 #ifdef HAVE_SSL
 static SSL_CTX *c=NULL;
 static SSL *s=NULL;
@@ -90,7 +94,7 @@
 	int offset;
 	struct tm stamp;
 	int days_left;
-	char timestamp[17] = "";
+	char timestamp[TS_LENGTH] = "";
 
 	certificate=SSL_get_peer_certificate(s);
 	if(! certificate){
@@ -135,16 +139,17 @@
 	stamp.tm_sec = 0;
 	stamp.tm_isdst = -1;
 
-	days_left = (mktime (&stamp) - time (NULL)) / 86400;
+	float time_left = difftime(timegm(&stamp), time(NULL));
+	days_left = time_left / 86400;
 	snprintf
-		(timestamp, 17, "%02d/%02d/%04d %02d:%02d",
+		(timestamp, TS_LENGTH, "%02d/%02d/%04d %02d:%02d %s",
 		 stamp.tm_mon + 1,
-		 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min);
+		 stamp.tm_mday, stamp.tm_year + 1900, stamp.tm_hour, stamp.tm_min, stamp.tm_zone);
 
 	if (days_left > 0 && days_left <= days_till_exp) {
 		printf (_("WARNING - Certificate expires in %d day(s) (%s).\n"), days_left, timestamp);
 		return STATE_WARNING;
-	} else if (days_left < 0) {
+	} else if (time_left < 0) {
 		printf (_("CRITICAL - Certificate expired on %s.\n"), timestamp);
 		return STATE_CRITICAL;
 	} else if (days_left == 0) {

Modified: nagiosplug/trunk/plugins/tests/check_http.t
===================================================================
--- nagiosplug/trunk/plugins/tests/check_http.t	2009-03-17 06:57:24 UTC (rev 2168)
+++ nagiosplug/trunk/plugins/tests/check_http.t	2009-03-18 07:39:16 UTC (rev 2169)
@@ -163,18 +163,18 @@
 	
 	$result = NPTest->testCmd( "$command -p $port_https -S -C 14" );
 	is( $result->return_code, 0, "$command -p $port_https -S -C 14" );
-	is( $result->output, 'OK - Certificate will expire on 03/03/2019 21:41.', "output ok" );
+	is( $result->output, 'OK - Certificate will expire on 03/03/2019 21:41 GMT.', "output ok" );
 
 	$result = NPTest->testCmd( "$command -p $port_https -S -C 14000" );
 	is( $result->return_code, 1, "$command -p $port_https -S -C 14000" );
-	like( $result->output, '/WARNING - Certificate expires in \d+ day\(s\) \(03/03/2019 21:41\)./', "output ok" );
+	like( $result->output, '/WARNING - Certificate expires in \d+ day\(s\) \(03/03/2019 21:41 GMT\)./', "output ok" );
 
 
 	# Expired cert tests
 	$result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" );
 	is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" );
 	is( $result->output, 
-		'CRITICAL - Certificate expired on 03/05/2009 00:13.',
+		'CRITICAL - Certificate expired on 03/05/2009 00:13 GMT.',
 		"output ok" );
 
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.