mirror of
https://github.com/stornic56/debianito-post-install.git
synced 2026-10-31 13:08:06 +00:00
stornic56
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.
75 lines
2.6 KiB
Bash
75 lines
2.6 KiB
Bash
#!/usr/bin/env bash
|
|
# hw_detect.sh — Shared hardware device detection (PCI + USB)
|
|
# License GPL v3
|
|
|
|
# ── Global arrays (populated by _detect_all_network_devices) ──
|
|
PCI_NET_DEVS=()
|
|
USB_WIFI_DEVS=()
|
|
PCI_BT_DEVS=()
|
|
USB_BT_DEVS=()
|
|
_FW_PLAN_HW_LINES=()
|
|
|
|
# ── Network device detection (PCI + USB) ──
|
|
_detect_all_network_devices() {
|
|
! is_installed pciutils && _install_pkg pciutils
|
|
! is_installed usbutils && _install_pkg usbutils
|
|
|
|
PCI_NET_DEVS=()
|
|
while IFS= read -r line; do
|
|
PCI_NET_DEVS+=("$line")
|
|
done < <(echo "$LSPCI_OUTPUT" | grep -iE 'network controller|ethernet controller' || true)
|
|
|
|
USB_WIFI_DEVS=()
|
|
while IFS= read -r line; do
|
|
# Exclude Bluetooth dongles: many report e.g. "Bluetooth wireless
|
|
# interface" and would otherwise be classified as WiFi and mapped
|
|
# to firmware-iwlwifi.
|
|
if echo "$line" | grep -qiE 'wireless|wifi|802\.11|wlan' &&
|
|
! echo "$line" | grep -qi 'bluetooth'; then
|
|
USB_WIFI_DEVS+=("$line")
|
|
fi
|
|
done < <(lsusb 2>/dev/null || true)
|
|
|
|
PCI_BT_DEVS=()
|
|
while IFS= read -r line; do
|
|
PCI_BT_DEVS+=("$line")
|
|
done < <(echo "$LSPCI_OUTPUT" | grep -i 'Bluetooth controller' || true)
|
|
|
|
USB_BT_DEVS=()
|
|
while IFS= read -r line; do
|
|
# All Bluetooth dongles belong here (the WiFi filter above now
|
|
# excludes anything containing "bluetooth").
|
|
if echo "$line" | grep -qi 'bluetooth'; then
|
|
USB_BT_DEVS+=("$line")
|
|
fi
|
|
done < <(lsusb 2>/dev/null || true)
|
|
|
|
_FW_PLAN_HW_LINES=()
|
|
for dev in "${PCI_NET_DEVS[@]}"; do
|
|
local desc dev_type
|
|
desc=$(echo "$dev" | sed -E 's/^[^ ]+ [^:]+: //; s/ \[[0-9a-fA-F]{4}:[0-9a-fA-F]{4}\]//; s/ \(rev.*\)//')
|
|
if echo "$dev" | grep -qiE 'network controller|wireless|wi-fi|wlan|802\.11'; then
|
|
dev_type="WiFi PCI"
|
|
else
|
|
dev_type="Ethernet PCI"
|
|
fi
|
|
_FW_PLAN_HW_LINES+=(" \xe2\x97\x8f ${desc} (${dev_type})")
|
|
done
|
|
for dev in "${USB_WIFI_DEVS[@]}"; do
|
|
local desc
|
|
desc=$(echo "$dev" | sed 's/^.*ID //')
|
|
_FW_PLAN_HW_LINES+=(" \xe2\x97\x8f ${desc} (USB)")
|
|
done
|
|
|
|
for dev in "${PCI_BT_DEVS[@]}"; do
|
|
local desc
|
|
desc=$(echo "$dev" | sed -E 's/^[^ ]+ [^:]+: //; s/ \[[0-9a-fA-F]{4}:[0-9a-fA-F]{4}\]//; s/ \(rev.*\)//')
|
|
_FW_PLAN_HW_LINES+=(" \xe2\x97\x8f ${desc} (Bluetooth PCI)")
|
|
done
|
|
for dev in "${USB_BT_DEVS[@]}"; do
|
|
local desc
|
|
desc=$(echo "$dev" | sed 's/^.*ID //')
|
|
_FW_PLAN_HW_LINES+=(" \xe2\x97\x8f ${desc} (Bluetooth USB)")
|
|
done
|
|
}
|