diff options
| author | Alvar <post@0x21.biz> | 2026-02-06 11:58:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-06 12:58:38 +0100 |
| commit | cef40299a93233f043f5b0821a9ad2c69dd612f7 (patch) | |
| tree | b95f8b83f49cf3fc811c19d5bf9e02f2f4e232c2 /plugins-root | |
| parent | fe4c82ea6fe37ef24d1726ebe83fac3e2bd581fe (diff) | |
| download | monitoring-plugins-cef40299a93233f043f5b0821a9ad2c69dd612f7.tar.gz | |
OpenBSD: pledge(2) some network-facing checks (#2225)
OpenBSD's pledge(2) system call allows the current process to
self-restrict itself, being reduced to promised pledges. For example,
unless a process says it wants to write to files, it is not allowed to
do so any longer.
This change starts by calling pledge(2) in some network-facing checks,
removing the more dangerous privileges, such as executing other files.
My initial motivation came from check_icmp, being installed as a setuid
binary and (temporarily) running with root privileges. There, the
pledge(2) calls result in check_icmp to only being allowed to interact
with the network and to setuid(2) to the calling user later on.
Afterwards, I went through my most commonly used monitoring plugins
directly interacting with the network. Thus, I continued with
pledge(2)-ing check_curl - having a huge codebase and all -,
check_ntp_time, check_smtp, check_ssh, and check_tcp.
For most of those, the changes were quite similar: start with
network-friendly promises, parse the configuration, give up file access,
and proceed with the actual check.
Diffstat (limited to 'plugins-root')
| -rw-r--r-- | plugins-root/check_icmp.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/plugins-root/check_icmp.c b/plugins-root/check_icmp.c index e536e31c..1390a03e 100644 --- a/plugins-root/check_icmp.c +++ b/plugins-root/check_icmp.c | |||
| @@ -812,6 +812,15 @@ void parse_address(const struct sockaddr_storage *addr, char *dst, socklen_t siz | |||
| 812 | } | 812 | } |
| 813 | 813 | ||
| 814 | int main(int argc, char **argv) { | 814 | int main(int argc, char **argv) { |
| 815 | #ifdef __OpenBSD__ | ||
| 816 | /* - rpath is required to read --extra-opts (given up later) | ||
| 817 | * - inet is required for sockets | ||
| 818 | * - dns is required for name lookups (given up later) | ||
| 819 | * - id is required for temporary privilege drops in configparsing and for | ||
| 820 | * permanent privilege dropping after opening the socket (given up later) */ | ||
| 821 | pledge("stdio rpath inet dns id", NULL); | ||
| 822 | #endif // __OpenBSD__ | ||
| 823 | |||
| 815 | setlocale(LC_ALL, ""); | 824 | setlocale(LC_ALL, ""); |
| 816 | bindtextdomain(PACKAGE, LOCALEDIR); | 825 | bindtextdomain(PACKAGE, LOCALEDIR); |
| 817 | textdomain(PACKAGE); | 826 | textdomain(PACKAGE); |
| @@ -836,6 +845,10 @@ int main(int argc, char **argv) { | |||
| 836 | crash("failed to parse config"); | 845 | crash("failed to parse config"); |
| 837 | } | 846 | } |
| 838 | 847 | ||
| 848 | #ifdef __OpenBSD__ | ||
| 849 | pledge("stdio inet dns id", NULL); | ||
| 850 | #endif // __OpenBSD__ | ||
| 851 | |||
| 839 | const check_icmp_config config = tmp_config.config; | 852 | const check_icmp_config config = tmp_config.config; |
| 840 | 853 | ||
| 841 | if (config.output_format_is_set) { | 854 | if (config.output_format_is_set) { |
| @@ -898,6 +911,10 @@ int main(int argc, char **argv) { | |||
| 898 | return 1; | 911 | return 1; |
| 899 | } | 912 | } |
| 900 | 913 | ||
| 914 | #ifdef __OpenBSD__ | ||
| 915 | pledge("stdio inet", NULL); | ||
| 916 | #endif // __OpenBSD__ | ||
| 917 | |||
| 901 | if (sockset.socket4) { | 918 | if (sockset.socket4) { |
| 902 | int result = setsockopt(sockset.socket4, SOL_IP, IP_TTL, &config.ttl, sizeof(config.ttl)); | 919 | int result = setsockopt(sockset.socket4, SOL_IP, IP_TTL, &config.ttl, sizeof(config.ttl)); |
| 903 | if (debug) { | 920 | if (debug) { |
