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
33 lines
877 B
Go
33 lines
877 B
Go
package model
|
|
|
|
import (
|
|
"time"
|
|
)
|
|
|
|
// Server model
|
|
type Server struct {
|
|
ID string `json:"id,omitempty"`
|
|
Name string `json:"name,omitempty"`
|
|
KeyPair *ServerKeypair
|
|
Interface *ServerInterface
|
|
}
|
|
|
|
// ServerKeypair model
|
|
type ServerKeypair struct {
|
|
PrivateKey string `json:"private_key,omitempty"`
|
|
PublicKey string `json:"public_key"`
|
|
UpdatedAt time.Time `json:"updated_at"`
|
|
}
|
|
|
|
// ServerInterface model
|
|
type ServerInterface struct {
|
|
Name string `json:"name,omitempty"` // OS interface name, e.g. wg0
|
|
Addresses []string `json:"addresses"`
|
|
ListenPort int `json:"listen_port,string"` // ,string to get listen_port string input as int
|
|
UpdatedAt time.Time `json:"updated_at"`
|
|
PreUp string `json:"pre_up"`
|
|
PostUp string `json:"post_up"`
|
|
PreDown string `json:"pre_down"`
|
|
PostDown string `json:"post_down"`
|
|
}
|