@cryptotaxi247 / netdata-1 / commits / 1b3eb5b42

packaging: add cap_dac_read_search to go.d.plugin (#16754)

Ilya Mashchenko committed Jan 11, 2024 at 17:31 UTC 1b3eb5b42fc8b5d04056c49f8b6d94668d913492
4 files changed +4 -4
contrib/debian/netdata-plugin-go.postinst
+1 -1
@@ -6,7 +6,7 @@ case "$1" in
6 configure|reconfigure)
7 chown root:netdata /usr/libexec/netdata/plugins.d/go.d.plugin
8 chmod 0750 /usr/libexec/netdata/plugins.d/go.d.plugin
9 - if ! setcap "cap_net_admin=eip cap_net_raw=eip" /usr/libexec/netdata/plugins.d/go.d.plugin; then
9 + if ! setcap "cap_dac_read_search+epi cap_net_admin=eip cap_net_raw=eip" /usr/libexec/netdata/plugins.d/go.d.plugin; then
10 chmod -f 4750 /usr/libexec/netdata/plugins.d/go.d.plugin
11 fi
12 ;;
netdata-installer.sh
+1 -1
@@ -1620,7 +1620,7 @@ install_go
1620
1621 if [ -f "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin" ]; then
1622 if command -v setcap 1>/dev/null 2>&1; then
1623 - run setcap "cap_net_admin+epi cap_net_raw=eip" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
1623 + run setcap "cap_dac_read_search+epi cap_net_admin+epi cap_net_raw=eip" "${NETDATA_PREFIX}/usr/libexec/netdata/plugins.d/go.d.plugin"
1624 fi
1625 fi
1626
netdata.spec.in
+1 -1
@@ -993,7 +993,7 @@ fi
993 %defattr(0750,root,netdata,0750)
994 # CAP_NET_ADMIN needed for WireGuard collector
995 # CAP_NET_RAW needed for ping collector
996 -%caps(cap_net_admin,cap_net_raw=eip) %{_libexecdir}/%{name}/plugins.d/%{go_name}
996 +%caps(cap_dac_read_search,cap_net_admin,cap_net_raw=eip) %{_libexecdir}/%{name}/plugins.d/%{go_name}
997 %defattr(0644,root,netdata,0755)
998 %{_libdir}/%{name}/conf.d/go.d.conf
999 %{_libdir}/%{name}/conf.d/go.d
packaging/makeself/install-or-update.sh
+1 -1
@@ -190,7 +190,7 @@ if command -v setcap >/dev/null 2>&1; then
190 run setcap "cap_sys_admin=ep" "usr/libexec/netdata/plugins.d/perf.plugin"
191 fi
192
193 - run setcap "cap_net_admin,cap_net_raw=eip" "usr/libexec/netdata/plugins.d/go.d.plugin"
193 + run setcap "cap_dac_read_search+epi cap_net_admin+epi cap_net_raw=eip" "usr/libexec/netdata/plugins.d/go.d.plugin"
194 else
195 for x in ndsudo apps.plugin perf.plugin slabinfo.plugin debugfs.plugin; do
196 f="usr/libexec/netdata/plugins.d/${x}"