X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_http.c;h=cf86d469a91ff7c09c7d0eb6f27ab47dd2caa44e;hb=7ceff0d5a95f5c5f34235ef6682595f169864d2f;hp=8ffbf989bef7df3b08e012c40f69c9e42bd2cebc;hpb=3f9d30e81612896d248d3855c706efdd4d497238;p=nagiosplug.git

diff --git a/plugins/check_http.c b/plugins/check_http.c
index 8ffbf98..cf86d46 100644
--- a/plugins/check_http.c
+++ b/plugins/check_http.c
@@ -45,7 +45,7 @@ certificate expiration times.\n"
             [-w <warn time>] [-c <critical time>] [-t <timeout>] [-L]\n\
             [-a auth] [-f <ok | warn | critcal | follow>] [-e <expect>]\n\
             [-s string] [-l] [-r <regex> | -R <case-insensitive regex>]\n\
-            [-P string]"
+            [-P string] [-m min_pg_size]"
 
 #define LONGOPTIONS "\
  -H, --hostname=ADDRESS\n\
@@ -75,6 +75,8 @@ certificate expiration times.\n"
    Wrap output in HTML link (obsoleted by urlize)\n\
  -f, --onredirect=<ok|warning|critical|follow>\n\
    How to handle redirected pages\n%s%s\
+-m, --min=INTEGER\n\
+   Minimum page size required (bytes)\n\
  -v, --verbose\n\
     Show details for command-line debugging (do not use with nagios server)\n\
  -h, --help\n\
@@ -203,8 +205,8 @@ char server_port_text[6] = "";
 char server_type[6] = "http";
 char *server_address = ""; 
 char *host_name = "";
-char *server_url = HTTP_URL;
-int server_url_length = 1;
+char *server_url = "";
+int server_url_length;
 int server_expect_yn = 0;
 char server_expect[MAX_INPUT_BUFFER] = HTTP_EXPECT;
 char string_expect[MAX_INPUT_BUFFER] = "";
@@ -218,6 +220,7 @@ int onredirect = STATE_OK;
 int use_ssl = FALSE;
 int verbose = FALSE;
 int sd;
+int min_page_len = 0;
 char *http_method = "GET";
 char *http_post_data = "";
 char buffer[MAX_INPUT_BUFFER];
@@ -235,6 +238,10 @@ main (int argc, char **argv)
 {
 	int result = STATE_UNKNOWN;
 
+	/* Set default URL. Must be malloced for subsequent realloc if --onredirect=follow */
+	asprintf (&server_url, "%s", HTTP_URL);
+	server_url_length = strlen(server_url);
+
 	if (process_arguments (argc, argv) == ERROR)
 		usage ("check_http: could not parse arguments\n");
 
@@ -307,6 +314,7 @@ process_arguments (int argc, char **argv)
  		{"linespan", no_argument, 0, 'l'},
 		{"onredirect", required_argument, 0, 'f'},
 		{"certificate", required_argument, 0, 'C'},
+		{"min", required_argument, 0, 'm'},
 		{0, 0, 0, 0}
 	};
 #endif
@@ -327,7 +335,7 @@ process_arguments (int argc, char **argv)
 			strcpy (argv[c], "-n");
 	}
 
-#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLS"
+#define OPTCHARS "Vvht:c:w:H:P:I:a:e:p:s:R:r:u:f:C:nlLSm:"
 
 	while (1) {
 #ifdef HAVE_GETOPT_H
@@ -465,6 +473,9 @@ process_arguments (int argc, char **argv)
 		case 'v': /* verbose */
 			verbose = TRUE;
 			break;
+		case 'm': /* min_page_length */
+			min_page_len = atoi (optarg);
+			break;
 		}
 	}
 
@@ -546,6 +557,7 @@ check_http (void)
 	char *x = NULL;
 	char *orig_url = NULL;
 	double elapsed_time;
+	int page_len = 0;
 #ifdef HAVE_SSL
 	int sslerr;
 #endif
@@ -851,6 +863,13 @@ check_http (void)
 	}
 #endif
 
+	/* make sure the page is of an appropriate size */
+	page_len = strlen (page);
+	if ((min_page_len > 0) && (page_len < min_page_len)) {
+		printf ("HTTP WARNING: page size too small%s|size=%i\n",
+			(display_html ? "</A>" : ""), page_len );
+		exit (STATE_WARNING);
+	}
 	/* We only get here if all tests have been passed */
 	asprintf (&msg, "HTTP ok: %s - %7.3f second response time %s%s|time=%7.3f\n",
 	                status_line, (float)elapsed_time,