mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 21:18:08 +00:00
454207209a
- Extracted hardware detection logic from firmware.sh into new modules/hw_detect.sh. Declares shared arrays (PCI_NET_DEVS, USB_WIFI_DEVS, etc) and _detect_all_network_devices() function. The main script now sources hw_detect.sh immediately after utils.sh. firmware.sh retains only _DETECTED_FW_PKGS and _FW_PLAN_PKG_LINES plus installation logic — the detection loop is fully removed, eliminating the circular dependency with bluetooth.sh. - Fixed interrupt safety in main script: removed pkill -f "apt.*install" and pkill -f "dpkg.*configure" from _on_interrupt(); updated exit message to "Temp files cleaned." Only the signal handler (trap _on_interrupt INT TERM) remains. - Added strict URL validation to modules/gaming/heroic.sh and modules/gaming/tools.sh using regex ^https://[A-Za-z0-9./_-]+\.deb$ before passing $deb_url to _run_cmd. Blocks command substitution, non-https URLs, and path traversal attempts that could bypass shell quoting. - Implemented real Bullseye Archive rewrite in modules/bullseye/legacy.sh: adds idempotency check (grep -q archive.debian.org && return 0), creates timestamped backup of /etc/apt/sources.list with sudo cp, writes exact archive Debian sources via sudo tee heredoc, and runs sudo apt-get update || true on failure. - Added local scope to modules/bluetooth.sh variable service_enable_only=false before the conditional assignment, preventing state bleed from the previous global-only declaration. - Applied safe array pattern (while IFS= read -r _pkg; do ...) across 32+ files in modules/extras/* and modules/bullseye/legacy.sh, replacing all vulnerable for pkg in $cleaned / for pkg in $install_list loops. Eliminates word-splitting and command-injection risks.
172 lines
6.0 KiB
Bash
172 lines
6.0 KiB
Bash
#!/usr/bin/env bash
|
|
# sudo_config.sh — User Privileges & Feedback submenu
|
|
# License GPL v3
|
|
|
|
# Resolve the invoking user once. USER may be unset in minimal
|
|
# environments (SSH sessions, cron), which would abort under set -u.
|
|
TARGET_USER="${SUDO_USER:-${USER:-$(id -un)}}"
|
|
|
|
config_sudo() {
|
|
echo -e "${YELLOW}User Privileges & Feedback${NC}"
|
|
|
|
while true; do
|
|
local choice
|
|
choice=$(_menu "User Privileges & Feedback" \
|
|
"Select an option:" $TUI_ALTO $TUI_ANCHO 6 \
|
|
"1" "Sudo Group Membership" \
|
|
"2" "Passwordless Sudo (maintenance commands)" \
|
|
"3" "Repair Home Directory Ownership" \
|
|
"4" "Sudo Password Feedback (asterisks)" \
|
|
"5" "Back to main menu")
|
|
|
|
[ -z "$choice" ] && return
|
|
clear
|
|
|
|
case "$choice" in
|
|
1) _check_sudo_group ;;
|
|
2) _configure_nopasswd ;;
|
|
3) _repair_home_ownership ;;
|
|
4) _toggle_pwfeedback ;;
|
|
5) return ;;
|
|
esac
|
|
done
|
|
}
|
|
|
|
# ── Option 1: Sudo Group Membership ──
|
|
_check_sudo_group() {
|
|
if groups "$TARGET_USER" | grep -qE '\bsudo\b'; then
|
|
_msg "Sudo Group" "User '$TARGET_USER' is already in the sudo group."
|
|
else
|
|
if _confirm "Sudo Group" \
|
|
"User '$TARGET_USER' is NOT in the sudo group.\n\nAdd to sudo group?"; then
|
|
if sudo usermod -aG sudo "$TARGET_USER"; then
|
|
_msg "Sudo Group" \
|
|
"User added to sudo group.\n\nLog out and back in for\ngroup changes to take effect." 10 60
|
|
else
|
|
_msg "Sudo Group" "Failed to add user to sudo group." 7 60
|
|
return 1
|
|
fi
|
|
fi
|
|
fi
|
|
}
|
|
|
|
# ── Option 2: Passwordless Sudo (NOPASSWD) ──
|
|
_configure_nopasswd() {
|
|
# sudo silently ignores /etc/sudoers.d/ files whose name contains
|
|
# '.' or '~' (package manager / editor backup guards).
|
|
local safe_user="${TARGET_USER//./_}"
|
|
local nopasswd_file="/etc/sudoers.d/${safe_user}-nopasswd"
|
|
|
|
if [ -f "$nopasswd_file" ]; then
|
|
if _confirm "NOPASSWD" \
|
|
"Passwordless sudo is already configured.\n\nRemove it to restore password prompts?"; then
|
|
sudo rm -f "$nopasswd_file"
|
|
echo -e "${GREEN}Passwordless sudo removed.${NC}"
|
|
fi
|
|
return
|
|
fi
|
|
|
|
if _confirm "NOPASSWD" \
|
|
"Configure passwordless sudo for maintenance commands?\n\n\
|
|
- apt / apt-get (package management)\n\
|
|
- systemctl (service management)\n\
|
|
- shutdown / reboot / halt (power commands)\n\n\
|
|
Useful for automation but reduces security." 14 70; then
|
|
local choices
|
|
choices=$(_checklist "NOPASSWD Commands" \
|
|
"Select commands to allow without password:" 12 60 3 \
|
|
"apt" "APT package management" ON \
|
|
"systemctl" "Systemd service management" ON \
|
|
"power" "Shutdown, reboot, halt" ON)
|
|
clear
|
|
|
|
[ -z "$choices" ] && {
|
|
echo "No commands selected."
|
|
return
|
|
}
|
|
local cleaned
|
|
cleaned=$(echo "$choices" | tr -d '"')
|
|
|
|
local content=""
|
|
# BH-004: Convert to array to avoid word splitting and injection.
|
|
local -a _pkgs=()
|
|
while IFS= read -r _pkg; do
|
|
[ -n "$_pkg" ] && _pkgs+=("$_pkg")
|
|
done < <(echo "$cleaned" | tr ' ' '\n')
|
|
for cmd in "${_pkgs[@]}"; do
|
|
case $cmd in
|
|
apt)
|
|
content+="${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/apt, /usr/bin/apt-get, /bin/apt, /bin/apt-get\n"
|
|
;;
|
|
systemctl)
|
|
content+="${TARGET_USER} ALL=(root) NOPASSWD: /usr/bin/systemctl, /bin/systemctl\n"
|
|
;;
|
|
power)
|
|
content+="${TARGET_USER} ALL=(root) NOPASSWD: /usr/sbin/shutdown, /sbin/shutdown, /usr/sbin/reboot, /sbin/reboot, /usr/sbin/halt, /sbin/halt\n"
|
|
;;
|
|
esac
|
|
done
|
|
|
|
local content_str
|
|
content_str=$(echo -e "$content")
|
|
if _validate_sudoers "$content_str" "$nopasswd_file"; then
|
|
echo -e "${GREEN}Passwordless sudo configured for selected commands.${NC}"
|
|
else
|
|
return 1
|
|
fi
|
|
fi
|
|
}
|
|
|
|
# ── Option 3: Repair Home Directory Ownership ──
|
|
_repair_home_ownership() {
|
|
local home
|
|
home=$(getent passwd "$TARGET_USER" | cut -d: -f6)
|
|
|
|
if [ ! -d "$home" ]; then
|
|
_msg "Home Directory" "Home directory '$home' does not exist." 8 60
|
|
return 1
|
|
fi
|
|
|
|
local uid uid_owner
|
|
uid=$(id -u "$TARGET_USER" 2>/dev/null)
|
|
uid_owner=$(stat -c '%u' "$home" 2>/dev/null || echo "0")
|
|
|
|
if [ "$uid_owner" != "$uid" ]; then
|
|
local expected_user
|
|
expected_user=$(id -nu "$uid_owner" 2>/dev/null || echo "UID $uid_owner")
|
|
if _confirm "Home Permissions" \
|
|
"Home directory '$home' is owned by\n'$expected_user' (expected: '$TARGET_USER').\n\nRepair ownership?" 12 65; then
|
|
if sudo chown -R "$TARGET_USER:$TARGET_USER" "$home"; then
|
|
echo -e "${GREEN}Home directory ownership repaired.${NC}"
|
|
else
|
|
echo -e "${RED}Failed to repair home directory ownership.${NC}"
|
|
return 1
|
|
fi
|
|
fi
|
|
else
|
|
_msg "Home Permissions" "Home directory ownership is correct\n(owner: $TARGET_USER)." 8 60
|
|
fi
|
|
}
|
|
|
|
# ── Option 4: Sudo Password Feedback (pwfeedback) ──
|
|
_toggle_pwfeedback() {
|
|
local fb_file="/etc/sudoers.d/pwfeedback"
|
|
|
|
if [ -f "$fb_file" ]; then
|
|
if _confirm "Password Feedback" \
|
|
"Asterisks are currently ENABLED when typing sudo password.\n\nDisable them?"; then
|
|
sudo rm -f "$fb_file"
|
|
echo -e "${GREEN}Password feedback disabled.${NC}"
|
|
fi
|
|
else
|
|
if _confirm "Password Feedback" \
|
|
"Show asterisks when typing the sudo password?"; then
|
|
if _validate_sudoers 'Defaults pwfeedback' "$fb_file"; then
|
|
echo -e "${GREEN}Password feedback enabled.${NC}"
|
|
else
|
|
return 1
|
|
fi
|
|
fi
|
|
fi
|
|
}
|