mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 21:18:08 +00:00
stornic56
9828ea439c
- 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.
99 lines
4.5 KiB
Bash
99 lines
4.5 KiB
Bash
#!/usr/bin/env bash
|
|
# dev.sh — Development & Servers (extrepo, zenmap, fail2ban, ufw moved out)
|
|
|
|
_cat_dev() {
|
|
local headless=false
|
|
_is_headless && headless=true
|
|
local -a items=()
|
|
local apache_state; apache_state=$(_state "apache2")
|
|
local build_state; build_state=$(_state "build-essential")
|
|
local certbot_state; certbot_state=$(_state "certbot")
|
|
local docker_state; docker_state=$(_state "docker.io")
|
|
local mariadb_state; mariadb_state=$(_state "mariadb-server")
|
|
local netcat_state; netcat_state=$(_state "netcat-openbsd")
|
|
local nginx_state; nginx_state=$(_state "nginx")
|
|
local ssh_state; ssh_state=$(_state "openssh-server")
|
|
local openssl_state; openssl_state=$(_state "openssl")
|
|
local pg_state; pg_state=$(_state "postgresql")
|
|
local pip_state; pip_state=$(_state "python3-pip")
|
|
local redis_state; redis_state=$(_state "redis-server")
|
|
local sqlite_state; sqlite_state=$(_state "sqlite3")
|
|
local jdk_desc; jdk_desc=$(_any_jdk_installed_desc)
|
|
local jdk_state; jdk_state=$(_any_jdk_state)
|
|
items+=(
|
|
"apache2" "Apache web server" "$apache_state"
|
|
"build-essential" "C/C++ build tools (gcc, make)" "$build_state"
|
|
"certbot" "Let's Encrypt TLS certificates" "$certbot_state"
|
|
"docker" "Docker + docker-compose" "$docker_state"
|
|
"mariadb-server" "MariaDB database server" "$mariadb_state"
|
|
"netcat-openbsd" "TCP/IP networking utility" "$netcat_state"
|
|
"nginx" "Nginx web server" "$nginx_state"
|
|
"openssh-server" "SSH server" "$ssh_state"
|
|
"openssl" "OpenSSL cryptography toolkit" "$openssl_state"
|
|
"postgresql" "PostgreSQL database server" "$pg_state"
|
|
"python3-pip" "Python 3 pip + venv + dev" "$pip_state"
|
|
"redis-server" "Redis key-value store" "$redis_state"
|
|
"sqlite3" "SQLite database engine" "$sqlite_state"
|
|
"jellyfin" "Jellyfin Media Server (Web GUI on port 8096)" OFF
|
|
"openjdk-dev-env" "Adoptium Temurin JDK (17, 21, 25 LTS)${jdk_desc}" "${jdk_state}"
|
|
)
|
|
|
|
local item_count=${#items[@]}
|
|
local lista_alto=$((item_count > TUI_ALTO_LISTA ? TUI_ALTO_LISTA : item_count))
|
|
local choices
|
|
choices=$(_checklist "Development & Servers" "Check [*] the packages you want installed/updated on your system.\n" $TUI_ALTO $TUI_ANCHO $lista_alto \
|
|
"${items[@]}" \
|
|
)
|
|
clear
|
|
|
|
[ -z "$choices" ] && return
|
|
|
|
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
|
|
|
# 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 pkg in "${_pkgs[@]}"; do
|
|
case $pkg in
|
|
python3-pip)
|
|
local need=()
|
|
! is_installed "python3-pip" && need+=("python3-pip")
|
|
! is_installed "python3-venv" && need+=("python3-venv")
|
|
! is_installed "python3-dev" && need+=("python3-dev")
|
|
if [ ${#need[@]} -gt 0 ]; then
|
|
_run_install_batch "${need[@]}"
|
|
else
|
|
echo "Python 3 tools already installed."
|
|
fi
|
|
;;
|
|
docker)
|
|
local need=()
|
|
! is_installed "docker.io" && need+=("docker.io")
|
|
! is_installed "docker-compose" && need+=("docker-compose")
|
|
if [ ${#need[@]} -gt 0 ]; then
|
|
_run_install_batch "${need[@]}"
|
|
else
|
|
echo "Docker already installed."
|
|
fi
|
|
;;
|
|
jellyfin)
|
|
install_jellyfin
|
|
;;
|
|
openjdk-dev-env)
|
|
_install_dev_java
|
|
;;
|
|
*)
|
|
if ! is_installed "$pkg"; then
|
|
_run_install "$pkg"
|
|
else
|
|
echo "$pkg already installed."
|
|
fi
|
|
;;
|
|
esac
|
|
done
|
|
|
|
echo -e "${GREEN}Development tools and servers installed.${NC}"
|
|
}
|