Skip to content

Caps #1814

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yubiuser wants to merge 4 commits into
base: development
Choose a base branch
from
+15 −12
Open

Caps #1814

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c022297
Inform about missing NET_ADMIN even if CAP_NET_ADMIN is the only req…
yubiuser Apr 20, 2025
46948eb
Don't exit if no caps are available
yubiuser Apr 20, 2025
bff5de6
Split check for return code and user
yubiuser Apr 20, 2025
6c3c0a1
Apply reviewer's suggestions
yubiuser Apr 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 15 additions & 12 deletions src/bash_functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,13 @@ fix_capabilities() {
capsh --has-p=cap_sys_nice 2>/dev/null && CAP_STR+=',CAP_SYS_NICE'
capsh --has-p=cap_sys_time 2>/dev/null && CAP_STR+=',CAP_SYS_TIME'

if [[ $DHCP_READY == false ]] && [[ $FTLCONF_dhcp_active == true ]]; then
# DHCP is requested but NET_ADMIN is not available.
echo "ERROR: DHCP requested but NET_ADMIN is not available. DHCP will not be started."
echo " Please add cap_net_admin to the container's capabilities or disable DHCP."
setFTLConfigValue dhcp.active false
fi

if [[ ${CAP_STR} ]]; then
# We have the (some of) the above caps available to us - apply them to pihole-FTL
echo " [i] Applying the following caps to pihole-FTL:"
Expand All @@ -244,22 +251,18 @@ fix_capabilities() {

setcap "${CAP_STR:1}"+ep "$(which pihole-FTL)" || ret=$?

if [[ $DHCP_READY == false ]] && [[ $FTLCONF_dhcp_active == true ]]; then
# DHCP is requested but NET_ADMIN is not available.
echo "ERROR: DHCP requested but NET_ADMIN is not available. DHCP will not be started."
echo " Please add cap_net_admin to the container's capabilities or disable DHCP."
setFTLConfigValue dhcp.active false
fi

if [[ $ret -ne 0 && "${DNSMASQ_USER:-pihole}" != "root" ]]; then
echo " [!] ERROR: Unable to set capabilities for pihole-FTL. Cannot run as non-root."
echo " If you are seeing this error, please set the environment variable 'DNSMASQ_USER' to the value 'root'"
if [[ $ret -ne 0 ]]; then
echo " [!] ERROR: Unable to set capabilities for pihole-FTL. "
if [[ "${DNSMASQ_USER:-pihole}" != "root" ]]; then
echo " Cannot run as non-root."
echo " If you are seeing this error, please set the environment variable 'DNSMASQ_USER' to the value 'root'"
fi
exit 1
fi
else
echo " [!] ERROR: Unable to set capabilities for pihole-FTL."
echo " [!] WARNING: No capabilities for pihole-FTL available."
echo " Pi-hole functions may not work as expected."
echo " Please ensure that the container has the required capabilities."
exit 1
fi
echo ""
}