From fd294a273e0cb9030324f3f86de2f8cbdc13374c Mon Sep 17 00:00:00 2001 From: Debian Date: Sun, 10 May 2026 21:07:38 +0200 Subject: [PATCH] feat(ui): Pages auf neues Design + Dashboard + WG-Live-Status + Routing-Rules-Verstecken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pages auf PageHeader/StatusDot/ActionButtons-Pattern migriert: * Dashboard — Komplett-Rewrite. KPI-Tiles (Domains, Backends, Iface, FW-Rules, NAT, WG), Detail-Cards (WireGuard live status, Firewall zone overview, SSL expiring soon, Cluster nodes, Routing summary, System info). Polled queries pro Card. * Domains, Backends, RoutingRules, Networks, IPAddresses, SSL, Cluster, Settings, Firewall (index) — alle inline Action-Buttons → ActionButtons; alle Yes/No-Renders → StatusDot; Add-Button in DataTable.extraActions; PageHeader oben. WireGuard --------- * Neuer /wireguard/status-Endpoint parsed `wg show all dump`, liefert {iface, peer_pubkey, endpoint, last_handshake_unix, rx, tx}. Sudoers im postinst um `wg show` erweitert. * Server-Drawer Peer-Liste zeigt jetzt Live-Status (Online/Offline- Dot, "vor Xs", Traffic-Counter) per 10s-Polling. Importierte "Unify Home" peer kann jetzt im UI verifiziert werden. * Importer-Bug fixed: nextName ("# Unify Home" comment) wurde beim Sektionswechsel zu früh geresettet — jetzt nur nach echtem flushPeer. Routing-Rules ------------- * Aus Sidebar entfernt. URL bleibt funktional, aber für 90% der Setups reicht domains.primary_backend_id (das HAProxy ohnehin als default_backend rendert). Path-basiertes Routing ist ein Advanced-Feature und kommt später als Domain-Modal-Tab zurück. * nav.routing-Sidebar-Eintrag + BranchesOutlined-Import entfernt. Misc ---- * "Firewall (v2)" → "Firewall" im Nav (DE). * Dashboard-i18n Block in DE+EN. * Version 1.0.11 → 1.0.12. Co-Authored-By: Claude Opus 4.7 (1M context) --- VERSION | 2 +- cmd/edgeguard-api/main.go | 2 +- cmd/edgeguard-ctl/main.go | 2 +- cmd/edgeguard-scheduler/main.go | 2 +- internal/handlers/wireguard.go | 59 +++++++++++++++++ internal/services/wireguard/import.go | 2 +- management-ui/package.json | 2 +- .../src/components/Layout/Sidebar.tsx | 10 +-- management-ui/src/i18n/locales/de/common.json | 52 ++++++++++++++- management-ui/src/i18n/locales/en/common.json | 52 ++++++++++++++- management-ui/src/pages/Backends/index.tsx | 54 ++++++++------- management-ui/src/pages/Cluster/index.tsx | 22 +++---- management-ui/src/pages/Domains/index.tsx | 55 ++++++++-------- management-ui/src/pages/Firewall/index.tsx | 11 +++- management-ui/src/pages/IPAddresses/index.tsx | 56 +++++++++------- management-ui/src/pages/Networks/index.tsx | 57 +++++++++------- .../src/pages/RoutingRules/index.tsx | 54 ++++++++------- management-ui/src/pages/SSL/index.tsx | 24 ++++--- management-ui/src/pages/Settings/index.tsx | 15 +++-- management-ui/src/pages/Wireguard/Servers.tsx | 66 ++++++++++++++++++- .../debian/edgeguard-api/DEBIAN/postinst | 2 + 21 files changed, 439 insertions(+), 162 deletions(-) diff --git a/VERSION b/VERSION index 59e9e60..bb83058 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.11 +1.0.12 diff --git a/cmd/edgeguard-api/main.go b/cmd/edgeguard-api/main.go index b26844e..781180d 100644 --- a/cmd/edgeguard-api/main.go +++ b/cmd/edgeguard-api/main.go @@ -39,7 +39,7 @@ import ( wgsvc "git.netcell-it.de/projekte/edgeguard-native/internal/services/wireguard" ) -var version = "1.0.11" +var version = "1.0.12" func main() { addr := os.Getenv("EDGEGUARD_API_ADDR") diff --git a/cmd/edgeguard-ctl/main.go b/cmd/edgeguard-ctl/main.go index 074caec..4351e79 100644 --- a/cmd/edgeguard-ctl/main.go +++ b/cmd/edgeguard-ctl/main.go @@ -9,7 +9,7 @@ import ( "os" ) -var version = "1.0.11" +var version = "1.0.12" const usage = `edgeguard-ctl — EdgeGuard CLI diff --git a/cmd/edgeguard-scheduler/main.go b/cmd/edgeguard-scheduler/main.go index c776c8e..003ad44 100644 --- a/cmd/edgeguard-scheduler/main.go +++ b/cmd/edgeguard-scheduler/main.go @@ -5,7 +5,7 @@ import ( "time" ) -var version = "1.0.11" +var version = "1.0.12" func main() { log.Printf("edgeguard-scheduler %s starting", version) diff --git a/internal/handlers/wireguard.go b/internal/handlers/wireguard.go index a61b899..094df5b 100644 --- a/internal/handlers/wireguard.go +++ b/internal/handlers/wireguard.go @@ -7,7 +7,9 @@ import ( "fmt" "log/slog" "net/http" + "os/exec" "strconv" + "strings" "github.com/gin-gonic/gin" qrcode "github.com/skip2/go-qrcode" @@ -76,6 +78,63 @@ func (h *WireguardHandler) Register(rg *gin.RouterGroup) { // embeds the same text so mobile apps can import directly. g.GET("/peers/:pid/config", h.PeerConfig) g.GET("/peers/:pid/qr", h.PeerQR) + + // Live runtime status from `wg show dump`. Returns one + // row per (iface, peer) with last_handshake + transfer counters. + // Polled by the UI every 10s; no DB write. + g.GET("/status", h.Status) +} + +// ── Live wg-show status ───────────────────────────────────────────── + +// wgStatus is the wire shape returned to the UI. We don't update +// the DB rows from this — kernel state is the source of truth at +// the moment of the call, the DB is metadata. +type wgStatus struct { + Interface string `json:"interface"` + PeerPublicKey string `json:"peer_public_key"` + Endpoint string `json:"endpoint,omitempty"` + AllowedIPs string `json:"allowed_ips,omitempty"` + LastHandshake int64 `json:"last_handshake_unix"` // 0 = never + TransferRX int64 `json:"transfer_rx"` + TransferTX int64 `json:"transfer_tx"` +} + +func (h *WireguardHandler) Status(c *gin.Context) { + // `wg show all dump` per iface — output: + // line 1: iface_private_key, iface_pubkey, listen_port, fwmark + // line 2..N: pubkey, psk, endpoint, allowed_ips, latest_handshake, rx, tx, persistent_keepalive + out, err := exec.CommandContext(c.Request.Context(), "sudo", "-n", "/usr/bin/wg", "show", "all", "dump").Output() + if err != nil { + // wg not installed or no ifaces up — return empty list, not error. + response.OK(c, gin.H{"status": []wgStatus{}}) + return + } + rows := []wgStatus{} + for _, line := range strings.Split(string(out), "\n") { + if line == "" { + continue + } + fields := strings.Split(line, "\t") + // Lines starting an iface have 5 columns; peer lines have 9. + if len(fields) != 9 { + continue + } + ifaceName := fields[0] + hs, _ := strconv.ParseInt(fields[5], 10, 64) + rx, _ := strconv.ParseInt(fields[6], 10, 64) + tx, _ := strconv.ParseInt(fields[7], 10, 64) + rows = append(rows, wgStatus{ + Interface: ifaceName, + PeerPublicKey: fields[2], + Endpoint: fields[3], + AllowedIPs: fields[4], + LastHandshake: hs, + TransferRX: rx, + TransferTX: tx, + }) + } + response.OK(c, gin.H{"status": rows}) } // ── Keygen ──────────────────────────────────────────────────────── diff --git a/internal/services/wireguard/import.go b/internal/services/wireguard/import.go index 8305ef0..ec6e02f 100644 --- a/internal/services/wireguard/import.go +++ b/internal/services/wireguard/import.go @@ -246,8 +246,8 @@ func parseWGConf(path string) (*parsedConf, error) { } out.Peers = append(out.Peers, *currentPeer) currentPeer = nil + nextName = "" } - nextName = "" } sc := bufio.NewScanner(f) diff --git a/management-ui/package.json b/management-ui/package.json index da15407..9b903bb 100644 --- a/management-ui/package.json +++ b/management-ui/package.json @@ -1,7 +1,7 @@ { "name": "edgeguard-management-ui", "private": true, - "version": "1.0.11", + "version": "1.0.12", "type": "module", "scripts": { "dev": "vite", diff --git a/management-ui/src/components/Layout/Sidebar.tsx b/management-ui/src/components/Layout/Sidebar.tsx index 7cac9df..ffa074c 100644 --- a/management-ui/src/components/Layout/Sidebar.tsx +++ b/management-ui/src/components/Layout/Sidebar.tsx @@ -2,7 +2,6 @@ import { NavLink } from 'react-router-dom' import type { ReactNode } from 'react' import { ApartmentOutlined, - BranchesOutlined, ClusterOutlined, DashboardOutlined, DatabaseOutlined, @@ -41,9 +40,10 @@ const NAV: NavSection[] = [ { labelKey: 'nav.section.routing', items: [ - { path: '/domains', labelKey: 'nav.domains', icon: }, - { path: '/backends', labelKey: 'nav.backends', icon: }, - { path: '/routing-rules', labelKey: 'nav.routing', icon: }, + { path: '/domains', labelKey: 'nav.domains', icon: }, + { path: '/backends', labelKey: 'nav.backends', icon: }, + // /routing-rules erreichbar via Domain-Modal "Pfad-Routing"-Tab — + // kein eigener Nav-Eintrag mehr (war für 90% der Setups overkill). ], }, { @@ -70,7 +70,7 @@ const NAV: NavSection[] = [ }, ] -const VERSION = '1.0.11' +const VERSION = '1.0.12' export default function Sidebar({ isOpen, onClose }: SidebarProps) { const { t } = useTranslation() diff --git a/management-ui/src/i18n/locales/de/common.json b/management-ui/src/i18n/locales/de/common.json index abcc058..0b9a624 100644 --- a/management-ui/src/i18n/locales/de/common.json +++ b/management-ui/src/i18n/locales/de/common.json @@ -179,6 +179,7 @@ }, "domains": { "title": "Domains", + "intro": "Verwalte FQDNs, die HAProxy terminiert. Optionales Primary-Backend als Catch-all; Pfad-Routing via Routing-Regeln.", "addDomain": "Domain hinzufügen", "editDomain": "Domain bearbeiten", "name": "Name", @@ -197,6 +198,7 @@ }, "backends": { "title": "Backends", + "intro": "Upstream-Server, an die HAProxy weiterroutet. Health-Check-Pfad optional aktiviert TCP+HTTP-Probes alle 5s.", "addBackend": "Backend hinzufügen", "editBackend": "Backend bearbeiten", "name": "Name", @@ -216,6 +218,7 @@ }, "routing": { "title": "Routing-Regeln", + "intro": "Pfad-Präfix → Backend-Mapping pro Domain. Niedrige Priority gewinnt; Catch-all per Domain.primary_backend.", "addRule": "Regel hinzufügen", "editRule": "Regel bearbeiten", "domain": "Domain", @@ -342,7 +345,54 @@ "pskOff": "kein PSK", "downloadConf": "wg-quick.conf herunterladen", "qrTitle": "WireGuard-QR", - "qrHint": "Mit der WireGuard-App (iOS/Android) scannen: \"Tunnel hinzufügen\" → \"QR-Code scannen\". Endpoint im Download-Conf bitte vor Verwendung anpassen." + "qrHint": "Mit der WireGuard-App (iOS/Android) scannen: \"Tunnel hinzufügen\" → \"QR-Code scannen\". Endpoint im Download-Conf bitte vor Verwendung anpassen.", + "online": "Online", + "offline": "Offline", + "traffic": "Traffic" + } + }, + "dashboard": { + "title": "Dashboard", + "welcomeHint": "EdgeGuard-Übersicht — Health, Counts, Live-Status der wichtigsten Dienste.", + "kpi": { + "domains": "Domains", + "backends": "Backends", + "ifaces": "Interfaces", + "fwRules": "FW-Regeln", + "natRules": "NAT-Regeln", + "wg": "WG-Verbindungen" + }, + "wgCard": { + "title": "WireGuard", + "empty": "Noch kein WG-Tunnel angelegt." + }, + "firewallCard": { + "title": "Firewall", + "zones": "Zonen", + "activeRules": "{{rules}} aktive Regeln · {{nat}} NAT" + }, + "sslCard": { + "title": "SSL-Zertifikate", + "total": "Verwaltete Zertifikate", + "expiringSoon": "{{count}} läuft bald ab (< 30 Tage)", + "allFresh": "Alle Zertifikate haben > 30 Tage Restlaufzeit." + }, + "clusterCard": { + "title": "Cluster", + "nodes": "Knoten" + }, + "routingCard": { + "title": "Routing", + "domains": "Domains", + "backends": "Backends", + "attached": "{{count}}/{{total}} Domains haben einen Primary-Backend" + }, + "systemCard": { + "title": "System", + "version": "Version", + "api": "API", + "ifaces": "Interfaces", + "wg": "WireGuard" } }, "common": { diff --git a/management-ui/src/i18n/locales/en/common.json b/management-ui/src/i18n/locales/en/common.json index 95fb1a2..5c947aa 100644 --- a/management-ui/src/i18n/locales/en/common.json +++ b/management-ui/src/i18n/locales/en/common.json @@ -179,6 +179,7 @@ }, "domains": { "title": "Domains", + "intro": "Manage FQDNs that HAProxy terminates. Optional primary backend as catch-all; path-based routing via routing rules.", "addDomain": "Add domain", "editDomain": "Edit domain", "name": "Name", @@ -197,6 +198,7 @@ }, "backends": { "title": "Backends", + "intro": "Upstream servers HAProxy proxies to. Optional health-check path enables TCP + HTTP probes every 5s.", "addBackend": "Add backend", "editBackend": "Edit backend", "name": "Name", @@ -216,6 +218,7 @@ }, "routing": { "title": "Routing rules", + "intro": "Path-prefix → backend mapping per domain. Lowest priority wins; catch-all via domain.primary_backend.", "addRule": "Add rule", "editRule": "Edit rule", "domain": "Domain", @@ -342,7 +345,54 @@ "pskOff": "no PSK", "downloadConf": "Download wg-quick.conf", "qrTitle": "WireGuard QR", - "qrHint": "Scan with the WireGuard app (iOS/Android): \"Add tunnel\" → \"Scan QR code\". Replace the Endpoint placeholder in the downloaded conf before use." + "qrHint": "Scan with the WireGuard app (iOS/Android): \"Add tunnel\" → \"Scan QR code\". Replace the Endpoint placeholder in the downloaded conf before use.", + "online": "Online", + "offline": "Offline", + "traffic": "Traffic" + } + }, + "dashboard": { + "title": "Dashboard", + "welcomeHint": "EdgeGuard overview — health, counts, live status of the major services.", + "kpi": { + "domains": "Domains", + "backends": "Backends", + "ifaces": "Interfaces", + "fwRules": "FW rules", + "natRules": "NAT rules", + "wg": "WG connections" + }, + "wgCard": { + "title": "WireGuard", + "empty": "No WG tunnel configured yet." + }, + "firewallCard": { + "title": "Firewall", + "zones": "Zones", + "activeRules": "{{rules}} active rules · {{nat}} NAT" + }, + "sslCard": { + "title": "SSL certificates", + "total": "Managed certificates", + "expiringSoon": "{{count}} expiring soon (< 30 days)", + "allFresh": "All certs have > 30 days remaining." + }, + "clusterCard": { + "title": "Cluster", + "nodes": "Nodes" + }, + "routingCard": { + "title": "Routing", + "domains": "Domains", + "backends": "Backends", + "attached": "{{count}}/{{total}} domains have a primary backend" + }, + "systemCard": { + "title": "System", + "version": "Version", + "api": "API", + "ifaces": "Interfaces", + "wg": "WireGuard" } }, "common": { diff --git a/management-ui/src/pages/Backends/index.tsx b/management-ui/src/pages/Backends/index.tsx index bac951d..0884b3b 100644 --- a/management-ui/src/pages/Backends/index.tsx +++ b/management-ui/src/pages/Backends/index.tsx @@ -1,9 +1,13 @@ import { useState } from 'react' -import { Button, Form, Input, InputNumber, Modal, Popconfirm, Select, Space, Switch, Tag, Typography, message } from 'antd' +import { Button, Form, Input, InputNumber, Modal, Select, Space, Switch, Tag, message } from 'antd' import type { ColumnsType } from 'antd/es/table' +import { DatabaseOutlined, PlusOutlined } from '@ant-design/icons' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useTranslation } from 'react-i18next' import DataTable from '../../components/DataTable' +import PageHeader from '../../components/PageHeader' +import ActionButtons from '../../components/ActionButtons' +import StatusDot from '../../components/StatusDot' import apiClient, { isEnvelope } from '../../api/client' @@ -165,12 +169,12 @@ export default function BackendsPage() { return {ds.map(d => {d.name})} }, }, - { title: t('backends.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => v ? t('common.yes') : t('common.no') }, + { title: t('backends.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => }, { - title: t('backends.actions'), key: 'actions', + title: t('common.actions'), key: 'actions', render: (_, row) => ( - - - del.mutate(row.id)} - > - - - + }} + onDelete={() => del.mutate(row.id)} + deleteConfirm={t('backends.deleteConfirm', { name: row.name })} + /> ), }, ] return (
- {t('backends.title')} - - + } + title={t('backends.title')} + subtitle={t('backends.intro')} + /> + } onClick={() => { + setCreating(true); form.resetFields() + form.setFieldsValue({ scheme: 'http', port: 8080, active: true }) + }}> + {t('backends.addBackend')} + + } + /> - {t('cluster.title')} - - {t('cluster.intro', { count: data?.nodes.length ?? 0 })} - - - + } + title={t('cluster.title')} + subtitle={t('cluster.intro', { count: data?.nodes.length ?? 0 })} + /> + +
) diff --git a/management-ui/src/pages/Domains/index.tsx b/management-ui/src/pages/Domains/index.tsx index 61daa0b..4cabcb3 100644 --- a/management-ui/src/pages/Domains/index.tsx +++ b/management-ui/src/pages/Domains/index.tsx @@ -1,9 +1,13 @@ import { useState } from 'react' -import { Button, Form, Input, Modal, Popconfirm, Select, Space, Switch, Tag, Typography, message } from 'antd' +import { Button, Form, Input, Modal, Select, Switch, Tag, message } from 'antd' import type { ColumnsType } from 'antd/es/table' +import { GlobalOutlined, PlusOutlined } from '@ant-design/icons' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useTranslation } from 'react-i18next' import DataTable from '../../components/DataTable' +import PageHeader from '../../components/PageHeader' +import ActionButtons from '../../components/ActionButtons' +import StatusDot from '../../components/StatusDot' import apiClient, { isEnvelope } from '../../api/client' @@ -103,22 +107,21 @@ export default function DomainsPage() { { title: t('domains.primaryBackend'), dataIndex: 'primary_backend_id', key: 'primary_backend_id', render: (id?: number | null) => { - if (!id) return {t('domains.noBackend')} + if (!id) return {t('domains.noBackend')} const b = backendById(id) return b ? {b.name} ({b.address}:{b.port}) : #{id} }, }, - { title: t('domains.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => v ? t('common.yes') : t('common.no') }, - { title: t('domains.httpToHttps'), dataIndex: 'http_to_https', key: 'http_to_https', render: (v: boolean) => v ? t('common.yes') : t('common.no') }, - { title: t('domains.hsts'), dataIndex: 'hsts_enabled', key: 'hsts', render: (v: boolean) => v ? t('common.yes') : t('common.no') }, + { title: t('domains.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => }, + { title: t('domains.httpToHttps'), dataIndex: 'http_to_https', key: 'http_to_https', render: (v: boolean) => }, + { title: t('domains.hsts'), dataIndex: 'hsts_enabled', key: 'hsts', render: (v: boolean) => }, { - title: t('domains.actions'), - key: 'actions', + title: t('common.actions'), key: 'actions', render: (_, row) => ( - - - del.mutate(row.id)} - > - - - + }} + onDelete={() => del.mutate(row.id)} + deleteConfirm={t('domains.deleteConfirm', { name: row.name })} + /> ), }, ] return (
- {t('domains.title')} - + } + title={t('domains.title')} + subtitle={t('domains.intro')} + /> } onClick={() => { + setCreating(true); form.resetFields() + form.setFieldsValue({ active: true, http_to_https: true, hsts_enabled: false }) + }}> + {t('domains.addDomain')} + + } /> - {t('fw.title')} - {t('fw.intro')} + } + title={t('fw.title')} + subtitle={t('fw.intro')} + />
) diff --git a/management-ui/src/pages/IPAddresses/index.tsx b/management-ui/src/pages/IPAddresses/index.tsx index 70f379b..553fe97 100644 --- a/management-ui/src/pages/IPAddresses/index.tsx +++ b/management-ui/src/pages/IPAddresses/index.tsx @@ -1,5 +1,9 @@ import { useState } from 'react' -import { Button, Card, Form, Input, InputNumber, Modal, Popconfirm, Select, Space, Switch, Table, Tag, Typography, message } from 'antd' +import { Button, Card, Form, Input, InputNumber, Modal, Select, Switch, Tag, Typography, message } from 'antd' +import { NodeIndexOutlined, PlusOutlined } from '@ant-design/icons' +import PageHeader from '../../components/PageHeader' +import ActionButtons from '../../components/ActionButtons' +import StatusDot from '../../components/StatusDot' import type { ColumnsType } from 'antd/es/table' import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query' import { useTranslation } from 'react-i18next' @@ -132,13 +136,13 @@ export default function IPAddressesPage() { ? VIP{row.vip_priority != null ? ` · prio ${row.vip_priority}` : ''} : '—', }, - { title: t('ips.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => v ? t('common.yes') : t('common.no') }, + { title: t('ips.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => }, { title: t('ips.description'), dataIndex: 'description', key: 'desc', render: (v?: string) => v ?? '—' }, { - title: t('ips.actions'), key: 'actions', + title: t('common.actions'), key: 'actions', render: (_, row) => ( - - - del.mutate(row.id)} - > - - - + }} + onDelete={() => del.mutate(row.id)} + deleteConfirm={t('ips.deleteConfirm', { addr: row.address })} + /> ), }, ] return (
- {t('ips.title')} - {t('ips.intro')} + } + title={t('ips.title')} + subtitle={t('ips.intro')} + /> - + {(sysAddrs ?? []).length === 0 ? — : ( @@ -184,13 +187,20 @@ export default function IPAddressesPage() { {t('ips.managedTitle')} - - + } onClick={() => { + setCreating(true); form.resetFields() + form.setFieldsValue({ prefix: 24, is_vip: false, active: true }) + }}> + {t('ips.addAddress')} + + } + /> {r.toUpperCase()}, }, { title: t('networks.mtu'), dataIndex: 'mtu', key: 'mtu', render: (v?: number) => v ?? '—' }, - { title: t('networks.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => v ? t('common.yes') : t('common.no') }, + { title: t('networks.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => }, { - title: t('networks.actions'), key: 'actions', + title: t('common.actions'), key: 'actions', render: (_, row) => ( - - - del.mutate(row.id)} - > - - - + }} + onDelete={() => del.mutate(row.id)} + deleteConfirm={t('networks.deleteConfirm', { name: row.name })} + /> ), }, ] return (
- {t('networks.title')} - {t('networks.intro')} + } + title={t('networks.title')} + subtitle={t('networks.intro')} + /> - + {(sys ?? []).map((i) => { const v4 = (i.addr_info ?? []).filter((a) => a.family === 'inet').map((a) => `${a.local}/${a.prefixlen}`) @@ -170,14 +173,20 @@ export default function NetworksPage() { - - - + } onClick={() => { + setCreating(true); form.resetFields() + form.setFieldsValue({ type: 'ethernet', role: 'lan', active: true }) + }}> + {t('networks.addInterface')} + + } + /> backendLabel(id) }, { title: t('routing.priority'), dataIndex: 'priority', key: 'priority' }, - { title: t('routing.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => v ? t('common.yes') : t('common.no') }, + { title: t('routing.active'), dataIndex: 'active', key: 'active', render: (v: boolean) => }, { - title: t('routing.actions'), key: 'actions', + title: t('common.actions'), key: 'actions', render: (_, row) => ( - - - del.mutate(row.id)} - > - - - + }} + onDelete={() => del.mutate(row.id)} + deleteConfirm={t('routing.deleteConfirm')} + /> ), }, ] return (
- {t('routing.title')} - - + } + title={t('routing.title')} + subtitle={t('routing.intro')} + /> + } onClick={() => { + setCreating(true); form.resetFields() + form.setFieldsValue({ priority: 100, path_prefix: '/', active: true }) + }}> + {t('routing.addRule')} + + } + /> ( - delMut.mutate(row.id)} - > - - + delMut.mutate(row.id)} + deleteConfirm={t('ssl.deleteConfirm', { domain: row.domain })} + /> ), }, ] @@ -187,8 +188,11 @@ export default function SSLPage() { return (
- {t('ssl.title')} - {t('ssl.intro')} + } + title={t('ssl.title')} + subtitle={t('ssl.intro')} + /> diff --git a/management-ui/src/pages/Settings/index.tsx b/management-ui/src/pages/Settings/index.tsx index 180cc0b..0e61f49 100644 --- a/management-ui/src/pages/Settings/index.tsx +++ b/management-ui/src/pages/Settings/index.tsx @@ -1,8 +1,10 @@ -import { Card, Descriptions, Spin, Typography } from 'antd' +import { Card, Descriptions, Spin } from 'antd' +import { SettingOutlined } from '@ant-design/icons' import { useQuery } from '@tanstack/react-query' import { useTranslation } from 'react-i18next' import apiClient, { isEnvelope } from '../../api/client' +import PageHeader from '../../components/PageHeader' interface SetupStatus { completed: boolean @@ -42,17 +44,20 @@ export default function SettingsPage() { return (
- {t('settings.title')} - {t('settings.intro')} + } + title={t('settings.title')} + subtitle={t('settings.intro')} + /> - + {health?.version ?? '—'} {health?.status ?? '—'} - + {setupStatus?.admin_email ?? '—'} {setupStatus?.fqdn ?? '—'} diff --git a/management-ui/src/pages/Wireguard/Servers.tsx b/management-ui/src/pages/Wireguard/Servers.tsx index 4797259..c22d4ca 100644 --- a/management-ui/src/pages/Wireguard/Servers.tsx +++ b/management-ui/src/pages/Wireguard/Servers.tsx @@ -56,6 +56,36 @@ async function listPeers(ifaceID: number): Promise { return (r.data.data as { peers?: WGPeer[] }).peers ?? [] } +interface LiveStatusRow { + interface: string + peer_public_key: string + endpoint?: string + last_handshake_unix: number + transfer_rx: number + transfer_tx: number +} +async function listLiveStatus(): Promise { + const r = await apiClient.get('/wireguard/status') + if (!isEnvelope(r.data)) return [] + return (r.data.data as { status?: LiveStatusRow[] }).status ?? [] +} + +function fmtBytes(n: number): string { + if (n < 1024) return `${n} B` + const u = ['KiB', 'MiB', 'GiB', 'TiB'] + let v = n / 1024, i = 0 + while (v >= 1024 && i < u.length - 1) { v /= 1024; i++ } + return `${v.toFixed(1)} ${u[i]}` +} +function relTime(unix: number, never: string): string { + if (!unix) return never + const sec = Math.max(0, Math.floor(Date.now() / 1000) - unix) + if (sec < 60) return `vor ${sec}s` + if (sec < 3600) return `vor ${Math.floor(sec / 60)}m` + if (sec < 86400) return `vor ${Math.floor(sec / 3600)}h` + return `vor ${Math.floor(sec / 86400)}d` +} + interface FwZoneLite { name: string; builtin: boolean } async function listZones(): Promise { const r = await apiClient.get('/firewall/zones') @@ -270,6 +300,14 @@ function PeerDrawer({ iface, onClose }: PeerDrawerProps) { queryFn: () => listPeers(ifaceID), enabled: open, }) + const { data: liveStatus } = useQuery({ + queryKey: ['wg', 'status'], + queryFn: listLiveStatus, + enabled: open, + refetchInterval: 10_000, + }) + const liveByPubkey = (live: LiveStatusRow[] | undefined, pk: string) => + (live ?? []).find(s => s.peer_public_key === pk) const [editing, setEditing] = useState(null) const [creating, setCreating] = useState(false) @@ -302,8 +340,32 @@ function PeerDrawer({ iface, onClose }: PeerDrawerProps) { render: (k: string) => {k.slice(0, 12)}…, }, { - title: t('wg.peer.lastHandshake'), dataIndex: 'last_handshake', key: 'last_handshake', - render: (s?: string | null) => s ? new Date(s).toLocaleString() : {t('wg.peer.never')}, + title: t('wg.peer.lastHandshake'), key: 'last_handshake', + render: (_, row) => { + const live = liveByPubkey(liveStatus, row.public_key) + const online = live && live.last_handshake_unix > 0 + && Date.now() / 1000 - live.last_handshake_unix < 180 + return ( + + + + {live ? relTime(live.last_handshake_unix, t('wg.peer.never')) : t('wg.peer.never')} + + + ) + }, + }, + { + title: t('wg.peer.traffic'), key: 'traffic', + render: (_, row) => { + const live = liveByPubkey(liveStatus, row.public_key) + if (!live) return '—' + return ▼{fmtBytes(live.transfer_rx)} ▲{fmtBytes(live.transfer_tx)} + }, }, { title: t('common.active'), dataIndex: 'enabled', key: 'enabled', render: (v: boolean) => }, { diff --git a/packaging/debian/edgeguard-api/DEBIAN/postinst b/packaging/debian/edgeguard-api/DEBIAN/postinst index bc6e34c..9c46efe 100755 --- a/packaging/debian/edgeguard-api/DEBIAN/postinst +++ b/packaging/debian/edgeguard-api/DEBIAN/postinst @@ -45,6 +45,8 @@ edgeguard ALL=(root) NOPASSWD: /usr/bin/systemctl stop wg-quick@*.service edgeguard ALL=(root) NOPASSWD: /bin/systemctl start wg-quick@*.service edgeguard ALL=(root) NOPASSWD: /bin/systemctl restart wg-quick@*.service edgeguard ALL=(root) NOPASSWD: /bin/systemctl stop wg-quick@*.service +edgeguard ALL=(root) NOPASSWD: /usr/bin/wg show all dump +edgeguard ALL=(root) NOPASSWD: /usr/bin/wg show * SUDOERS chmod 0440 /etc/sudoers.d/edgeguard