fix(dashboard): nftables-Status aus Kernel statt Systemd-Unit

Vorher: Service-Health-Grid hat 'nftables.service' per systemctl
abgefragt. Distro-Unit ist disabled (wir laden via 'nft -f' aus
dem Renderer) → Dashboard zeigte FW als 'inactive', obwohl Pakete
sehr wohl gefiltert werden.

Fix: Special-case in /system/services für unit='nftables'. Status
= existiert 'table inet edgeguard' im Kernel-Ruleset (sudo nft list
tables). 'kernel-loaded' wenn ja, 'no-table' wenn nein.

Plus: sudoers im postinst erweitert um 'nft list tables' + 'nft list
table inet edgeguard'.

Version 1.0.44.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
Debian
2026-05-11 07:51:55 +02:00
parent c7b98f196e
commit 9464322450
8 changed files with 42 additions and 8 deletions

View File

@@ -1 +1 @@
1.0.43 1.0.44

View File

@@ -45,7 +45,7 @@ import (
wgsvc "git.netcell-it.de/projekte/edgeguard-native/internal/services/wireguard" wgsvc "git.netcell-it.de/projekte/edgeguard-native/internal/services/wireguard"
) )
var version = "1.0.43" var version = "1.0.44"
func main() { func main() {
addr := os.Getenv("EDGEGUARD_API_ADDR") addr := os.Getenv("EDGEGUARD_API_ADDR")

View File

@@ -9,7 +9,7 @@ import (
"os" "os"
) )
var version = "1.0.43" var version = "1.0.44"
const usage = `edgeguard-ctl — EdgeGuard CLI const usage = `edgeguard-ctl — EdgeGuard CLI

View File

@@ -21,7 +21,7 @@ import (
"git.netcell-it.de/projekte/edgeguard-native/internal/services/tlscerts" "git.netcell-it.de/projekte/edgeguard-native/internal/services/tlscerts"
) )
var version = "1.0.43" var version = "1.0.44"
const ( const (
// renewTickInterval — how often we re-evaluate expiring certs. // renewTickInterval — how often we re-evaluate expiring certs.

View File

@@ -2,6 +2,7 @@ package handlers
import ( import (
"bufio" "bufio"
stdcontext "context"
"log/slog" "log/slog"
"net" "net"
"net/http" "net/http"
@@ -67,8 +68,21 @@ func (h *SystemHandler) Services(c *gin.Context) {
out := make([]serviceStatus, 0, len(servicesToCheck)) out := make([]serviceStatus, 0, len(servicesToCheck))
for _, s := range servicesToCheck { for _, s := range servicesToCheck {
st := serviceStatus{Label: s.Label, Unit: s.Unit} st := serviceStatus{Label: s.Label, Unit: s.Unit}
// systemctl show -p SubState,ActiveEnterTimestamp gives us if s.Unit == "nftables" {
// state + since in one shot, faster than two calls. // Distro-Unit nftables.service ist disabled — wir laden
// die Rules direkt via 'nft -f' aus dem Renderer. Status
// = ist unsere 'inet edgeguard'-Tabelle im Kernel?
loaded, when := nftablesKernelState(c.Request.Context())
st.Active = loaded
if loaded {
st.State = "kernel-loaded"
} else {
st.State = "no-table"
}
st.Since = when
out = append(out, st)
continue
}
raw, err := exec.CommandContext(c.Request.Context(), raw, err := exec.CommandContext(c.Request.Context(),
"systemctl", "show", "-p", "ActiveState,ActiveEnterTimestamp", "systemctl", "show", "-p", "ActiveState,ActiveEnterTimestamp",
s.Unit).Output() s.Unit).Output()
@@ -90,6 +104,24 @@ func (h *SystemHandler) Services(c *gin.Context) {
response.OK(c, gin.H{"services": out}) response.OK(c, gin.H{"services": out})
} }
// nftablesKernelState reports whether our 'inet edgeguard' table is
// present in the kernel ruleset. Errors swallow to false. Returns
// the mtime of the source file as 'since' when loaded.
func nftablesKernelState(ctx stdcontext.Context) (bool, string) {
out, err := exec.CommandContext(ctx, "sudo", "-n", "/usr/sbin/nft", "list", "tables").Output()
if err != nil {
return false, ""
}
if !strings.Contains(string(out), "inet edgeguard") {
return false, ""
}
when := ""
if fi, err := os.Stat("/etc/edgeguard/nftables.d/ruleset.nft"); err == nil {
when = fi.ModTime().UTC().Format(time.RFC3339)
}
return true, when
}
type resources struct { type resources struct {
LoadAvg1 float64 `json:"load_avg_1"` LoadAvg1 float64 `json:"load_avg_1"`
LoadAvg5 float64 `json:"load_avg_5"` LoadAvg5 float64 `json:"load_avg_5"`

View File

@@ -1,7 +1,7 @@
{ {
"name": "edgeguard-management-ui", "name": "edgeguard-management-ui",
"private": true, "private": true,
"version": "1.0.43", "version": "1.0.44",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

View File

@@ -75,7 +75,7 @@ const NAV: NavSection[] = [
}, },
] ]
const VERSION = '1.0.43' const VERSION = '1.0.44'
export default function Sidebar({ isOpen, onClose }: SidebarProps) { export default function Sidebar({ isOpen, onClose }: SidebarProps) {
const { t } = useTranslation() const { t } = useTranslation()

View File

@@ -53,6 +53,8 @@ case "$1" in
edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl reload haproxy.service edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl reload haproxy.service
edgeguard ALL=(root) NOPASSWD: /bin/systemctl reload haproxy.service edgeguard ALL=(root) NOPASSWD: /bin/systemctl reload haproxy.service
edgeguard ALL=(root) NOPASSWD: /usr/sbin/nft -f /etc/edgeguard/nftables.d/ruleset.nft edgeguard ALL=(root) NOPASSWD: /usr/sbin/nft -f /etc/edgeguard/nftables.d/ruleset.nft
edgeguard ALL=(root) NOPASSWD: /usr/sbin/nft list tables
edgeguard ALL=(root) NOPASSWD: /usr/sbin/nft list table inet edgeguard
edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl start wg-quick@*.service edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl start wg-quick@*.service
edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl restart wg-quick@*.service edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl restart wg-quick@*.service
edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl stop wg-quick@*.service edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl stop wg-quick@*.service