fosrl/newt
1
0
Fork 0
mirror of https://github.com/fosrl/newt.git synced 2025-05-13 13:40:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Properly handle key

Browse source
This commit is contained in:
Owen 2025-02-21 18:04:36 -05:00
parent 18d99de924
commit 0affef401c
No known key found for this signature in database
GPG key ID: 8271FDFFD9E0CCBD
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wg/wg.go
View file

@ -16,7 +16,6 @@ import (
) )
type WgConfig struct { type WgConfig struct {
PrivateKey string `json:"privateKey"`
ListenPort int `json:"listenPort"` ListenPort int `json:"listenPort"`
IpAddress string `json:"ipAddress"` IpAddress string `json:"ipAddress"`
Peers []Peer `json:"peers"` Peers []Peer `json:"peers"`
@ -125,7 +124,7 @@ func (s *WireGuardService) LoadRemoteConfig() error {
func (s *WireGuardService) handleConfig(msg websocket.WSMessage) { func (s *WireGuardService) handleConfig(msg websocket.WSMessage) {
var config WgConfig var config WgConfig
logger.Info("Received WireGuard configuration") logger.Info("Received message: %v", msg)
jsonData, err := json.Marshal(msg.Data) jsonData, err := json.Marshal(msg.Data)
if err != nil { if err != nil {
@ -137,9 +136,7 @@ func (s *WireGuardService) handleConfig(msg websocket.WSMessage) {
logger.Info("Error unmarshaling target data: %v", err) logger.Info("Error unmarshaling target data: %v", err)
return return
} }
s.config = config s.config = config
logger.Info("Config: %v", s.config)
// Ensure the WireGuard interface and peers are configured // Ensure the WireGuard interface and peers are configured
if err := s.ensureWireguardInterface(config); err != nil { if err := s.ensureWireguardInterface(config); err != nil {
@ -184,7 +181,7 @@ func (s *WireGuardService) ensureWireguardInterface(wgconfig WgConfig) error {
} }
// Parse the private key // Parse the private key
key, err := wgtypes.ParseKey(wgconfig.PrivateKey) key, err := wgtypes.ParseKey(s.key.String())
if err != nil { if err != nil {
return fmt.Errorf("failed to parse private key: %v", err) return fmt.Errorf("failed to parse private key: %v", err)
} }