Scope client management and config-apply per server (step 4)
Real per-server data isolation, the core ask behind the access-control
work: clients, config generation, and the client-management UI are now
scoped by server ID instead of implicitly operating on one global
"the server".
- util.DefaultServerID ("wg0") is the server every legacy bare route
now resolves to, so old and new routes share one consistent identity
instead of drifting apart.
- New /servers/:id/... routes (new-client, update-client, remove-client,
set-status, download, api/clients, api/client/:cid, api/apply-wg-config)
reuse the same handlers as the legacy routes via resolveServerID(c),
gated by RequireServerAccess middleware. Cross-server edits/deletes on
scoped routes are rejected (403) if a client belongs to a different
server.
- Fixes a real data leak: ApplyServerConfig previously wrote ALL clients
from ALL servers into whichever single wg.conf it targeted. It now
filters clients by server ID before generating a config, and resolves
each server's own ConfigFilePath/EndpointAddress via the new
ServerSetting record instead of the app-wide GlobalSetting.
- WireGuardServerInterfaces/WireGuardServerKeyPair/GlobalSettingSubmit
(the legacy /wg-server and /global-settings edit routes) now write
through to the new per-server registry record for "wg0" in addition
to the legacy collection, so the two stay in sync until the legacy
routes are eventually retired.
- New templates/server_clients.html: per-server clone of clients.html
wired to the scoped endpoints, with a server name/id heading.
- base.html's shared "New Client" and "Apply Config" actions (used by
every page's nav buttons) now target the scoped route when a
serverID is present on the page, instead of always hitting the
legacy default-server endpoint regardless of which server's client
page is open.
Legacy bare routes (/, /new-client, /wg-server, ...) are untouched and
still fully functional against the default "wg0" server - nothing was
removed yet, per the incremental-delivery approach for this project.
This commit is contained in:
+33
-1
@@ -21,7 +21,7 @@ import (
|
||||
|
||||
// legacyDefaultServerID is the synthetic ID assigned to a pre-existing
|
||||
// single-server installation when it is migrated to the multi-server layout.
|
||||
const legacyDefaultServerID = "wg0"
|
||||
const legacyDefaultServerID = util.DefaultServerID
|
||||
|
||||
type JsonDB struct {
|
||||
conn *scribble.Driver
|
||||
@@ -557,6 +557,38 @@ func (o *JsonDB) SaveHashes(hashes model.ClientServerHashes) error {
|
||||
return output
|
||||
}
|
||||
|
||||
// UpdateServerInterface func updates the Interface of an existing server
|
||||
func (o *JsonDB) UpdateServerInterface(serverID string, serverInterface model.ServerInterface) error {
|
||||
if err := validateServerID(serverID); err != nil {
|
||||
return err
|
||||
}
|
||||
server, err := o.GetServerByID(serverID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
server.Interface = &serverInterface
|
||||
if err := o.conn.Write("servers", serverID, server); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.ManagePerms(path.Join(o.dbPath, "servers", serverID+".json"))
|
||||
}
|
||||
|
||||
// UpdateServerKeyPair func updates the KeyPair of an existing server
|
||||
func (o *JsonDB) UpdateServerKeyPair(serverID string, serverKeyPair model.ServerKeypair) error {
|
||||
if err := validateServerID(serverID); err != nil {
|
||||
return err
|
||||
}
|
||||
server, err := o.GetServerByID(serverID)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
server.KeyPair = &serverKeyPair
|
||||
if err := o.conn.Write("servers", serverID, server); err != nil {
|
||||
return err
|
||||
}
|
||||
return util.ManagePerms(path.Join(o.dbPath, "servers", serverID+".json"))
|
||||
}
|
||||
|
||||
// GetServers func to get all servers from the database
|
||||
func (o *JsonDB) GetServers() ([]model.Server, error) {
|
||||
var servers []model.Server
|
||||
|
||||
Reference in New Issue
Block a user