X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=plugins%2Fcheck_http.c;h=5cdf144bdf8b2bf788fe27dae84fedd52f410529;hb=6b782ebfd4832c1fe621556bcf894162b8caa8aa;hp=248c0f94d3b652c27c3b38f0c366c99a500a4aeb;hpb=6b8502bee6f426eb7c3239c346c909c948bc3e77;p=nagiosplug.git diff --git a/plugins/check_http.c b/plugins/check_http.c index 248c0f9..5cdf144 100644 --- a/plugins/check_http.c +++ b/plugins/check_http.c @@ -44,6 +44,9 @@ const char *email = "nagiosplug-devel@lists.sourceforge.net"; #include #define INPUT_DELIMITER ";" +#define STICKY_NONE 0 +#define STICKY_HOST 1 +#define STICKY_PORT 2 #define HTTP_EXPECT "HTTP/1." enum { @@ -102,11 +105,12 @@ int check_warning_time = FALSE; double critical_time = 0; int check_critical_time = FALSE; char user_auth[MAX_INPUT_BUFFER] = ""; +char proxy_auth[MAX_INPUT_BUFFER] = ""; int display_html = FALSE; char **http_opt_headers; int http_opt_headers_count = 0; int onredirect = STATE_OK; -int followsticky = 0; +int followsticky = STICKY_NONE; int use_ssl = FALSE; int verbose = FALSE; int sd; @@ -189,6 +193,7 @@ process_arguments (int argc, char **argv) {"url", required_argument, 0, 'u'}, {"port", required_argument, 0, 'p'}, {"authorization", required_argument, 0, 'a'}, + {"proxy_authorization", required_argument, 0, 'b'}, {"string", required_argument, 0, 's'}, {"expect", required_argument, 0, 'e'}, {"regex", required_argument, 0, 'r'}, @@ -226,7 +231,7 @@ process_arguments (int argc, char **argv) } while (1) { - c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option); + c = getopt_long (argc, argv, "Vvh46t:c:w:A:k:H:P:j:T:I:a:b:e:p:s:R:r:u:f:C:nlLSm:M:N", longopts, &option); if (c == -1 || c == EOF) break; @@ -300,18 +305,21 @@ process_arguments (int argc, char **argv) server_port = HTTPS_PORT; break; case 'f': /* onredirect */ - if (!strcmp (optarg, "sticky")) - onredirect = STATE_DEPENDENT, followsticky = 1; - if (!strcmp (optarg, "follow")) - onredirect = STATE_DEPENDENT, followsticky = 0; - if (!strcmp (optarg, "unknown")) + if (!strcmp (optarg, "stickyport")) + onredirect = STATE_DEPENDENT, followsticky = STICKY_HOST|STICKY_PORT; + else if (!strcmp (optarg, "sticky")) + onredirect = STATE_DEPENDENT, followsticky = STICKY_HOST; + else if (!strcmp (optarg, "follow")) + onredirect = STATE_DEPENDENT, followsticky = STICKY_NONE; + else if (!strcmp (optarg, "unknown")) onredirect = STATE_UNKNOWN; - if (!strcmp (optarg, "ok")) + else if (!strcmp (optarg, "ok")) onredirect = STATE_OK; - if (!strcmp (optarg, "warning")) + else if (!strcmp (optarg, "warning")) onredirect = STATE_WARNING; - if (!strcmp (optarg, "critical")) + else if (!strcmp (optarg, "critical")) onredirect = STATE_CRITICAL; + else usage2 (_("Invalid onredirect option"), optarg); if (verbose) printf(_("option f:%d \n"), onredirect); break; @@ -344,6 +352,10 @@ process_arguments (int argc, char **argv) strncpy (user_auth, optarg, MAX_INPUT_BUFFER - 1); user_auth[MAX_INPUT_BUFFER - 1] = 0; break; + case 'b': /* proxy-authorization info */ + strncpy (proxy_auth, optarg, MAX_INPUT_BUFFER - 1); + proxy_auth[MAX_INPUT_BUFFER - 1] = 0; + break; case 'P': /* HTTP POST data in URL encoded format; ignored if settings already */ if (! http_post_data) http_post_data = strdup (optarg); @@ -772,6 +784,7 @@ check_http (void) int i = 0; size_t pagesize = 0; char *full_page; + char *full_page_new; char *buf; char *pos; long microsec; @@ -784,7 +797,7 @@ check_http (void) die (STATE_CRITICAL, _("HTTP CRITICAL - Unable to open TCP socket\n")); #ifdef HAVE_SSL if (use_ssl == TRUE) { - np_net_ssl_init(sd); + np_net_ssl_init_with_hostname(sd, host_name); if (check_cert == TRUE) { result = np_net_ssl_check_cert(days_till_exp); np_net_ssl_cleanup(); @@ -794,7 +807,7 @@ check_http (void) } #endif /* HAVE_SSL */ - asprintf (&buf, "%s %s HTTP/1.0\r\n%s\r\n", http_method, server_url, user_agent); + asprintf (&buf, "%s %s %s\r\n%s\r\n", http_method, server_url, host_name ? "HTTP/1.1" : "HTTP/1.0", user_agent); /* tell HTTP/1.1 servers not to keep the connection alive */ asprintf (&buf, "%sConnection: close\r\n", buf); @@ -830,6 +843,12 @@ check_http (void) asprintf (&buf, "%sAuthorization: Basic %s\r\n", buf, auth); } + /* optionally send the proxy authentication info */ + if (strlen(proxy_auth)) { + base64_encode_alloc (proxy_auth, strlen (proxy_auth), &auth); + asprintf (&buf, "%sProxy-Authorization: Basic %s\r\n", buf, auth); + } + /* either send http POST data (any data, not only POST)*/ if (http_post_data) { if (http_content_type) { @@ -853,7 +872,9 @@ check_http (void) full_page = strdup(""); while ((i = my_recv (buffer, MAX_INPUT_BUFFER-1)) > 0) { buffer[i] = '\0'; - asprintf (&full_page, "%s%s", full_page, buffer); + asprintf (&full_page_new, "%s%s", full_page, buffer); + free (full_page); + full_page = full_page_new; pagesize += i; if (no_body && document_headers_done (full_page)) { @@ -894,9 +915,6 @@ check_http (void) #endif if (sd) close(sd); - /* reset the alarm */ - alarm (0); - /* Save check time */ microsec = deltime (tv); elapsed_time = (double)microsec / 1.0e6; @@ -999,6 +1017,9 @@ check_http (void) } /* end else (server_expect_yn) */ + /* reset the alarm - must be called *after* redir or we'll never die on redirects! */ + alarm (0); + if (maximum_age >= 0) { result = max_state_alt(check_document_dates(header, &msg), result); } @@ -1203,15 +1224,18 @@ redir (char *pos, char *status_line) free (host_name); host_name = strdup (addr); - if (followsticky == 0) { + if (!(followsticky & STICKY_HOST)) { free (server_address); server_address = strdup (addr); } + if (!(followsticky & STICKY_PORT)) { + server_port = i; + } free (server_url); server_url = url; - if ((server_port = i) > MAX_PORT) + if (server_port > MAX_PORT) die (STATE_UNKNOWN, _("HTTP UNKNOWN - Redirection to port above %d - %s://%s:%d%s%s\n"), MAX_PORT, server_type, server_address, server_port, server_url, @@ -1337,15 +1361,17 @@ print_help (void) printf (" %s\n", "-a, --authorization=AUTH_PAIR"); printf (" %s\n", _("Username:password on sites with basic authentication")); + printf (" %s\n", "-b, --proxy-authorization=AUTH_PAIR"); + printf (" %s\n", _("Username:password on proxy-servers with basic authentication")); printf (" %s\n", "-A, --useragent=STRING"); printf (" %s\n", _("String to be sent in http header as \"User Agent\"")); printf (" %s\n", "-k, --header=STRING"); printf (" %s\n", _(" Any other tags to be sent in http header. Use multiple times for additional headers")); printf (" %s\n", "-L, --link"); printf (" %s\n", _("Wrap output in HTML link (obsoleted by urlize)")); - printf (" %s\n", "-f, --onredirect="); + printf (" %s\n", "-f, --onredirect="); printf (" %s\n", _("How to handle redirected pages. sticky is like follow but stick to the")); - printf (" %s\n", _("specified IP address")); + printf (" %s\n", _("specified IP address. stickyport also ensure post stays the same.")); printf (" %s\n", "-m, --pagesize=INTEGER<:INTEGER>"); printf (" %s\n", _("Minimum page size required (bytes) : Maximum page size required (bytes)")); @@ -1397,9 +1423,9 @@ print_usage (void) { printf (_("Usage:")); printf (" %s -H | -I [-u ] [-p ]\n",progname); - printf (" [-w ] [-c ] [-t ] [-L]\n"); - printf (" [-a auth] [-f ] [-e ]\n"); - printf (" [-s string] [-l] [-r | -R ] [-P string]\n"); - printf (" [-m :] [-4|-6] [-N] [-M ] [-A string]\n"); - printf (" [-k string] [-S] [-C ] [-T ] [-j method]\n"); + printf (" [-w ] [-c ] [-t ] [-L] [-a auth]\n"); + printf (" [-b proxy_auth] [-f ]\n"); + printf (" [-e ] [-s string] [-l] [-r | -R ]\n"); + printf (" [-P string] [-m :] [-4|-6] [-N] [-M ]\n"); + printf (" [-A string] [-k string] [-S] [-C ] [-T ] [-j method]\n"); }