[pkg-nagios-changes] [Git][nagios-team/monitoring-plugins][master] 3 commits: Adding d/p/12_check_curl_improvements from upstream
Jan Wagner (@waja)
gitlab at salsa.debian.org
Fri Feb 24 15:01:28 GMT 2023
Jan Wagner pushed to branch master at Debian Nagios Maintainer Group / monitoring-plugins
Commits:
15d0c56a by Jan Wagner at 2023-02-24T12:51:43+00:00
Adding d/p/12_check_curl_improvements from upstream
- - - - -
0f6f1f9b by Jan Wagner at 2023-02-24T13:05:26+00:00
Prepare Release
- - - - -
00de3fe5 by Jan Wagner at 2023-02-24T13:10:59+00:00
New changelog
- - - - -
3 changed files:
- debian/changelog
- + debian/patches/12_check_curl_improvements
- debian/patches/series
Changes:
=====================================
debian/changelog
=====================================
@@ -1,8 +1,14 @@
-monitoring-plugins (2.3.3-3) UNRELEASED; urgency=medium
+monitoring-plugins (2.3.3-4) UNRELEASED; urgency=medium
- *
+ *
- -- Jan Wagner <waja at cyconet.org> Fri, 10 Feb 2023 11:25:52 +0000
+ -- Jan Wagner <waja at cyconet.org> Fri, 24 Feb 2023 13:10:43 +0000
+
+monitoring-plugins (2.3.3-3) unstable; urgency=medium
+
+ * [15d0c56] Adding d/p/12_check_curl_improvements from upstream
+
+ -- Jan Wagner <waja at cyconet.org> Fri, 24 Feb 2023 12:55:11 +0000
monitoring-plugins (2.3.3-2) unstable; urgency=high
=====================================
debian/patches/12_check_curl_improvements
=====================================
@@ -0,0 +1,906 @@
+From 53f07a468db98247dc4012de0ee678f29cc2bfec Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail at andreasbaumann.cc>
+Date: Sun, 5 Feb 2023 20:34:41 +0100
+Subject: [PATCH 1/7] using CURLOPT_REDIR_PROTOCOLS_STR instead of
+ CURLOPT_REDIR_PROTOCOLS for curl >= 7.85.0
+
+---
+ plugins/check_curl.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/plugins/check_curl.c b/plugins/check_curl.c
+index c6593df1a..7916eb55a 100644
+--- a/plugins/check_curl.c
++++ b/plugins/check_curl.c
+@@ -688,9 +688,13 @@ check_http (void)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_MAXREDIRS, max_depth+1), "CURLOPT_MAXREDIRS");
+
+ /* for now allow only http and https (we are a http(s) check plugin in the end) */
++#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 0)
++ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS_STR, "http,https"), "CURLOPT_REDIR_PROTOCOLS_STR");
++#else
+ #if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS), "CURLOPT_REDIRECT_PROTOCOLS");
+ #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4) */
++#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 4) */
+
+ /* TODO: handle the following aspects of redirection, make them
+ * command line options too later:
+
+From 27b0c6964559ba60ff6c7a626d51e62e5256ed62 Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail at andreasbaumann.cc>
+Date: Sat, 11 Feb 2023 18:39:24 +0100
+Subject: [PATCH 2/7] fixed regerror is MAX_INPUT_BUFFER writting into too
+ small errbuf
+
+---
+ plugins/check_curl.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/check_curl.c b/plugins/check_curl.c
+index 7916eb55a..406f6f884 100644
+--- a/plugins/check_curl.c
++++ b/plugins/check_curl.c
+@@ -173,7 +173,7 @@ double time_connect;
+ double time_appconnect;
+ double time_headers;
+ double time_firstbyte;
+-char errbuf[CURL_ERROR_SIZE+1];
++char errbuf[MAX_INPUT_BUFFER];
+ CURLcode res;
+ char url[DEFAULT_BUFFER_SIZE];
+ char msg[DEFAULT_BUFFER_SIZE];
+
+From f6978deaa1bf7c6a7196363104ebfcef143080ab Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail at andreasbaumann.cc>
+Date: Sat, 11 Feb 2023 19:11:07 +0100
+Subject: [PATCH 3/7] added --cookie-jar and doing proper cleanup of libcurl
+
+---
+ plugins/check_curl.c | 47 ++++++++++++++++++++++++++++++++------------
+ 1 file changed, 34 insertions(+), 13 deletions(-)
+
+diff --git a/plugins/check_curl.c b/plugins/check_curl.c
+index 406f6f884..35d1237b8 100644
+--- a/plugins/check_curl.c
++++ b/plugins/check_curl.c
+@@ -214,6 +214,7 @@ int address_family = AF_UNSPEC;
+ curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
+ int curl_http_version = CURL_HTTP_VERSION_NONE;
+ int automatic_decompression = FALSE;
++char *cookie_jar_file = NULL;
+
+ int process_arguments (int, char**);
+ void handle_curl_option_return_code (CURLcode res, const char* option);
+@@ -412,6 +413,19 @@ lookup_host (const char *host, char *buf, size_t buflen)
+ return 0;
+ }
+
++static void
++cleanup (void)
++{
++ curlhelp_free_statusline(&status_line);
++ curl_easy_cleanup (curl);
++ curl_global_cleanup ();
++ curlhelp_freewritebuffer (&body_buf);
++ curlhelp_freewritebuffer (&header_buf);
++ if (!strcmp (http_method, "PUT")) {
++ curlhelp_freereadbuffer (&put_buf);
++ }
++}
++
+ int
+ check_http (void)
+ {
+@@ -743,7 +757,16 @@ check_http (void)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_INFILESIZE, (curl_off_t)strlen (http_post_data)), "CURLOPT_INFILESIZE");
+ }
+ }
++
++ /* cookie handling */
++ if (cookie_jar_file != NULL) {
++ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEJAR, cookie_jar_file), "CURLOPT_COOKIEJAR");
++ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEFILE, cookie_jar_file), "CURLOPT_COOKIEFILE");
++ }
+
++ /* register cleanup function to shut down libcurl properly */
++ atexit (cleanup);
++
+ /* do the request */
+ res = curl_easy_perform(curl);
+
+@@ -1021,7 +1044,7 @@ check_http (void)
+ else
+ msg[strlen(msg)-3] = '\0';
+ }
+-
++
+ /* TODO: separate _() msg and status code: die (result, "HTTP %s: %s\n", state_text(result), msg); */
+ die (result, "HTTP %s: %s %d %s%s%s - %d bytes in %.3f second response time %s|%s\n%s%s",
+ state_text(result), string_statuscode (status_line.http_major, status_line.http_minor),
+@@ -1033,16 +1056,6 @@ check_http (void)
+ (show_body ? body_buf.buf : ""),
+ (show_body ? "\n" : "") );
+
+- /* proper cleanup after die? */
+- curlhelp_free_statusline(&status_line);
+- curl_easy_cleanup (curl);
+- curl_global_cleanup ();
+- curlhelp_freewritebuffer (&body_buf);
+- curlhelp_freewritebuffer (&header_buf);
+- if (!strcmp (http_method, "PUT")) {
+- curlhelp_freereadbuffer (&put_buf);
+- }
+-
+ return result;
+ }
+
+@@ -1239,7 +1252,8 @@ process_arguments (int argc, char **argv)
+ CONTINUE_AFTER_CHECK_CERT,
+ CA_CERT_OPTION,
+ HTTP_VERSION_OPTION,
+- AUTOMATIC_DECOMPRESSION
++ AUTOMATIC_DECOMPRESSION,
++ COOKIE_JAR
+ };
+
+ int option = 0;
+@@ -1285,6 +1299,7 @@ process_arguments (int argc, char **argv)
+ {"max-redirs", required_argument, 0, MAX_REDIRS_OPTION},
+ {"http-version", required_argument, 0, HTTP_VERSION_OPTION},
+ {"enable-automatic-decompression", no_argument, 0, AUTOMATIC_DECOMPRESSION},
++ {"cookie-jar", required_argument, 0, COOKIE_JAR},
+ {0, 0, 0, 0}
+ };
+
+@@ -1691,6 +1706,9 @@ process_arguments (int argc, char **argv)
+ case AUTOMATIC_DECOMPRESSION:
+ automatic_decompression = TRUE;
+ break;
++ case COOKIE_JAR:
++ cookie_jar_file = optarg;
++ break;
+ case '?':
+ /* print short usage statement if args not parsable */
+ usage5 ();
+@@ -1910,6 +1928,8 @@ print_help (void)
+ printf (" %s\n", _("1.0 = HTTP/1.0, 1.1 = HTTP/1.1, 2.0 = HTTP/2 (HTTP/2 will fail without -S)"));
+ printf (" %s\n", "--enable-automatic-decompression");
+ printf (" %s\n", _("Enable automatic decompression of body (CURLOPT_ACCEPT_ENCODING)."));
++ printf (" %s\n", "---cookie-jar=FILE");
++ printf (" %s\n", _("Store cookies in the cookie jar and send them out when requested."));
+ printf ("\n");
+
+ printf (UT_WARN_CRIT);
+@@ -1994,7 +2014,8 @@ print_usage (void)
+ printf (" [-P string] [-m <min_pg_size>:<max_pg_size>] [-4|-6] [-N] [-M <age>]\n");
+ printf (" [-A string] [-k string] [-S <version>] [--sni]\n");
+ printf (" [-T <content-type>] [-j method]\n");
+- printf (" [--http-version=<version>]\n");
++ printf (" [--http-version=<version>] [--enable-automatic-decompression]\n");
++ printf (" [--cookie-jar=<cookie jar file>\n");
+ printf (" %s -H <vhost> | -I <IP-address> -C <warn_age>[,<crit_age>]\n",progname);
+ printf (" [-p <port>] [-t <timeout>] [-4|-6] [--sni]\n");
+ printf ("\n");
+
+From 40da85e6913ba4898f5a80772c7b3ea0cba0d3eb Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail at andreasbaumann.cc>
+Date: Sun, 12 Feb 2023 12:11:38 +0100
+Subject: [PATCH 4/7] better cleanup of curl structures and buffers
+
+---
+ plugins/check_curl.c | 31 ++++++++++++++++++++-----------
+ 1 file changed, 20 insertions(+), 11 deletions(-)
+
+diff --git a/plugins/check_curl.c b/plugins/check_curl.c
+index 35d1237b8..a49cac8a3 100644
+--- a/plugins/check_curl.c
++++ b/plugins/check_curl.c
+@@ -161,9 +161,13 @@ char *http_post_data = NULL;
+ char *http_content_type = NULL;
+ CURL *curl;
+ struct curl_slist *header_list = NULL;
++int body_buf_initialized = 0;
+ curlhelp_write_curlbuf body_buf;
++int header_buf_initialized = 0;
+ curlhelp_write_curlbuf header_buf;
++int status_line_initialized = 0;
+ curlhelp_statusline status_line;
++int put_buf_initialized = 0;
+ curlhelp_read_curlbuf put_buf;
+ char http_header[DEFAULT_BUFFER_SIZE];
+ long code;
+@@ -416,14 +420,12 @@ lookup_host (const char *host, char *buf, size_t buflen)
+ static void
+ cleanup (void)
+ {
+- curlhelp_free_statusline(&status_line);
++ if (status_line_initialized) curlhelp_free_statusline(&status_line);
+ curl_easy_cleanup (curl);
+ curl_global_cleanup ();
+- curlhelp_freewritebuffer (&body_buf);
+- curlhelp_freewritebuffer (&header_buf);
+- if (!strcmp (http_method, "PUT")) {
+- curlhelp_freereadbuffer (&put_buf);
+- }
++ if (body_buf_initialized) curlhelp_freewritebuffer (&body_buf);
++ if (header_buf_initialized) curlhelp_freewritebuffer (&header_buf);
++ if (put_buf_initialized) curlhelp_freereadbuffer (&put_buf);
+ }
+
+ int
+@@ -441,9 +443,14 @@ check_http (void)
+ if (curl_global_init (CURL_GLOBAL_DEFAULT) != CURLE_OK)
+ die (STATE_UNKNOWN, "HTTP UNKNOWN - curl_global_init failed\n");
+
+- if ((curl = curl_easy_init()) == NULL)
++ if ((curl = curl_easy_init()) == NULL) {
++ curl_global_cleanup ();
+ die (STATE_UNKNOWN, "HTTP UNKNOWN - curl_easy_init failed\n");
++ }
+
++ /* register cleanup function to shut down libcurl properly */
++ atexit (cleanup);
++
+ if (verbose >= 1)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_VERBOSE, TRUE), "CURLOPT_VERBOSE");
+
+@@ -460,12 +467,14 @@ check_http (void)
+ /* initialize buffer for body of the answer */
+ if (curlhelp_initwritebuffer(&body_buf) < 0)
+ die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for body\n");
++ body_buf_initialized = 1;
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback), "CURLOPT_WRITEFUNCTION");
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEDATA, (void *)&body_buf), "CURLOPT_WRITEDATA");
+
+ /* initialize buffer for header of the answer */
+ if (curlhelp_initwritebuffer( &header_buf ) < 0)
+ die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for header\n" );
++ header_buf_initialized = 1;
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback), "CURLOPT_HEADERFUNCTION");
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEHEADER, (void *)&header_buf), "CURLOPT_WRITEHEADER");
+
+@@ -752,7 +761,9 @@ check_http (void)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_POSTFIELDS, http_post_data), "CURLOPT_POSTFIELDS");
+ } else if (!strcmp(http_method, "PUT")) {
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_READFUNCTION, (curl_read_callback)curlhelp_buffer_read_callback), "CURLOPT_READFUNCTION");
+- curlhelp_initreadbuffer (&put_buf, http_post_data, strlen (http_post_data));
++ if (curlhelp_initreadbuffer (&put_buf, http_post_data, strlen (http_post_data)) < 0)
++ die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating read buffer for PUT\n");
++ put_buf_initialized = 1;
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_READDATA, (void *)&put_buf), "CURLOPT_READDATA");
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_INFILESIZE, (curl_off_t)strlen (http_post_data)), "CURLOPT_INFILESIZE");
+ }
+@@ -764,9 +775,6 @@ check_http (void)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_COOKIEFILE, cookie_jar_file), "CURLOPT_COOKIEFILE");
+ }
+
+- /* register cleanup function to shut down libcurl properly */
+- atexit (cleanup);
+-
+ /* do the request */
+ res = curl_easy_perform(curl);
+
+@@ -2159,6 +2167,7 @@ curlhelp_parse_statusline (const char *buf, curlhelp_statusline *status_line)
+
+ first_line_len = (size_t)(first_line_end - buf);
+ status_line->first_line = (char *)malloc (first_line_len + 1);
++ status_line_initialized = 1;
+ if (status_line->first_line == NULL) return -1;
+ memcpy (status_line->first_line, buf, first_line_len);
+ status_line->first_line[first_line_len] = '\0';
+
+From 6563267c3ad84bcc4779d282b5ae20520a4a2a6b Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail at andreasbaumann.cc>
+Date: Sun, 12 Feb 2023 13:16:25 +0100
+Subject: [PATCH 5/7] fixed double frees when doing old-style redirects
+
+---
+ plugins/check_curl.c | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/check_curl.c b/plugins/check_curl.c
+index a49cac8a3..1127d6019 100644
+--- a/plugins/check_curl.c
++++ b/plugins/check_curl.c
+@@ -160,6 +160,8 @@ char *http_method = NULL;
+ char *http_post_data = NULL;
+ char *http_content_type = NULL;
+ CURL *curl;
++int curl_global_initialized = 0;
++int curl_easy_initialized = 0;
+ struct curl_slist *header_list = NULL;
+ int body_buf_initialized = 0;
+ curlhelp_write_curlbuf body_buf;
+@@ -421,11 +423,17 @@ static void
+ cleanup (void)
+ {
+ if (status_line_initialized) curlhelp_free_statusline(&status_line);
+- curl_easy_cleanup (curl);
+- curl_global_cleanup ();
++ status_line_initialized = 0;
++ if (curl_easy_initialized) curl_easy_cleanup (curl);
++ curl_easy_initialized = 0;
++ if (curl_global_initialized) curl_global_cleanup ();
++ curl_global_initialized = 0;
+ if (body_buf_initialized) curlhelp_freewritebuffer (&body_buf);
++ body_buf_initialized = 0;
+ if (header_buf_initialized) curlhelp_freewritebuffer (&header_buf);
++ header_buf_initialized = 0;
+ if (put_buf_initialized) curlhelp_freereadbuffer (&put_buf);
++ put_buf_initialized = 0;
+ }
+
+ int
+@@ -442,11 +450,12 @@ check_http (void)
+ /* initialize curl */
+ if (curl_global_init (CURL_GLOBAL_DEFAULT) != CURLE_OK)
+ die (STATE_UNKNOWN, "HTTP UNKNOWN - curl_global_init failed\n");
++ curl_global_initialized = 1;
+
+ if ((curl = curl_easy_init()) == NULL) {
+- curl_global_cleanup ();
+ die (STATE_UNKNOWN, "HTTP UNKNOWN - curl_easy_init failed\n");
+ }
++ curl_easy_initialized = 1;
+
+ /* register cleanup function to shut down libcurl properly */
+ atexit (cleanup);
+@@ -903,6 +912,7 @@ check_http (void)
+ /* we cannot know the major/minor version here for sure as we cannot parse the first line */
+ die (STATE_CRITICAL, "HTTP CRITICAL HTTP/x.x %ld unknown - %s", code, msg);
+ }
++ status_line_initialized = 1;
+
+ /* get result code from cURL */
+ handle_curl_option_return_code (curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &code), "CURLINFO_RESPONSE_CODE");
+@@ -1234,6 +1244,7 @@ redir (curlhelp_write_curlbuf* header_buf)
+ * attached to the URL in Location
+ */
+
++ cleanup ();
+ check_http ();
+ }
+
+@@ -2167,7 +2178,6 @@ curlhelp_parse_statusline (const char *buf, curlhelp_statusline *status_line)
+
+ first_line_len = (size_t)(first_line_end - buf);
+ status_line->first_line = (char *)malloc (first_line_len + 1);
+- status_line_initialized = 1;
+ if (status_line->first_line == NULL) return -1;
+ memcpy (status_line->first_line, buf, first_line_len);
+ status_line->first_line[first_line_len] = '\0';
+
+From 8e1bbf5e6ed4069d4256bf549a408bb8759861fa Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail at andreasbaumann.cc>
+Date: Sun, 12 Feb 2023 15:09:02 +0100
+Subject: [PATCH 6/7] changed #else/#if to #elif in libcurl library checks
+
+---
+ plugins/check_curl.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/plugins/check_curl.c b/plugins/check_curl.c
+index 1127d6019..284cf4eab 100644
+--- a/plugins/check_curl.c
++++ b/plugins/check_curl.c
+@@ -722,11 +722,9 @@ check_http (void)
+ /* for now allow only http and https (we are a http(s) check plugin in the end) */
+ #if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 0)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS_STR, "http,https"), "CURLOPT_REDIR_PROTOCOLS_STR");
+-#else
+-#if LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4)
++#elif LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_REDIR_PROTOCOLS, CURLPROTO_HTTP | CURLPROTO_HTTPS), "CURLOPT_REDIRECT_PROTOCOLS");
+-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 19, 4) */
+-#endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 85, 4) */
++#endif
+
+ /* TODO: handle the following aspects of redirection, make them
+ * command line options too later:
+
+From ad6b638acb420f4416b10cf52fdd6c75c3c8e6fa Mon Sep 17 00:00:00 2001
+From: Andreas Baumann <mail at andreasbaumann.cc>
+Date: Fri, 17 Feb 2023 14:03:55 +0100
+Subject: [PATCH 7/7] using real boolean in check_curl
+
+---
+ plugins/check_curl.c | 160 ++++++++++++++++++++++---------------------
+ 1 file changed, 82 insertions(+), 78 deletions(-)
+
+diff --git a/plugins/check_curl.c b/plugins/check_curl.c
+index 284cf4eab..c37d45d91 100644
+--- a/plugins/check_curl.c
++++ b/plugins/check_curl.c
+@@ -37,6 +37,7 @@ const char *progname = "check_curl";
+ const char *copyright = "2006-2019";
+ const char *email = "devel at monitoring-plugins.org";
+
++#include <stdbool.h>
+ #include <ctype.h>
+
+ #include "common.h"
+@@ -131,14 +132,14 @@ regmatch_t pmatch[REGS];
+ char regexp[MAX_RE_SIZE];
+ int cflags = REG_NOSUB | REG_EXTENDED | REG_NEWLINE;
+ int errcode;
+-int invert_regex = 0;
++bool invert_regex = false;
+
+ char *server_address = NULL;
+ char *host_name = NULL;
+ char *server_url = 0;
+ char server_ip[DEFAULT_BUFFER_SIZE];
+ struct curl_slist *server_ips = NULL;
+-int specify_port = FALSE;
++bool specify_port = false;
+ unsigned short server_port = HTTP_PORT;
+ unsigned short virtual_port = 0;
+ int host_name_length;
+@@ -150,8 +151,8 @@ int days_till_exp_warn, days_till_exp_crit;
+ thresholds *thlds;
+ char user_agent[DEFAULT_BUFFER_SIZE];
+ int verbose = 0;
+-int show_extended_perfdata = FALSE;
+-int show_body = FALSE;
++bool show_extended_perfdata = false;
++bool show_body = false;
+ int min_page_len = 0;
+ int max_page_len = 0;
+ int redir_depth = 0;
+@@ -160,16 +161,16 @@ char *http_method = NULL;
+ char *http_post_data = NULL;
+ char *http_content_type = NULL;
+ CURL *curl;
+-int curl_global_initialized = 0;
+-int curl_easy_initialized = 0;
++bool curl_global_initialized = false;
++bool curl_easy_initialized = false;
+ struct curl_slist *header_list = NULL;
+-int body_buf_initialized = 0;
++bool body_buf_initialized = false;
+ curlhelp_write_curlbuf body_buf;
+-int header_buf_initialized = 0;
++bool header_buf_initialized = false;
+ curlhelp_write_curlbuf header_buf;
+-int status_line_initialized = 0;
++bool status_line_initialized = false;
+ curlhelp_statusline status_line;
+-int put_buf_initialized = 0;
++bool put_buf_initialized = false;
+ curlhelp_read_curlbuf put_buf;
+ char http_header[DEFAULT_BUFFER_SIZE];
+ long code;
+@@ -192,14 +193,14 @@ char user_auth[MAX_INPUT_BUFFER] = "";
+ char proxy_auth[MAX_INPUT_BUFFER] = "";
+ char **http_opt_headers;
+ int http_opt_headers_count = 0;
+-int display_html = FALSE;
++bool display_html = false;
+ int onredirect = STATE_OK;
+ int followmethod = FOLLOW_HTTP_CURL;
+ int followsticky = STICKY_NONE;
+-int use_ssl = FALSE;
+-int use_sni = TRUE;
+-int check_cert = FALSE;
+-int continue_after_check_cert = FALSE;
++bool use_ssl = false;
++bool use_sni = true;
++bool check_cert = false;
++bool continue_after_check_cert = false;
+ typedef union {
+ struct curl_slist* to_info;
+ struct curl_certinfo* to_certinfo;
+@@ -209,20 +210,20 @@ int ssl_version = CURL_SSLVERSION_DEFAULT;
+ char *client_cert = NULL;
+ char *client_privkey = NULL;
+ char *ca_cert = NULL;
+-int verify_peer_and_host = FALSE;
+-int is_openssl_callback = FALSE;
++bool verify_peer_and_host = false;
++bool is_openssl_callback = false;
+ #if defined(HAVE_SSL) && defined(USE_OPENSSL)
+ X509 *cert = NULL;
+ #endif /* defined(HAVE_SSL) && defined(USE_OPENSSL) */
+-int no_body = FALSE;
++bool no_body = false;
+ int maximum_age = -1;
+ int address_family = AF_UNSPEC;
+ curlhelp_ssl_library ssl_library = CURLHELP_SSL_LIBRARY_UNKNOWN;
+ int curl_http_version = CURL_HTTP_VERSION_NONE;
+-int automatic_decompression = FALSE;
++bool automatic_decompression = false;
+ char *cookie_jar_file = NULL;
+
+-int process_arguments (int, char**);
++bool process_arguments (int, char**);
+ void handle_curl_option_return_code (CURLcode res, const char* option);
+ int check_http (void);
+ void redir (curlhelp_write_curlbuf*);
+@@ -276,10 +277,10 @@ main (int argc, char **argv)
+ progname, NP_VERSION, VERSION, curl_version());
+
+ /* parse arguments */
+- if (process_arguments (argc, argv) == ERROR)
++ if (process_arguments (argc, argv) == false)
+ usage4 (_("Could not parse arguments"));
+
+- if (display_html == TRUE)
++ if (display_html)
+ printf ("<A HREF=\"%s://%s:%d%s\" target=\"_blank\">",
+ use_ssl ? "https" : "http",
+ host_name ? host_name : server_address,
+@@ -423,17 +424,17 @@ static void
+ cleanup (void)
+ {
+ if (status_line_initialized) curlhelp_free_statusline(&status_line);
+- status_line_initialized = 0;
++ status_line_initialized = false;
+ if (curl_easy_initialized) curl_easy_cleanup (curl);
+- curl_easy_initialized = 0;
++ curl_easy_initialized = false;
+ if (curl_global_initialized) curl_global_cleanup ();
+- curl_global_initialized = 0;
++ curl_global_initialized = false;
+ if (body_buf_initialized) curlhelp_freewritebuffer (&body_buf);
+- body_buf_initialized = 0;
++ body_buf_initialized = false;
+ if (header_buf_initialized) curlhelp_freewritebuffer (&header_buf);
+- header_buf_initialized = 0;
++ header_buf_initialized = false;
+ if (put_buf_initialized) curlhelp_freereadbuffer (&put_buf);
+- put_buf_initialized = 0;
++ put_buf_initialized = false;
+ }
+
+ int
+@@ -450,18 +451,18 @@ check_http (void)
+ /* initialize curl */
+ if (curl_global_init (CURL_GLOBAL_DEFAULT) != CURLE_OK)
+ die (STATE_UNKNOWN, "HTTP UNKNOWN - curl_global_init failed\n");
+- curl_global_initialized = 1;
++ curl_global_initialized = true;
+
+ if ((curl = curl_easy_init()) == NULL) {
+ die (STATE_UNKNOWN, "HTTP UNKNOWN - curl_easy_init failed\n");
+ }
+- curl_easy_initialized = 1;
++ curl_easy_initialized = true;
+
+ /* register cleanup function to shut down libcurl properly */
+ atexit (cleanup);
+
+ if (verbose >= 1)
+- handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_VERBOSE, TRUE), "CURLOPT_VERBOSE");
++ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_VERBOSE, 1), "CURLOPT_VERBOSE");
+
+ /* print everything on stdout like check_http would do */
+ handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_STDERR, stdout), "CURLOPT_STDERR");
+@@ -476,14 +477,14 @@ check_http (void)
+ /* initialize buffer for body of the answer */
+ if (curlhelp_initwritebuffer(&body_buf) < 0)
+ die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for body\n");
+- body_buf_initialized = 1;
++ body_buf_initialized = true;
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback), "CURLOPT_WRITEFUNCTION");
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEDATA, (void *)&body_buf), "CURLOPT_WRITEDATA");
+
+ /* initialize buffer for header of the answer */
+ if (curlhelp_initwritebuffer( &header_buf ) < 0)
+ die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating buffer for header\n" );
+- header_buf_initialized = 1;
++ header_buf_initialized = true;
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_HEADERFUNCTION, (curl_write_callback)curlhelp_buffer_write_callback), "CURLOPT_HEADERFUNCTION");
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_WRITEHEADER, (void *)&header_buf), "CURLOPT_WRITEHEADER");
+
+@@ -544,7 +545,7 @@ check_http (void)
+
+ /* disable body for HEAD request */
+ if (http_method && !strcmp (http_method, "HEAD" )) {
+- no_body = TRUE;
++ no_body = true;
+ }
+
+ /* set HTTP protocol version */
+@@ -641,7 +642,7 @@ check_http (void)
+ #ifdef USE_OPENSSL
+ /* libcurl and monitoring plugins built with OpenSSL, good */
+ handle_curl_option_return_code (curl_easy_setopt(curl, CURLOPT_SSL_CTX_FUNCTION, sslctxfun), "CURLOPT_SSL_CTX_FUNCTION");
+- is_openssl_callback = TRUE;
++ is_openssl_callback = true;
+ #else /* USE_OPENSSL */
+ #endif /* USE_OPENSSL */
+ /* libcurl is built with OpenSSL, monitoring plugins, so falling
+@@ -770,7 +771,7 @@ check_http (void)
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_READFUNCTION, (curl_read_callback)curlhelp_buffer_read_callback), "CURLOPT_READFUNCTION");
+ if (curlhelp_initreadbuffer (&put_buf, http_post_data, strlen (http_post_data)) < 0)
+ die (STATE_UNKNOWN, "HTTP CRITICAL - out of memory allocating read buffer for PUT\n");
+- put_buf_initialized = 1;
++ put_buf_initialized = true;
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_READDATA, (void *)&put_buf), "CURLOPT_READDATA");
+ handle_curl_option_return_code (curl_easy_setopt (curl, CURLOPT_INFILESIZE, (curl_off_t)strlen (http_post_data)), "CURLOPT_INFILESIZE");
+ }
+@@ -801,15 +802,15 @@ check_http (void)
+
+ /* certificate checks */
+ #ifdef LIBCURL_FEATURE_SSL
+- if (use_ssl == TRUE) {
+- if (check_cert == TRUE) {
++ if (use_ssl) {
++ if (check_cert) {
+ if (is_openssl_callback) {
+ #ifdef USE_OPENSSL
+ /* check certificate with OpenSSL functions, curl has been built against OpenSSL
+ * and we actually have OpenSSL in the monitoring tools
+ */
+ result = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
+- if (continue_after_check_cert == FALSE) {
++ if (!continue_after_check_cert) {
+ return result;
+ }
+ #else /* USE_OPENSSL */
+@@ -851,7 +852,7 @@ check_http (void)
+ }
+ BIO_free (cert_BIO);
+ result = np_net_ssl_check_certificate(cert, days_till_exp_warn, days_till_exp_crit);
+- if (continue_after_check_cert == FALSE) {
++ if (!continue_after_check_cert) {
+ return result;
+ }
+ #else /* USE_OPENSSL */
+@@ -859,7 +860,7 @@ check_http (void)
+ * so we use the libcurl CURLINFO data
+ */
+ result = net_noopenssl_check_certificate(&cert_ptr, days_till_exp_warn, days_till_exp_crit);
+- if (continue_after_check_cert == FALSE) {
++ if (!continue_after_check_cert) {
+ return result;
+ }
+ #endif /* USE_OPENSSL */
+@@ -887,7 +888,7 @@ check_http (void)
+ perfd_time(total_time),
+ perfd_size(page_len),
+ perfd_time_connect(time_connect),
+- use_ssl == TRUE ? perfd_time_ssl (time_appconnect-time_connect) : "",
++ use_ssl ? perfd_time_ssl (time_appconnect-time_connect) : "",
+ perfd_time_headers(time_headers - time_appconnect),
+ perfd_time_firstbyte(time_firstbyte - time_headers),
+ perfd_time_transfer(total_time-time_firstbyte)
+@@ -910,7 +911,7 @@ check_http (void)
+ /* we cannot know the major/minor version here for sure as we cannot parse the first line */
+ die (STATE_CRITICAL, "HTTP CRITICAL HTTP/x.x %ld unknown - %s", code, msg);
+ }
+- status_line_initialized = 1;
++ status_line_initialized = true;
+
+ /* get result code from cURL */
+ handle_curl_option_return_code (curl_easy_getinfo (curl, CURLINFO_RESPONSE_CODE, &code), "CURLINFO_RESPONSE_CODE");
+@@ -1023,12 +1024,12 @@ check_http (void)
+
+ if (strlen (regexp)) {
+ errcode = regexec (&preg, body_buf.buf, REGS, pmatch, 0);
+- if ((errcode == 0 && invert_regex == 0) || (errcode == REG_NOMATCH && invert_regex == 1)) {
++ if ((errcode == 0 && !invert_regex) || (errcode == REG_NOMATCH && invert_regex)) {
+ /* OK - No-op to avoid changing the logic around it */
+ result = max_state_alt(STATE_OK, result);
+ }
+- else if ((errcode == REG_NOMATCH && invert_regex == 0) || (errcode == 0 && invert_regex == 1)) {
+- if (invert_regex == 0)
++ else if ((errcode == REG_NOMATCH && !invert_regex) || (errcode == 0 && invert_regex)) {
++ if (!invert_regex)
+ snprintf (msg, DEFAULT_BUFFER_SIZE, _("%spattern not found, "), msg);
+ else
+ snprintf (msg, DEFAULT_BUFFER_SIZE, _("%spattern found, "), msg);
+@@ -1167,7 +1168,10 @@ redir (curlhelp_write_curlbuf* header_buf)
+ }
+ }
+
+- use_ssl = !uri_strcmp (uri.scheme, "https");
++ if (!uri_strcmp (uri.scheme, "https"))
++ use_ssl = true;
++ else
++ use_ssl = false;
+
+ /* we do a sloppy test here only, because uriparser would have failed
+ * above, if the port would be invalid, we just check for MAX_PORT
+@@ -1255,7 +1259,7 @@ test_file (char *path)
+ usage2 (_("file does not exist or is not readable"), path);
+ }
+
+-int
++bool
+ process_arguments (int argc, char **argv)
+ {
+ char *p;
+@@ -1321,7 +1325,7 @@ process_arguments (int argc, char **argv)
+ };
+
+ if (argc < 2)
+- return ERROR;
++ return false;
+
+ /* support check_http compatible arguments */
+ for (c = 1; c < argc; c++) {
+@@ -1401,7 +1405,7 @@ process_arguments (int argc, char **argv)
+ if( strtol(optarg, NULL, 10) > MAX_PORT)
+ usage2 (_("Invalid port number, supplied port number is too big"), optarg);
+ server_port = (unsigned short)strtol(optarg, NULL, 10);
+- specify_port = TRUE;
++ specify_port = true;
+ }
+ break;
+ case 'a': /* authorization info */
+@@ -1435,10 +1439,10 @@ process_arguments (int argc, char **argv)
+ http_opt_headers[http_opt_headers_count - 1] = optarg;
+ break;
+ case 'L': /* show html link */
+- display_html = TRUE;
++ display_html = true;
+ break;
+ case 'n': /* do not show html link */
+- display_html = FALSE;
++ display_html = false;
+ break;
+ case 'C': /* Check SSL cert validity */
+ #ifdef LIBCURL_FEATURE_SSL
+@@ -1459,12 +1463,12 @@ process_arguments (int argc, char **argv)
+ usage2 (_("Invalid certificate expiration period"), optarg);
+ days_till_exp_warn = atoi (optarg);
+ }
+- check_cert = TRUE;
++ check_cert = true;
+ goto enable_ssl;
+ #endif
+ case CONTINUE_AFTER_CHECK_CERT: /* don't stop after the certificate is checked */
+ #ifdef HAVE_SSL
+- continue_after_check_cert = TRUE;
++ continue_after_check_cert = true;
+ break;
+ #endif
+ case 'J': /* use client certificate */
+@@ -1487,13 +1491,13 @@ process_arguments (int argc, char **argv)
+ #endif
+ #ifdef LIBCURL_FEATURE_SSL
+ case 'D': /* verify peer certificate & host */
+- verify_peer_and_host = TRUE;
++ verify_peer_and_host = true;
+ break;
+ #endif
+ case 'S': /* use SSL */
+ #ifdef LIBCURL_FEATURE_SSL
+ enable_ssl:
+- use_ssl = TRUE;
++ use_ssl = true;
+ /* ssl_version initialized to CURL_SSLVERSION_DEFAULT as a default.
+ * Only set if it's non-zero. This helps when we include multiple
+ * parameters, like -S and -C combinations */
+@@ -1567,15 +1571,15 @@ process_arguments (int argc, char **argv)
+ #endif /* LIBCURL_VERSION_NUM >= MAKE_LIBCURL_VERSION(7, 54, 0) */
+ if (verbose >= 2)
+ printf(_("* Set SSL/TLS version to %d\n"), ssl_version);
+- if (specify_port == FALSE)
++ if (!specify_port)
+ server_port = HTTPS_PORT;
+ break;
+ #else /* LIBCURL_FEATURE_SSL */
+ /* -C -J and -K fall through to here without SSL */
+ usage4 (_("Invalid option - SSL is not available"));
+ break;
+- case SNI_OPTION: /* --sni is parsed, but ignored, the default is TRUE with libcurl */
+- use_sni = TRUE;
++ case SNI_OPTION: /* --sni is parsed, but ignored, the default is true with libcurl */
++ use_sni = true;
+ break;
+ #endif /* LIBCURL_FEATURE_SSL */
+ case MAX_REDIRS_OPTION:
+@@ -1636,11 +1640,11 @@ process_arguments (int argc, char **argv)
+ if (errcode != 0) {
+ (void) regerror (errcode, &preg, errbuf, MAX_INPUT_BUFFER);
+ printf (_("Could Not Compile Regular Expression: %s"), errbuf);
+- return ERROR;
++ return false;
+ }
+ break;
+ case INVERT_REGEX:
+- invert_regex = 1;
++ invert_regex = true;
+ break;
+ case '4':
+ address_family = AF_INET;
+@@ -1675,7 +1679,7 @@ process_arguments (int argc, char **argv)
+ break;
+ }
+ case 'N': /* no-body */
+- no_body = TRUE;
++ no_body = true;
+ break;
+ case 'M': /* max-age */
+ {
+@@ -1698,10 +1702,10 @@ process_arguments (int argc, char **argv)
+ }
+ break;
+ case 'E': /* show extended perfdata */
+- show_extended_perfdata = TRUE;
++ show_extended_perfdata = true;
+ break;
+ case 'B': /* print body content after status line */
+- show_body = TRUE;
++ show_body = true;
+ break;
+ case HTTP_VERSION_OPTION:
+ curl_http_version = CURL_HTTP_VERSION_NONE;
+@@ -1721,7 +1725,7 @@ process_arguments (int argc, char **argv)
+ }
+ break;
+ case AUTOMATIC_DECOMPRESSION:
+- automatic_decompression = TRUE;
++ automatic_decompression = true;
+ break;
+ case COOKIE_JAR:
+ cookie_jar_file = optarg;
+@@ -1765,52 +1769,52 @@ process_arguments (int argc, char **argv)
+ virtual_port = server_port;
+ else {
+ if ((use_ssl && server_port == HTTPS_PORT) || (!use_ssl && server_port == HTTP_PORT))
+- if(specify_port == FALSE)
++ if(!specify_port)
+ server_port = virtual_port;
+ }
+
+- return TRUE;
++ return true;
+ }
+
+ char *perfd_time (double elapsed_time)
+ {
+ return fperfdata ("time", elapsed_time, "s",
+- thlds->warning?TRUE:FALSE, thlds->warning?thlds->warning->end:0,
+- thlds->critical?TRUE:FALSE, thlds->critical?thlds->critical->end:0,
+- TRUE, 0, TRUE, socket_timeout);
++ thlds->warning?true:false, thlds->warning?thlds->warning->end:0,
++ thlds->critical?true:false, thlds->critical?thlds->critical->end:0,
++ true, 0, true, socket_timeout);
+ }
+
+ char *perfd_time_connect (double elapsed_time_connect)
+ {
+- return fperfdata ("time_connect", elapsed_time_connect, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
++ return fperfdata ("time_connect", elapsed_time_connect, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+ }
+
+ char *perfd_time_ssl (double elapsed_time_ssl)
+ {
+- return fperfdata ("time_ssl", elapsed_time_ssl, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
++ return fperfdata ("time_ssl", elapsed_time_ssl, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+ }
+
+ char *perfd_time_headers (double elapsed_time_headers)
+ {
+- return fperfdata ("time_headers", elapsed_time_headers, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
++ return fperfdata ("time_headers", elapsed_time_headers, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+ }
+
+ char *perfd_time_firstbyte (double elapsed_time_firstbyte)
+ {
+- return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
++ return fperfdata ("time_firstbyte", elapsed_time_firstbyte, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+ }
+
+ char *perfd_time_transfer (double elapsed_time_transfer)
+ {
+- return fperfdata ("time_transfer", elapsed_time_transfer, "s", FALSE, 0, FALSE, 0, FALSE, 0, TRUE, socket_timeout);
++ return fperfdata ("time_transfer", elapsed_time_transfer, "s", false, 0, false, 0, false, 0, true, socket_timeout);
+ }
+
+ char *perfd_size (int page_len)
+ {
+ return perfdata ("size", page_len, "B",
+- (min_page_len>0?TRUE:FALSE), min_page_len,
+- (min_page_len>0?TRUE:FALSE), 0,
+- TRUE, 0, FALSE, 0);
++ (min_page_len>0?true:false), min_page_len,
++ (min_page_len>0?true:false), 0,
++ true, 0, false, 0);
+ }
+
+ void
=====================================
debian/patches/series
=====================================
@@ -3,3 +3,4 @@
# commited upstream
10_check_http_chunked_wo_actual_content
11_fallback_for_gnutls
+12_check_curl_improvements
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/82f33d01a3e45ab195e59b1c43931ea0419188d7...00de3fe5eae6bc591a46229c49ff760d4497a256
--
View it on GitLab: https://salsa.debian.org/nagios-team/monitoring-plugins/-/compare/82f33d01a3e45ab195e59b1c43931ea0419188d7...00de3fe5eae6bc591a46229c49ff760d4497a256
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-nagios-changes/attachments/20230224/732d80de/attachment-0001.htm>
More information about the pkg-nagios-changes
mailing list