zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-10-08 10:11:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix UpdateWgPeers

Browse Source
This commit is contained in:
Matthew R Kasun
2022-01-19 15:00:03 -05:00
parent fc86015c29
commit 353c92e333
3 changed files with 54 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
netclient/wireguard/common.go
View File

@@ -327,8 +327,12 @@ func WriteWgConfig(cfg config.ClientConfig, privateKey string, peers []wgtypes.P
}
if peer.AllowedIPs != nil {
var allowedIPs string
for _, ip := range peer.AllowedIPs {
allowedIPs = allowedIPs + ", " + ip.String()
for i, ip := range peer.AllowedIPs {
if i == 0 {
allowedIPs = ip.String()
} else {
allowedIPs = allowedIPs + ", " + ip.String()
}
}
wireguard.SectionWithIndex(section_peers, i).Key("AllowedIps").SetValue(allowedIPs)
}
@@ -344,21 +348,27 @@ func WriteWgConfig(cfg config.ClientConfig, privateKey string, peers []wgtypes.P
// UpdateWgPeers - updates the peers of a network
func UpdateWgPeers(wgInterface string, peers []wgtypes.PeerConfig) error {
//update to get path properly
file := ncutils.GetNetclientPathSpecific() + wgInterface + ".conf"
ncutils.Log("updating " + file)
wireguard, err := ini.ShadowLoad(file)
if err != nil {
return err
}
//delete the peers sections as they are going to be replaced
wireguard.DeleteSection(section_peers)
for i, peer := range peers {
wireguard.SectionWithIndex(section_peers, i).Key("PublicKey").SetValue(peer.PublicKey.String())
if peer.PresharedKey.String() != "" {
wireguard.SectionWithIndex(section_peers, i).Key("PreSharedKey").SetValue(peer.PresharedKey.String())
}
//if peer.PresharedKey.String() != "" {
//wireguard.SectionWithIndex(section_peers, i).Key("PreSharedKey").SetValue(peer.PresharedKey.String())
//}
if peer.AllowedIPs != nil {
var allowedIPs string
for _, ip := range peer.AllowedIPs {
allowedIPs = allowedIPs + ", " + ip.String()
for i, ip := range peer.AllowedIPs {
if i == 0 {
allowedIPs = ip.String()
} else {
allowedIPs = allowedIPs + ", " + ip.String()
}
}
wireguard.SectionWithIndex(section_peers, i).Key("AllowedIps").SetValue(allowedIPs)
}