Commit graph

3337 commits

Author SHA1 Message Date
Andreas Baumann
14be220fce check_curl: make -C obvious (from check_http, part 2) 2021-04-10 13:43:12 +02:00
Andreas Baumann
7a8a089723 check_curl: make -C obvious (from check_http) 2021-04-10 13:43:12 +02:00
Andreas Baumann
74fb00f7a0 check_curl: Increase regexp limit (to 1024 as in check_http) 2021-04-10 13:43:12 +02:00
Barak Shohat
827c3e80ef Add an option to check_curl to verify the peer certificate & host using the system CA's 2021-04-10 13:43:12 +02:00
Stefan Bethke
822fb4ebe4 Docs check_http: make -C obvious
You need to read the docs carefully to realize that check_http has two 
modes of operation: the regular HTTP checks, and a TLS certificate 
check. Only one of these can be run in a single invocation.

Fixes #1553
2021-04-10 13:43:12 +02:00
Tomas Mozes
e819b582d5 plugins: check_http: Increase regexp limit 2021-04-10 13:43:12 +02:00
Gerhard Lausser
001f684d21 check_snmp: put the "c" (to mark a counter) after the perfdata value 2021-04-10 13:43:12 +02:00
Florian Lohoff
0d504aea51 Using snprintf which honors the buffers size and guarantees null termination. (Closes: #1601)
As strcpy may overflow the resulting buffer:

flo@p5:~$ /tmp/f/usr/lib/nagios/plugins/check_pgsql -d "$(seq 1 10000)"
*** buffer overflow detected ***: terminated
Aborted

I would propose to change the code rather like this, using snprintf
which honors the buffers size and guarantees null termination.
2021-04-10 13:43:12 +02:00
Barak Shohat
e7598ae637 Updated check_curl.c to display a specific human-readable error message where possible 2021-04-10 13:43:12 +02:00
Sven Nierlein
2bb6abb501 fix check_curl crash if http header contains leading spaces
check_curl crashes when a (broken) http server returns invalid http header with
leading spaces or double colons. This PR adds a fix and a test case for this.

Signed-off-by: Sven Nierlein <sven@nierlein.de>
2021-04-10 13:43:12 +02:00
ghciv6
7c32e64540 - fix for issue #1562
1st compare then free up resources
2021-04-10 13:43:12 +02:00
Andreas Baumann
5a0ea60d76 check_curl: added string_statuscode function for printing HTTP/1.1 and HTTP/2 correctly 2021-04-10 13:43:12 +02:00
Rolf Eike Beer
a56d01d028 check_dns: split multiple IP addresses passed in one -a argument 2021-04-10 13:43:12 +02:00
Andreas Baumann
d5b81e8966 check_curl: fixed a potential buffer overflow in url buffer 2021-04-10 13:43:12 +02:00
Andreas Baumann
0484aed02b check_curl: fixed help, usage and errors for TLS 1.3 2021-04-10 13:43:12 +02:00
Tim Gates
95686770a2 docs: fix simple typo, conspicuosly -> conspicuously
There is a small typo in plugins-root/check_icmp.c.

Should read `conspicuously` rather than `conspicuosly`.
2021-04-10 13:43:12 +02:00
Jan Wagner
d9c87f84b4 Draft NEWS 2020-12-09 22:38:01 +01:00
Jan Wagner
5789a76bbc Updating contributors 2020-12-09 22:09:38 +01:00
Jan Wagner
233251f43b Updating version number 2020-12-09 14:10:53 +01:00
waja
81b99ded7f
Merge pull request #1650 from sni/fix_check_mailq_options
check_mailq: restore accidentially removed options
2020-12-08 16:55:04 +01:00
Sven Nierlein
aa79ab278f check_mailq: restore accidentially removed options
with https://github.com/monitoring-plugins/monitoring-plugins/issues/381 -W and -C have been removed. It
would have been sufficient to only remove the long options. Restoring short options..

 - fixes https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=954961
2020-12-08 16:24:10 +01:00
Sven Nierlein
67877a296e
Merge pull request #1645 from Prathu121/master
Improves and fixes
2020-10-02 17:38:27 +02:00
Prathamesh Bhanuse
1039822de8
Update README 2020-10-02 01:48:46 +05:30
Sven Nierlein
739a7bbe7c
Merge pull request #1514 from Rasp8e/master
Proxy authorization is now kept when using PROXY + CONNECT to HTTPS
2020-09-23 17:19:23 +02:00
Sven Nierlein
cadac85e12
Merge pull request #1634 from ghciv6/check_dns_detect_unreach_svc
detect unreachable dns service in nslookup output
2020-05-20 23:30:14 +02:00
ghciv6
905b09c38b detect unreachable dns service in nslookup output (from bind-utils-9.8.2)
prevent core if error_scan detects an error in a line without ':'
2020-05-20 23:02:42 +02:00
Sven Nierlein
00948e95f4
Merge pull request #1535 from monitoring-plugins/feature_check_curl
Feature check curl
2020-05-19 09:53:30 +02:00
Sven Nierlein
772fb233b9 check_curl: host_name may be null
for example when using like: ./check_curl localhost
2020-05-18 14:08:45 +02:00
Sven Nierlein
7d2582deb3 update test parameter according to check_http 2020-05-18 14:08:27 +02:00
Sven Nierlein
84fd9ae893 check_curl: use CURLOPT_RESOLVE to fix connecting to the right ip
when using ssl, the composed url contains the hostname instead of the specified
ip. So use CURLOPT_RESOLVE to make curl still connect to the ip.
2020-05-18 13:43:17 +02:00
Sven Nierlein
8a64e47083 check_curl: clean trailing whitespace 2020-05-18 11:30:34 +02:00
Sven Nierlein
d54f14a092 merge test changes from check_http
the example certificate has changed since.
2020-05-15 14:24:18 +02:00
Sven Nierlein
072e97d5de tests: update expired test certificate
the certificate used to test expired http checks is to old to be used
with recent ssl libraries and results in:

> SSL routines:SSL_CTX_use_certificate:ee key too small

unfortunatly the error is only visible when setting $IO::Socket::SSL::DEBUG in
the check_http.t file.
2020-05-15 14:24:18 +02:00
Sven Nierlein
b123585354 tests: update expired test certificate
the certificate used to test expired http checks is to old to be used
with recent ssl libraries and results in:

> SSL routines:SSL_CTX_use_certificate:ee key too small

unfortunatly the error is only visible when setting $IO::Socket::SSL::DEBUG in
the check_http.t file.
2020-05-15 14:22:51 +02:00
Sven Nierlein
53e6f2970d Merge branch 'upstream' into check_curl 2020-05-15 11:46:54 +02:00
ghciv6
4264e7a6ed - workaround for issue #1550
- better use "ping -4" instead of "ping" if supported
2020-04-14 12:37:00 +02:00
DaTa
d008be6825 Revert "simplify documentation"
This reverts commit 7693af1479.

Now it is wrong:

After reading

    https://www.naemon.org/documentation/usersguide/pluginapi.html#plugin_output_spec

the old wording makes more sense.
2020-01-30 11:00:16 +01:00
Vadim Zhukov
60ec4d2901 Use size_t instead of int when calling sysctl(3).
Otherwise, it writes sizeof(size_t) bytes to &oldlen, smashing the stack.
2020-01-21 20:40:30 +01:00
Andreas Baumann
adb9588494 Merge branch 'master' into feature_check_curl 2020-01-09 14:54:12 +01:00
Alexander A. Klimov
f53ea7afd8 check_tcp: add --sni 2020-01-07 21:32:15 +01:00
Christian Tacke
9da7cd7681 Fix timeout_interval declarations
There are different declarations for timeout_interval:

lib/utils_base.c has the definition:
	unsigned int timeout_interval = DEFAULT_SOCKET_TIMEOUT;
lib/utils_base.h has the appropiate declaration:
	extern unsigned int timeout_interval;

plugins/popen.h has an extra declaration:
	extern unsigned int timeout_interval;
This doesn't hurt, but it's a dupe. The one in utils_base.h
should be enough, so remove this one.

plugins/popen.c has a WRONG one:
	extern int timeout_interval;
Remove it!
Use #include "utils.h" to get the right one.
This makes the local defines for max/min unnecassary, so
remove them also.
2020-01-07 10:22:39 +01:00
Andreas Baumann
5e0c236d6a increased copyright 2019-12-29 10:23:02 +00:00
Andreas Baumann
491e2c0f91 Merge branch 'master' into feature_check_curl 2019-12-04 19:56:38 +01:00
datamuc
7693af1479 simplify documentation
"first" + "second to last" is every line right?
2019-11-28 09:05:38 +01:00
Andreas Baumann
1b689dab5e check_curl: NSS, parse more date formats from certificate (in -C cert check) 2019-11-07 15:31:52 +00:00
Andreas Baumann
f7efee5f9c check_curl: more tolerant CN= parsing when checking certificates (hit on Centos 8) 2019-11-07 08:20:17 +00:00
Andreas Baumann
ede43c848d setting no_body to TRUE when we have a HEAD request 2019-10-11 17:22:34 +02:00
Andreas Baumann
04c58e0210 some LIBCURL_VERSION checks around HTTP/2 feature 2019-09-07 16:06:17 +02:00
Andreas Baumann
f546041722 added --http-version option to check_curl to choose HTTP version 2019-09-07 15:58:09 +02:00
Andreas Baumann
95ee6ace09 improved curlhelp_parse_statusline to handle both HTTP/1.x and HTTP/2 2019-09-07 15:31:15 +02:00