fix(scripts): use mktemp for state.json writes, not a fixed /tmp path
All checks were successful
Check / eval-and-lint (push) Successful in 6m57s
All checks were successful
Check / eval-and-lint (push) Successful in 6m57s
Ten state-mutating sites across seven scripts wrote through a predictable, world-writable temp path (`/tmp/state.json`, `/tmp/system-state.json`) before the atomic `sudo mv`. Because the `>` redirect runs as the invoking user (sudo doesn't cover redirects), the shared fixed path is a symlink/ TOCTOU target and collides if two of these run concurrently. Switch each to a per-invocation `mktemp`; the atomic rename into place is unchanged. nomarchy-theme-set already used a temp var for its home-state write — this makes its system-state write consistent and cleans the temp up on failure. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -14,7 +14,7 @@ fi
|
|||||||
|
|
||||||
case "$dns" in
|
case "$dns" in
|
||||||
Cloudflare|Google|DHCP)
|
Cloudflare|Google|DHCP)
|
||||||
sudo jq --arg dns "$dns" '.dns = $dns' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq --arg dns "$dns" '.dns = $dns' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
;;
|
;;
|
||||||
|
|
||||||
Custom)
|
Custom)
|
||||||
@@ -28,7 +28,7 @@ Custom)
|
|||||||
|
|
||||||
# Convert to JSON array safely
|
# Convert to JSON array safely
|
||||||
dns_array=$(echo "$dns_servers" | jq -R 'split(" ")')
|
dns_array=$(echo "$dns_servers" | jq -R 'split(" ")')
|
||||||
sudo jq --arg dns "Custom" --argjson servers "$dns_array" '.dns = $dns | .customDns = $servers' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq --arg dns "Custom" --argjson servers "$dns_array" '.dns = $dns | .customDns = $servers' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ set -e
|
|||||||
STATE_FILE="/etc/nixos/state.json"
|
STATE_FILE="/etc/nixos/state.json"
|
||||||
|
|
||||||
if [[ "--remove" == $1 ]]; then
|
if [[ "--remove" == $1 ]]; then
|
||||||
sudo jq '.features.fido2 = false' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq '.features.fido2 = false' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
echo "FIDO2 support disabled. Applying changes..."
|
echo "FIDO2 support disabled. Applying changes..."
|
||||||
sudo nomarchy-sys-update
|
sudo nomarchy-sys-update
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo jq '.features.fido2 = true' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq '.features.fido2 = true' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
echo "FIDO2 support enabled. Applying changes..."
|
echo "FIDO2 support enabled. Applying changes..."
|
||||||
sudo nomarchy-sys-update
|
sudo nomarchy-sys-update
|
||||||
|
|
||||||
|
|||||||
@@ -6,13 +6,13 @@ set -e
|
|||||||
STATE_FILE="/etc/nixos/state.json"
|
STATE_FILE="/etc/nixos/state.json"
|
||||||
|
|
||||||
if [[ "--remove" == $1 ]]; then
|
if [[ "--remove" == $1 ]]; then
|
||||||
sudo jq '.features.fingerprint = false' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq '.features.fingerprint = false' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
echo "Fingerprint support disabled. Applying changes..."
|
echo "Fingerprint support disabled. Applying changes..."
|
||||||
sudo nomarchy-sys-update
|
sudo nomarchy-sys-update
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
sudo jq '.features.fingerprint = true' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq '.features.fingerprint = true' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
echo "Fingerprint support enabled. Applying changes..."
|
echo "Fingerprint support enabled. Applying changes..."
|
||||||
sudo nomarchy-sys-update
|
sudo nomarchy-sys-update
|
||||||
|
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ STATE_FILE="/etc/nixos/state.json"
|
|||||||
# Check if supergfxd is enabled in config
|
# Check if supergfxd is enabled in config
|
||||||
if [[ $(sudo jq -r '.features.hybridGPU // false' "$STATE_FILE") != "true" ]]; then
|
if [[ $(sudo jq -r '.features.hybridGPU // false' "$STATE_FILE") != "true" ]]; then
|
||||||
if gum confirm "Hybrid GPU support is not enabled. Enable it now? (Requires sys-update)"; then
|
if gum confirm "Hybrid GPU support is not enabled. Enable it now? (Requires sys-update)"; then
|
||||||
sudo jq '.features.hybridGPU = true' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq '.features.hybridGPU = true' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
echo "Hybrid GPU support enabled in configuration. Applying changes..."
|
echo "Hybrid GPU support enabled in configuration. Applying changes..."
|
||||||
sudo nomarchy-sys-update
|
sudo nomarchy-sys-update
|
||||||
echo "Please run this command again after the update."
|
echo "Please run this command again after the update."
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ STATE_FILE="/etc/nixos/state.json"
|
|||||||
|
|
||||||
timezone=$(timedatectl list-timezones | gum filter --height 20 --header "Set timezone") || exit 1
|
timezone=$(timedatectl list-timezones | gum filter --height 20 --header "Set timezone") || exit 1
|
||||||
|
|
||||||
sudo jq --arg tz "$timezone" '.timezone = $tz' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq --arg tz "$timezone" '.timezone = $tz' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
|
|
||||||
echo "Timezone is now set to $timezone. Applying changes..."
|
echo "Timezone is now set to $timezone. Applying changes..."
|
||||||
sudo nomarchy-sys-update
|
sudo nomarchy-sys-update
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ off) value="false" ;;
|
|||||||
*) echo "Usage: nomarchy-wifi-powersave <on|off>"; exit 1 ;;
|
*) echo "Usage: nomarchy-wifi-powersave <on|off>"; exit 1 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
sudo jq --argjson val "$value" '.wifi.powersave = $val' "$STATE_FILE" > /tmp/state.json && sudo mv /tmp/state.json "$STATE_FILE"
|
tmp=$(mktemp); sudo jq --argjson val "$value" '.wifi.powersave = $val' "$STATE_FILE" > "$tmp" && sudo mv "$tmp" "$STATE_FILE"
|
||||||
|
|
||||||
echo "Wifi powersave set to $1. Applying changes..."
|
echo "Wifi powersave set to $1. Applying changes..."
|
||||||
sudo nomarchy-sys-update
|
sudo nomarchy-sys-update
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ jq --arg theme "$THEME_NAME" '.theme = $theme' "$STATE_FILE" > "$TMP_JSON" && mv
|
|||||||
# Sync to system state if we have permissions (for system-level theming like browser policies)
|
# Sync to system state if we have permissions (for system-level theming like browser policies)
|
||||||
SYSTEM_STATE_FILE="/etc/nixos/state.json"
|
SYSTEM_STATE_FILE="/etc/nixos/state.json"
|
||||||
if [ -w "$SYSTEM_STATE_FILE" ] || [ -w "/etc/nixos" ]; then
|
if [ -w "$SYSTEM_STATE_FILE" ] || [ -w "/etc/nixos" ]; then
|
||||||
sudo jq --arg theme "$THEME_NAME" '.theme = $theme' "$SYSTEM_STATE_FILE" > /tmp/system-state.json 2>/dev/null && sudo mv /tmp/system-state.json "$SYSTEM_STATE_FILE" 2>/dev/null || true
|
tmp=$(mktemp); sudo jq --arg theme "$THEME_NAME" '.theme = $theme' "$SYSTEM_STATE_FILE" > "$tmp" 2>/dev/null && sudo mv "$tmp" "$SYSTEM_STATE_FILE" 2>/dev/null || rm -f "$tmp"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Try to find a background for this theme
|
# Try to find a background for this theme
|
||||||
|
|||||||
Reference in New Issue
Block a user