diff --git a/hosts/guard/README.md b/hosts/guard/README.md index 357dce2..15a6809 100644 --- a/hosts/guard/README.md +++ b/hosts/guard/README.md @@ -10,6 +10,7 @@ Components: - hosts-guard.path (triggers on PathChanged=/etc/hosts) - hosts-bind-mount.service (bind mounts /etc/hosts read-only after boot) 3. psychological/ directory – scripts that add delay + journaling before allowing a maintenance/unlock operation. +4. pacman hooks – automatically unlock/re-lock /etc/hosts around package transactions so pacman never fails due to the read-only bind mount. Install Flow (suggested): 1. After generating /etc/hosts via your existing hosts/install.sh, copy it to /usr/local/share/locked-hosts. @@ -19,6 +20,11 @@ Install Flow (suggested): systemctl enable --now hosts-guard.path systemctl enable --now hosts-bind-mount.service 4. (Optional) Use psychological/unlock-hosts.sh as the ONLY sanctioned way to modify hosts (it removes protections temporarily, launches an editor after a delay, and re-enforces on close). +5. Make pacman automatic (recommended): + ./install_pacman_hooks.sh + This installs hooks under /etc/pacman.d/hooks that: + - PreTransaction: temporarily disable guard and make /etc/hosts writable + - PostTransaction: re-run enforcement and re-enable guard (bind mount + path watcher) Limitations: - A root user can still disable units, remount, remove attributes. diff --git a/hosts/guard/enforce-hosts.sh b/hosts/guard/enforce-hosts.sh old mode 100644 new mode 100755 diff --git a/hosts/guard/install_pacman_hooks.sh b/hosts/guard/install_pacman_hooks.sh new file mode 100755 index 0000000..c4b63c5 --- /dev/null +++ b/hosts/guard/install_pacman_hooks.sh @@ -0,0 +1,49 @@ +#!/usr/bin/env bash +set -euo pipefail + +require_root() { if [[ $EUID -ne 0 ]]; then exec sudo -E bash "$0" "$@"; fi } +require_root "$@" + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +HOOKS_DIR="/etc/pacman.d/hooks" + +install -d -m 755 "$HOOKS_DIR" + +# Pre-transaction hook +cat >"$HOOKS_DIR/10-unlock-etc-hosts.hook" <<'HOOK' +[Trigger] +Operation = Upgrade +Operation = Install +Operation = Remove +Type = Package +Target = * + +[Action] +Description = Temporarily unlocking /etc/hosts for transaction +When = PreTransaction +Exec = /bin/bash /usr/local/share/hosts-guard/pacman-pre-unlock-hosts.sh +NeedsTargets +HOOK + +# Post-transaction hook +cat >"$HOOKS_DIR/90-relock-etc-hosts.hook" <<'HOOK' +[Trigger] +Operation = Upgrade +Operation = Install +Operation = Remove +Type = Package +Target = * + +[Action] +Description = Re-locking /etc/hosts after transaction +When = PostTransaction +Exec = /bin/bash /usr/local/share/hosts-guard/pacman-post-relock-hosts.sh +NeedsTargets +HOOK + +# Place helper scripts into a shared location +install -d -m 755 /usr/local/share/hosts-guard +install -m 755 "$SCRIPT_DIR/pacman-hooks/pacman-pre-unlock-hosts.sh" /usr/local/share/hosts-guard/ +install -m 755 "$SCRIPT_DIR/pacman-hooks/pacman-post-relock-hosts.sh" /usr/local/share/hosts-guard/ + +echo "Pacman hooks installed into $HOOKS_DIR." diff --git a/hosts/guard/pacman-hooks/pacman-post-relock-hosts.sh b/hosts/guard/pacman-hooks/pacman-post-relock-hosts.sh new file mode 100644 index 0000000..450f4e7 --- /dev/null +++ b/hosts/guard/pacman-hooks/pacman-post-relock-hosts.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +# Post-transaction hook to re-apply hosts guard protections (single-layer ro bind) + +TARGET=/etc/hosts +ENFORCE=/usr/local/sbin/enforce-hosts.sh +LOGTAG=hosts-guard-hook + +mount_layers_count() { awk '$5=="/etc/hosts"{c++} END{print c+0}' /proc/self/mountinfo 2>/dev/null || echo 0; } +collapse_mounts() { + local i=0 + if command -v mountpoint >/devnull 2>&1; then + while mountpoint -q "$TARGET"; do + umount -l "$TARGET" >/dev/null 2>&1 || break + i=$((i+1)) + (( i > 20 )) && break + done + else + local cnt + cnt=$(mount_layers_count) + while (( cnt > 1 )); do + umount -l "$TARGET" >/dev/null 2>&1 || break + i=$((i+1)) + (( i > 20 )) && break + cnt=$(mount_layers_count) + done + fi +} + +# Ensure we end with a single read-only bind mount layer +logger -t "$LOGTAG" "post: relocking /etc/hosts (starting)" +echo "$(date -Is) post-relock(start)" >> /run/hosts-guard-hook.log 2>/dev/null || true +collapse_mounts + +if [[ -x "$ENFORCE" ]]; then + "$ENFORCE" >/dev/null 2>&1 || true +fi + +# Apply exactly one ro bind layer +mount --bind "$TARGET" "$TARGET" >/dev/null 2>&1 || true +mount -o remount,ro,bind "$TARGET" >/dev/null 2>&1 || true + +# Start only the path watcher; avoid bind-mount service (we already bound once) +if command -v systemctl >/dev/null 2>&1; then + systemctl start hosts-guard.path >/dev/null 2>&1 || true +fi + +logger -t "$LOGTAG" "post: relocking /etc/hosts (done)" +echo "$(date -Is) post-relock(done)" >> /run/hosts-guard-hook.log 2>/dev/null || true + +exit 0 diff --git a/hosts/guard/pacman-hooks/pacman-pre-unlock-hosts.sh b/hosts/guard/pacman-hooks/pacman-pre-unlock-hosts.sh new file mode 100644 index 0000000..e44866a --- /dev/null +++ b/hosts/guard/pacman-hooks/pacman-pre-unlock-hosts.sh @@ -0,0 +1,66 @@ +#!/usr/bin/env bash +# Non-interactive pre-transaction hook to temporarily unlock /etc/hosts + +TARGET=/etc/hosts +LOGTAG=hosts-guard-hook + +stop_units_if_present() { + local units=(hosts-bind-mount.service hosts-guard.path) + for u in "${units[@]}"; do + if command -v systemctl >/dev/null 2>&1; then + if systemctl list-unit-files 2>/dev/null | grep -q "^$u"; then + systemctl stop "$u" >/dev/null 2>&1 || true + fi + fi + done +} + +is_ro_mount() { findmnt -no OPTIONS -T "$TARGET" 2>/dev/null | grep -qw ro; } +is_bind_mount() { findmnt -no OPTIONS -T "$TARGET" 2>/dev/null | grep -qw bind; } + +mount_layers_count() { awk '$5=="/etc/hosts"{c++} END{print c+0}' /proc/self/mountinfo 2>/dev/null || echo 0; } +cleanup_mount_stacks() { + local i=0 + # Unmount bind layers until /etc/hosts is no longer a mountpoint + if command -v mountpoint >/dev/null 2>&1; then + while mountpoint -q "$TARGET"; do + umount -l "$TARGET" >/dev/null 2>&1 || break + i=$((i+1)) + (( i > 20 )) && break + done + else + # Fallback to best-effort using mountinfo count + local cnt + cnt=$(mount_layers_count) + while (( cnt > 1 )); do + umount -l "$TARGET" >/dev/null 2>&1 || break + i=$((i+1)) + (( i > 20 )) && break + cnt=$(mount_layers_count) + done + fi +} + +# Drop protective attributes if present +if command -v lsattr >/dev/null 2>&1; then + attrs=$(lsattr -d "$TARGET" 2>/dev/null || true) + echo "$attrs" | grep -q " i " && chattr -i "$TARGET" >/dev/null 2>&1 || true + echo "$attrs" | grep -q " a " && chattr -a "$TARGET" >/dev/null 2>&1 || true +fi + +stop_units_if_present + +logger -t "$LOGTAG" "pre: unlocking /etc/hosts (starting)" +echo "$(date -Is) pre-unlock" >> /run/hosts-guard-hook.log 2>/dev/null || true + +# Always collapse any existing layers; we'll operate on the plain file +cleanup_mount_stacks + +# If someone managed a ro single-layer mount, ensure rw by remounting or collapsing again +if is_ro_mount; then + mount -o remount,rw "$TARGET" >/dev/null 2>&1 || cleanup_mount_stacks +fi + +logger -t "$LOGTAG" "pre: unlocking /etc/hosts (done)" + +exit 0 diff --git a/hosts/guard/setup_hosts_guard.sh b/hosts/guard/setup_hosts_guard.sh old mode 100644 new mode 100755