mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 21:18:08 +00:00
Security Patches & Architecture Refactoring
- 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.
This commit is contained in:
stornic56
@@ -72,7 +72,12 @@ _cat_communication() {
|
||||
|
||||
local cleaned
|
||||
cleaned=$(echo "$choices" | tr -d '"')
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
signal-desktop) _install_signal ;;
|
||||
telegram-desktop) _install_telegram ;;
|
||||
|
||||
@@ -45,7 +45,12 @@ _cat_design() {
|
||||
|
||||
[ -z "$choices" ] && return
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
if ! is_installed "$pkg"; then
|
||||
_run_install "$pkg"
|
||||
else
|
||||
|
||||
@@ -50,7 +50,12 @@ _cat_dev() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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=()
|
||||
|
||||
@@ -62,7 +62,12 @@ _cat_download() {
|
||||
|
||||
[ -z "$cleaned" ] && { echo "No download tools selected."; return; }
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
yt-dlp)
|
||||
install_backports_or_stable yt-dlp
|
||||
|
||||
@@ -47,7 +47,12 @@ _cat_fetch() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
neofetch|fastfetch)
|
||||
if ! is_installed "$pkg"; then
|
||||
|
||||
@@ -207,7 +207,12 @@ _cat_internet() {
|
||||
local has_firefox=false
|
||||
local has_firefox_esr=false
|
||||
local fchoice=""
|
||||
for _p in $cleaned; do
|
||||
# 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 _p in "${_pkgs[@]}"; do
|
||||
[ "$_p" = "firefox" ] && has_firefox=true
|
||||
[ "$_p" = "firefox-esr" ] && has_firefox_esr=true
|
||||
done
|
||||
@@ -219,12 +224,17 @@ _cat_internet() {
|
||||
"both" "Keep both variants")
|
||||
[ -z "$fchoice" ] && return
|
||||
case "$fchoice" in
|
||||
mozilla) cleaned=$(printf '%s\n' $cleaned | grep -vx "firefox-esr" | tr '\n' ' ') ;;
|
||||
esr) cleaned=$(printf '%s\n' $cleaned | grep -vx "firefox" | tr '\n' ' ') ;;
|
||||
mozilla) cleaned=$(printf '%s\n' "${_pkgs[@]}" | grep -vx "firefox-esr" | tr '\n' ' ') ;;
|
||||
esr) cleaned=$(printf '%s\n' "${_pkgs[@]}" | grep -vx "firefox" | tr '\n' ' ') ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
firefox)
|
||||
install_firefox_mozilla "$fchoice"
|
||||
|
||||
@@ -28,7 +28,12 @@ install_minecraft_java() {
|
||||
_enable_temurin_repo
|
||||
local cleaned
|
||||
cleaned=$(echo "$choices" | tr -d '"')
|
||||
for ver in $cleaned; do
|
||||
# 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 ver in "${_pkgs[@]}"; do
|
||||
_run_cmd "Java" "sudo apt install -y temurin-${ver}-jre" \
|
||||
"Installing Temurin JRE ${ver}..."
|
||||
done
|
||||
|
||||
@@ -106,7 +106,12 @@ _cat_office() {
|
||||
local cleaned
|
||||
cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
onlyoffice) install_onlyoffice ;;
|
||||
libreoffice) install_libreoffice_bpo ;;
|
||||
|
||||
@@ -26,7 +26,12 @@ _cat_players() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
if ! is_installed "$pkg"; then
|
||||
_run_install "$pkg"
|
||||
else
|
||||
|
||||
@@ -64,7 +64,12 @@ _cat_programming() {
|
||||
local cleaned
|
||||
cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
vscodium)
|
||||
install_vscodium
|
||||
|
||||
@@ -36,7 +36,12 @@ _cat_security() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
zenmap)
|
||||
install_backports_or_stable zenmap
|
||||
|
||||
@@ -34,7 +34,12 @@ _cat_software_centers() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
gnome-software)
|
||||
if [ "$de_type" = "qt" ]; then
|
||||
|
||||
@@ -140,7 +140,12 @@ _cat_general() {
|
||||
local cleaned
|
||||
cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
compress)
|
||||
local need=()
|
||||
|
||||
@@ -33,7 +33,12 @@ _cat_terminals() {
|
||||
clear
|
||||
[ -z "$choices" ] && return
|
||||
|
||||
for pkg in $(echo "$choices" | tr -d '"'); do
|
||||
# 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 "$choices" | tr -d '"' | tr ' ' '\n')
|
||||
for pkg in "${_pkgs[@]}"; do
|
||||
if ! is_installed "$pkg"; then
|
||||
_run_install "$pkg"
|
||||
else
|
||||
|
||||
@@ -34,7 +34,12 @@ _cat_cursors() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
if ! is_installed "$pkg"; then
|
||||
_run_install "$pkg"
|
||||
else
|
||||
|
||||
@@ -36,7 +36,12 @@ _cat_themes() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
if ! is_installed "$pkg"; then
|
||||
_run_install "$pkg"
|
||||
else
|
||||
|
||||
@@ -38,7 +38,12 @@ _cat_fonts() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
if ! is_installed "$pkg"; then
|
||||
_run_install "$pkg"
|
||||
else
|
||||
|
||||
@@ -53,7 +53,12 @@ _cat_icons() {
|
||||
|
||||
local cleaned; cleaned=$(echo "$choices" | tr -d '"')
|
||||
|
||||
for pkg in $cleaned; do
|
||||
# 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
|
||||
if ! is_installed "$pkg"; then
|
||||
_run_install "$pkg"
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user