From c1c17ec8e62bd43914c57ef881692eed35b5c0e2 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Thu, 27 Aug 2026 12:09:26 -0400 Subject: [PATCH] openwrt fixes --- hosts/hl-fwdesk.nix | 3 +- modules/home/ABOUTME.md | 2 +- modules/home/default.nix | 7 - modules/openwrt/ABOUTME.md | 6 +- modules/openwrt/default.nix | 126 ++++++++++-------- modules/openwrt/generator/ABOUTME.md | 23 +++- modules/openwrt/generator/src/config.rs | 27 ++++ .../generator/src/generators/dnsmasq.rs | 1 + .../generator/src/generators/ethers.rs | 1 + .../generator/src/generators/firewall.rs | 92 +++++++++++-- modules/openwrt/generator/src/network.rs | 1 + secrets/glmain.json.age | Bin 5409 -> 5875 bytes 12 files changed, 207 insertions(+), 82 deletions(-) diff --git a/hosts/hl-fwdesk.nix b/hosts/hl-fwdesk.nix index 9a683a1..2dcfdd2 100644 --- a/hosts/hl-fwdesk.nix +++ b/hosts/hl-fwdesk.nix @@ -193,12 +193,13 @@ in enable = true; host = "0.0.0.0"; port = ports.ollama; - package = pkgs.ollama-vulkan; + package = pkgs.ollama-rocm; user = "ollama"; home = "/var/lib/ollama"; environmentVariables = { HSA_ENABLE_SDMA = "0"; OLLAMA_FLASH_ATTENTION = "1"; + OLLAMA_KV_CACHE_TYPE = "q8_0"; OLLAMA_KEEP_ALIVE = "24h"; }; }; diff --git a/modules/home/ABOUTME.md b/modules/home/ABOUTME.md index 2d9c31c..8063bbc 100644 --- a/modules/home/ABOUTME.md +++ b/modules/home/ABOUTME.md @@ -20,7 +20,7 @@ home/ `default.nix` exports two builder functions, both consumed by `core/user.nix`: -- `makeRootUser { hostName }` — minimal root profile (jq, kubectl, btop, …) with a +- `makeRootUser { hostName }` — minimal root profile (jq, kubectl, …) with a `root@` git identity. - `makeCommonUser { name, fullName, email, extraGitConfigs ? [] }` — the full human profile: dev packages, the shared shell/program config, and the user's git identity. diff --git a/modules/home/default.nix b/modules/home/default.nix index 8eadb9a..d0bf72e 100644 --- a/modules/home/default.nix +++ b/modules/home/default.nix @@ -9,8 +9,6 @@ let shellAliases = { cat = "bat"; ls = "eza"; - du = "dust"; - df = "duf"; open = "xdg-open"; }; }; @@ -26,8 +24,6 @@ in kubectl kubectx htop - btop - duf ]; }; programs = @@ -65,13 +61,10 @@ in ipfetch nixd htop - btop fastfetch kubectl kubectx terraform - dust - duf ]; }; programs = diff --git a/modules/openwrt/ABOUTME.md b/modules/openwrt/ABOUTME.md index ddd950c..7657f65 100644 --- a/modules/openwrt/ABOUTME.md +++ b/modules/openwrt/ABOUTME.md @@ -18,8 +18,10 @@ openwrt/ 1. The router config lives as an **agenix secret** (e.g. `secrets/glmain.json.age`). 2. `openwrt-deploy` reads the decrypted JSON from stdin, runs `openwrt-gen dnsmasq`, `openwrt-gen ethers`, and `openwrt-gen firewall` to render the three target files. -3. It SSHes to the router, shows a **colorized diff** against the current files (for the - firewall, only the `skyg_*`-managed rules are diffed), and prompts for confirmation. +3. It SSHes to the router, shows a **colorized unified diff** against the current files + (for the firewall, only the `skyg_*`-managed rules are diffed), each with a + `-> N added, M removed` summary, then lists the `skyg_*` rule names that will be + applied, and prompts for confirmation. 4. On the router it **backs up** the configs it overrides to `/etc/skyg-backups/` with a timestamp, then applies them. `dnsmasq.conf` is validated with `dnsmasq --test` and the firewall is committed + reloaded; **any failure auto-restores** from that timestamp's diff --git a/modules/openwrt/default.nix b/modules/openwrt/default.nix index 1064d4a..14ef85a 100644 --- a/modules/openwrt/default.nix +++ b/modules/openwrt/default.nix @@ -13,48 +13,45 @@ let # Run on the router as: TS= bash skyg-apply.sh # Expects the new files staged at /tmp/skyg_firewall.batch, # /tmp/dnsmasq.new.conf and /tmp/ethers.new. - applyScript = pkgs.writeText { - name = "skyg-apply.sh"; - text = '' - set -euo pipefail - BK=/etc/skyg-backups - mkdir -p "$BK" - cp /etc/config/firewall "$BK/firewall.$TS" - cp /etc/dnsmasq.conf "$BK/dnsmasq.conf.$TS" - cp /etc/ethers "$BK/ethers.$TS" 2>/dev/null || true + applyScript = pkgs.writeText "skyg-apply.sh" '' + set -euo pipefail + BK=/etc/skyg-backups + mkdir -p "$BK" + cp /etc/config/firewall "$BK/firewall.$TS" + cp /etc/dnsmasq.conf "$BK/dnsmasq.conf.$TS" + cp /etc/ethers "$BK/ethers.$TS" 2>/dev/null || true - # --- Firewall: replace the skyg-managed rules --- - for ref in $(uci show firewall | awk -F. '/\.name=.skyg_/{print $1"."$2}'); do - uci -q del "$ref" || true - done - if ! uci batch < /tmp/skyg_firewall.batch; then - echo 'FIREWALL: uci batch failed, restoring' - cp "$BK/firewall.$TS" /etc/config/firewall - exit 1 - fi - if ! uci commit firewall; then - echo 'FIREWALL: uci commit failed, restoring' - cp "$BK/firewall.$TS" /etc/config/firewall - exit 1 - fi - /etc/init.d/firewall reload + # --- Firewall: replace the skyg-managed rules --- + for ref in $(uci show firewall | awk -F. '/\.name=.skyg_/{print $1"."$2}'); do + uci -q del "$ref" || true + done + if ! uci batch < /tmp/skyg_firewall.batch; then + echo 'FIREWALL: uci batch failed, restoring' + cp "$BK/firewall.$TS" /etc/config/firewall + exit 1 + fi + if ! uci commit firewall; then + echo 'FIREWALL: uci commit failed, restoring' + cp "$BK/firewall.$TS" /etc/config/firewall + exit 1 + fi + /etc/init.d/firewall reload - # --- dnsmasq --- - cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf - if dnsmasq --test; then - /etc/init.d/dnsmasq restart - else - echo 'dnsmasq config invalid, restoring' - cp "$BK/dnsmasq.conf.$TS" /etc/dnsmasq.conf - exit 1 - fi + # --- dnsmasq --- + cp /tmp/dnsmasq.new.conf /etc/dnsmasq.conf + if dnsmasq --test; then + /etc/init.d/dnsmasq restart + else + echo 'dnsmasq config invalid, restoring' + cp "$BK/dnsmasq.conf.$TS" /etc/dnsmasq.conf + exit 1 + fi - # --- ethers --- - cp /tmp/ethers.new /etc/ethers + # --- ethers --- + cp /tmp/ethers.new /etc/ethers - echo 'Done' - ''; - }; + echo 'Done' + ''; in config: @@ -73,6 +70,35 @@ let ETHERS=$(echo "$CONFIG" | ${generator}/bin/openwrt-gen ethers) FIREWALL=$(echo "$CONFIG" | ${generator}/bin/openwrt-gen firewall) + # Colorized unified diff with a per-file change summary. + # $1 = label, $2 = current (may be empty), $3 = new + show_diff() { + local label="$1" old="$2" new="$3" + local oldf newf d + oldf=$(mktemp) newf=$(mktemp) + if [ -n "$old" ]; then printf '%s\n' "$old" > "$oldf"; else : > "$oldf"; fi + if [ -n "$new" ]; then printf '%s\n' "$new" > "$newf"; else : > "$newf"; fi + echo "" + echo "=== $label ===" + if d=$(diff -u "$oldf" "$newf"); then + echo " (no changes)" + else + printf '%s\n' "$d" | awk ' + /^---/ {printf "\033[2m%s\033[0m\n", $0; next} + /^\+\+\+/ {printf "\033[2m%s\033[0m\n", $0; next} + /^@@/ {printf "\033[36m%s\033[0m\n", $0; next} + /^-/ {printf "\033[31m%s\033[0m\n", $0; next} + /^\+/ {printf "\033[32m%s\033[0m\n", $0; next} + {print} + ' + local added removed + added=$(printf '%s\n' "$d" | grep -c '^[+][^+]' || true) + removed=$(printf '%s\n' "$d" | grep -c '^[-][^-]' || true) + echo " -> $added added, $removed removed" + fi + rm -f "$oldf" "$newf" + } + echo "Fetching current config from $SERVER..." CURRENT_DNSMASQ=$(ssh "$SERVER" 'cat /etc/dnsmasq.conf' 2>/dev/null || echo "") CURRENT_ETHERS=$(ssh "$SERVER" 'cat /etc/ethers' 2>/dev/null || echo "") @@ -82,23 +108,13 @@ let # Drop the header comment from the generated firewall for a clean diff NEW_FIREWALL=$(echo "$FIREWALL" | tail -n +2) - echo "" - echo "$DNSMASQ" - echo "=== dnsmasq.conf diff [START] ===" - comm -3 <(echo "$CURRENT_DNSMASQ" | sort) <(echo "$DNSMASQ" | sort) | awk '{if ($0 ~ /^/) print "\033[32m"$0"\033[0m"; else print}' - echo "=== dnsmasq.conf diff [END] ===" - echo "" + show_diff "dnsmasq.conf" "$CURRENT_DNSMASQ" "$DNSMASQ" + show_diff "ethers" "$CURRENT_ETHERS" "$ETHERS" + show_diff "firewall (skyg rules)" "$CURRENT_FIREWALL" "$NEW_FIREWALL" - echo "$ETHERS" - echo "=== ethers diff [START] ===" - comm -3 <(echo "$CURRENT_ETHERS" | sort) <(echo "$ETHERS" | sort) | awk '{if ($0 ~ /^/) print "\033[32m"$0"\033[0m"; else print}' - echo "=== ethers diff [END] ===" echo "" - - echo "$NEW_FIREWALL" - echo "=== firewall (skyg rules) diff [START] ===" - comm -3 <(echo "$CURRENT_FIREWALL" | sort) <(echo "$NEW_FIREWALL" | sort) | awk '{if ($0 ~ /^/) print "\033[32m"$0"\033[0m"; else print}' - echo "=== firewall (skyg rules) diff [END] ===" + echo "skyg firewall rules to be applied:" + echo "$NEW_FIREWALL" | awk -F"'" '/option name/{print " " $2}' echo "" read -p "Deploy to $SERVER? [y/N] " -n 1 -r < /dev/tty; echo @@ -112,8 +128,8 @@ let echo "$ETHERS" | ssh "$SERVER" 'cat > /tmp/ethers.new' echo "$FIREWALL" | ssh "$SERVER" 'cat > /tmp/skyg_firewall.batch' - # Back up, apply, validate, auto-restore on failure - ssh "$SERVER" "TS=$TS bash /tmp/skyg_apply.sh" + # Back up, apply, validate, auto-restore on failure (OpenWrt has no bash, use sh) + ssh "$SERVER" "TS=$TS sh /tmp/skyg_apply.sh" ''; # Dry-run: render the configs locally and write them to .tmp/openwrt-/ diff --git a/modules/openwrt/generator/ABOUTME.md b/modules/openwrt/generator/ABOUTME.md index 5fa6c14..410c301 100644 --- a/modules/openwrt/generator/ABOUTME.md +++ b/modules/openwrt/generator/ABOUTME.md @@ -33,14 +33,18 @@ openwrt-gen firewall < config.json # prints UCI firewall rules (uci batch form ## Input shape (`config.rs`) - `generalMappings`: `[{ ip, domains[] }]` — shared domain→IP records. -- `networks`: `{ : [ { mac, name, id?, domains?, justMac? } ] }` — per-network hosts. +- `networks`: `{ : [ { mac, name, id?, domains?, justMac?, internetOnly? } ] }` — + per-network hosts. A device with `internetOnly: true` is restricted to internet-only + access (matched by MAC), on any network. - `dnsResolvers`: `[{ ip, port?, name? }]` — upstream `server=` entries for dnsmasq. - `internetOnly`: `[, ...]` — networks restricted to internet-only access. ## Internet-only firewall rules (`firewall.rs`) -For each network in `internetOnly`, the generator emits UCI `config rule` blocks that DROP -forwarded traffic from that network to the rest of the LAN (`10.0.0.0/16`): +The generator emits UCI `config rule` blocks that DROP forwarded traffic to the rest of the +LAN (`10.0.0.0/16` IPv4, `fd59:de0a:bff5::/48` IPv6). Two sources of restriction: + +**Network-level** — for each network in `internetOnly`: - **IPv4** — one rule per network matching the whole subnet (catches every device on it). - **IPv6** — one rule per known device MAC. All subnets share a single ULA /64 @@ -48,10 +52,15 @@ forwarded traffic from that network to the rest of the LAN (`10.0.0.0/16`): in IPv6 and blocking is done per known device. An *unknown* IPv6-only device on those subnets is **not** blocked (inherent to the flat-L2 topology). -Rules are named `skyg__drop_lan` (IPv4) and `skyg__drop_lan_v6` (IPv6) so -the deploy script owns exactly these. They are inserted before port-specific ACCEPT rules -(e.g. the existing `sambasharelan`) so the DROPs win. Reverse direction (LAN → restricted -network) stays open, and within-subnet traffic (e.g. cam→cam) is blocked. +**Device-level** — for any device with `internetOnly: true` (on any network): + +- **IPv4 + IPv6** — one rule each matched by that device's MAC. This lets you restrict a + single machine (e.g. a printer on `lab`) without restricting its whole subnet. + +Rules are named `skyg__drop_lan` / `skyg__drop_lan_v6` (network-level) and +`skyg_mac__drop_lan` / `skyg_mac__drop_lan_v6` (device-level, MAC with colons +stripped) so the deploy script owns exactly these. Reverse direction (LAN → restricted +device) stays open, and within-subnet traffic (e.g. cam→cam) is blocked. ## Conventions diff --git a/modules/openwrt/generator/src/config.rs b/modules/openwrt/generator/src/config.rs index 93391af..d3bf66a 100644 --- a/modules/openwrt/generator/src/config.rs +++ b/modules/openwrt/generator/src/config.rs @@ -38,6 +38,9 @@ pub struct Device { pub domains: Option>, #[serde(rename = "justMac", default)] pub just_mac: bool, + /// Restrict this single device to internet-only access (matched by MAC). + #[serde(rename = "internetOnly", default)] + pub internet_only: bool, } #[cfg(test)] @@ -99,4 +102,28 @@ mod tests { let config: Config = serde_json::from_str(json).unwrap(); assert!(config.internet_only.is_empty()); } + + #[test] + fn test_device_internet_only_flag() { + let json = r#"{ + "generalMappings": [], + "networks": { + "lab": [{"mac": "aa:bb:cc:dd:ee:ff", "name": "printer", "internetOnly": true}] + } + }"#; + let config: Config = serde_json::from_str(json).unwrap(); + assert!(config.networks["lab"][0].internet_only); + } + + #[test] + fn test_device_internet_only_defaults_false() { + let json = r#"{ + "generalMappings": [], + "networks": { + "lab": [{"mac": "aa:bb:cc:dd:ee:ff", "name": "printer"}] + } + }"#; + let config: Config = serde_json::from_str(json).unwrap(); + assert!(!config.networks["lab"][0].internet_only); + } } diff --git a/modules/openwrt/generator/src/generators/dnsmasq.rs b/modules/openwrt/generator/src/generators/dnsmasq.rs index f794320..db66cb3 100644 --- a/modules/openwrt/generator/src/generators/dnsmasq.rs +++ b/modules/openwrt/generator/src/generators/dnsmasq.rs @@ -59,6 +59,7 @@ mod tests { id: None, domains, just_mac: false, + internet_only: false, }]); Config { general_mappings: vec![], networks, dns_resolvers: vec![], internet_only: vec![] } } diff --git a/modules/openwrt/generator/src/generators/ethers.rs b/modules/openwrt/generator/src/generators/ethers.rs index af562d3..9785564 100644 --- a/modules/openwrt/generator/src/generators/ethers.rs +++ b/modules/openwrt/generator/src/generators/ethers.rs @@ -39,6 +39,7 @@ mod tests { id: None, domains: None, just_mac, + internet_only: false, }]); Config { general_mappings: vec![], networks, dns_resolvers: vec![], internet_only: vec![] } } diff --git a/modules/openwrt/generator/src/generators/firewall.rs b/modules/openwrt/generator/src/generators/firewall.rs index 0568769..fbb87cb 100644 --- a/modules/openwrt/generator/src/generators/firewall.rs +++ b/modules/openwrt/generator/src/generators/firewall.rs @@ -1,17 +1,18 @@ use crate::config::Config; use crate::network::{prefix_for, process_network, ULA_PREFIX}; -/// Renders UCI firewall rules (in `uci batch` format) that restrict the networks -/// listed in `config.internet_only` to internet-only access. +/// Renders UCI firewall rules (in `uci batch` format) that restrict devices to +/// internet-only access. /// -/// For each restricted network: -/// - IPv4: a single DROP rule matching the whole subnet (catches all devices on it). -/// - IPv6: a DROP rule per known device MAC (all subnets share one /64, so subnets -/// are not distinguishable in IPv6). +/// Two sources of restriction: +/// - **Network-level** (`config.internet_only`): for each restricted network, +/// - IPv4: a single DROP rule matching the whole subnet (catches all devices on it). +/// - IPv6: a DROP rule per known device MAC (all subnets share one /64, so subnets +/// are not distinguishable in IPv6). +/// - **Device-level** (a device with `internetOnly: true`): IPv4 + IPv6 DROP rules +/// matched by that device's MAC, on any network. /// -/// Rules are named `skyg__drop_lan[_v6]` so the deploy script can manage -/// exactly the rules it owns. They are inserted before port-specific ACCEPT rules -/// (e.g. the existing `sambasharelan`) so the DROPs win. +/// Rules are named `skyg_*` so the deploy script can manage exactly the rules it owns. pub fn generate(config: &Config) -> String { let mut out = String::new(); out.push_str("# Managed by skyg openwrt — do not edit by hand\n"); @@ -56,9 +57,49 @@ pub fn generate(config: &Config) -> String { } } + // Device-level: any device flagged internetOnly, regardless of network. + for (network, devices) in &config.networks { + for pd in process_network(network, devices) { + if !pd.device.internet_only { + continue; + } + let slug = mac_slug(&pd.device.mac); + out.push_str(&format!( + "config rule\n\ + \toption name 'skyg_mac_{slug}_drop_lan'\n\ + \toption src 'lan'\n\ + \toption dest 'lan'\n\ + \toption src_mac '{mac}'\n\ + \toption dest_ip '10.0.0.0/16'\n\ + \toption target 'DROP'\n\ + \toption family 'ipv4'\n", + slug = slug, + mac = pd.device.mac, + )); + out.push_str(&format!( + "config rule\n\ + \toption name 'skyg_mac_{slug}_drop_lan_v6'\n\ + \toption src 'lan'\n\ + \toption dest 'lan'\n\ + \toption src_mac '{mac}'\n\ + \toption dest_ip '{ula}'\n\ + \toption target 'DROP'\n\ + \toption family 'ipv6'\n", + slug = slug, + mac = pd.device.mac, + ula = ULA_PREFIX, + )); + } + } + out } +/// MAC address without separators, for use in a UCI rule name. +fn mac_slug(mac: &str) -> String { + mac.replace(':', "") +} + #[cfg(test)] mod tests { use super::*; @@ -76,6 +117,7 @@ mod tests { id: None, domains: None, just_mac: false, + internet_only: false, }, Device { mac: "aa:bb:cc:dd:ee:02".to_string(), @@ -83,6 +125,7 @@ mod tests { id: None, domains: None, just_mac: false, + internet_only: false, }, ], ); @@ -129,4 +172,35 @@ mod tests { let result = generate(&config); assert!(result.lines().count() == 1); // only the header comment } + + #[test] + fn test_device_level_internet_only() { + let mut config = config_with_devices(vec![]); + // Flag one device on a non-restricted network as internet-only. + config + .networks + .entry("lab".to_string()) + .or_insert_with(Vec::new) + .push(Device { + mac: "11:22:33:44:55:66".to_string(), + name: "printer".to_string(), + id: None, + domains: None, + just_mac: false, + internet_only: true, + }); + let result = generate(&config); + assert!(result.contains("skyg_mac_112233445566_drop_lan")); + assert!(result.contains("skyg_mac_112233445566_drop_lan_v6")); + assert!(result.contains("option src_mac '11:22:33:44:55:66'")); + assert!(result.contains("option dest_ip '10.0.0.0/16'")); + assert!(result.contains("option dest_ip 'fd59:de0a:bff5::/48'")); + // No subnet rules were generated (no network-level internetOnly). + assert!(!result.contains("skyg_lab_drop_lan\n")); + } + + #[test] + fn test_mac_slug_strips_colons() { + assert_eq!(mac_slug("aa:bb:cc:dd:ee:ff"), "aabbccddeeff"); + } } diff --git a/modules/openwrt/generator/src/network.rs b/modules/openwrt/generator/src/network.rs index 53092b1..fbfaf9b 100644 --- a/modules/openwrt/generator/src/network.rs +++ b/modules/openwrt/generator/src/network.rs @@ -71,6 +71,7 @@ mod tests { id, domains: None, just_mac, + internet_only: false, } } diff --git a/secrets/glmain.json.age b/secrets/glmain.json.age index d1e992e299457d26ee10df0ace52d0f12e7ab8f6..14e23bda9aba0b0620d48eabe27962761f1c19fd 100644 GIT binary patch literal 5875 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 Jzl;q%&>mgtPHF%E literal 5409 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