sysopsandClaude Sonnet 5
388a8377cd
Redact the private key from the /servers/:id/keypair response body - the UI never rendered it, but the raw key was still returned over the wire (json:"private_key,omitempty" plus explicit clearing before the JSON response). Add a new import flow: an admin can upload an OPNsense config.xml, preview the WireGuard servers/clients it defines (editable before committing), and confirm to create the corresponding Server/ServerSetting/Client records. Nothing is auto-applied - no wg-quick/systemctl call happens, matching the existing manual "Apply" step for regular server management. Schema verified against OPNsense core (WireGuard has been in core since 22.1, not a plugin) - see opnsense/parse.go for the confirmed tag reference. Public keys are always re-derived from private keys rather than trusted from the export; client public-key collisions against existing store data are skipped and reported per-batch rather than aborting the whole import. Since OPNsense stores DNS/MTU per-server and keepalive per-client, but this fork only had those app-wide (GlobalSetting), extended ServerSetting with DNSServers/MTU and Client with PersistentKeepalive as optional overrides that fall back to the global default when unset - existing single-server behavior is unchanged when the override is empty/zero. Manual UI editing of the per-client keepalive override outside the import flow is left for a later pass. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_019VjwLYRA87o8m9a9zztgs3
39 lines
1.6 KiB
Go
39 lines
1.6 KiB
Go
package model
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
// GlobalSetting model
|
|
type GlobalSetting struct {
|
|
EndpointAddress string `json:"endpoint_address"`
|
|
DNSServers []string `json:"dns_servers"`
|
|
MTU int `json:"mtu,string"`
|
|
PersistentKeepalive int `json:"persistent_keepalive,string"`
|
|
FirewallMark string `json:"firewall_mark"`
|
|
Table string `json:"table"`
|
|
ConfigFilePath string `json:"config_file_path"`
|
|
UpdatedAt time.Time `json:"updated_at"`
|
|
}
|
|
|
|
// ServerSetting model holds the per-server-interface subset of settings
|
|
// that used to live in the single global GlobalSetting. Introduced for the
|
|
// multi-server extension; not yet wired into store/handler layers.
|
|
type ServerSetting struct {
|
|
EndpointAddress string `json:"endpoint_address"`
|
|
FirewallMark string `json:"firewall_mark"`
|
|
Table string `json:"table"`
|
|
ConfigFilePath string `json:"config_file_path"`
|
|
// LanInterface is optional: the local interface (e.g. "eth0", "br-lan")
|
|
// this server's WireGuard traffic should be allowed to forward to/from.
|
|
// Only used to generate the nftables ruleset preview; left empty means
|
|
// the preview only covers the WireGuard interface itself.
|
|
LanInterface string `json:"lan_interface,omitempty"`
|
|
// DNSServers and MTU are optional per-server overrides of the app-wide
|
|
// GlobalSetting.DNSServers/GlobalSetting.MTU. Leave empty/zero to fall
|
|
// back to the global default (see handler.buildEffectiveSettings).
|
|
DNSServers []string `json:"dns_servers,omitempty"`
|
|
MTU int `json:"mtu,omitempty"`
|
|
UpdatedAt time.Time `json:"updated_at"`
|
|
}
|