pangolin_mirror/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2026-02-08 05:56:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update logger to take in when initing

Browse Source
This commit is contained in:
Owen
2025-11-17 21:49:07 -05:00
parent 82a999eb87
commit 75e666c396
3 changed files with 64 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
clients/clients.go
View File

@@ -29,9 +29,9 @@ import (
)
type WgConfig struct {
IpAddress string `json:"ipAddress"`
Peers []Peer `json:"peers"`
// Targets []Target `json:"targets"`
IpAddress string `json:"ipAddress"`
Peers []Peer `json:"peers"`
Targets []Target `json:"targets"`
}
type Target struct {
@@ -181,6 +181,7 @@ func NewWireGuardService(interfaceName string, mtu int, generateAndSaveKeyTo str
wsClient.RegisterHandler("newt/wg/peer/update", service.handleUpdatePeer)
wsClient.RegisterHandler("newt/wg/target/add", service.handleAddTarget)
wsClient.RegisterHandler("newt/wg/target/remove", service.handleRemoveTarget)
wsClient.RegisterHandler("newt/wg/target/update", service.handleUpdateTarget)
return service, nil
}
@@ -866,6 +867,60 @@ func (s *WireGuardService) handleAddTarget(msg websocket.WSMessage) {
logger.Info("Added target subnet %s with port ranges: %v", target.CIDR, target.PortRange)
}
func (s *WireGuardService) handleUpdateTarget(msg websocket.WSMessage) {
logger.Debug("Received message: %v", msg.Data)
// you are going to get a oldTarget and a newTarget in the message
type UpdateTargetRequest struct {
OldTarget Target `json:"oldTarget"`
NewTarget Target `json:"newTarget"`
}
jsonData, err := json.Marshal(msg.Data)
if err != nil {
logger.Info("Error marshaling data: %v", err)
return
}
var request UpdateTargetRequest
if err := json.Unmarshal(jsonData, &request); err != nil {
logger.Info("Error unmarshaling data: %v", err)
return
}
if s.tnet == nil {
logger.Info("Netstack not initialized")
return
}
prefix, err := netip.ParsePrefix(request.OldTarget.CIDR)
if err != nil {
logger.Info("Invalid CIDR %s: %v", request.OldTarget.CIDR, err)
return
}
s.tnet.RemoveProxySubnetRule(prefix)
// Now add the new target
newPrefix, err := netip.ParsePrefix(request.NewTarget.CIDR)
if err != nil {
logger.Info("Invalid CIDR %s: %v", request.NewTarget.CIDR, err)
return
}
var portRanges []netstack2.PortRange
for _, pr := range request.NewTarget.PortRange {
portRanges = append(portRanges, netstack2.PortRange{
Min: pr.Min,
Max: pr.Max,
})
}
s.tnet.AddProxySubnetRule(newPrefix, portRanges)
logger.Info("Updated target subnet from %s to %s", request.OldTarget.CIDR, request.NewTarget.CIDR)
}
func (s *WireGuardService) handleRemoveTarget(msg websocket.WSMessage) {
logger.Debug("Received message: %v", msg.Data)