Bladeren bron

pkg/mesh: respect allowed location IPs in peers

Currently, when rendering the configuration for a Peer, the allowed
location configs of any segment are erroneously ignored, meaning that an
administrator will have to manually edit the configuration to get the
expected behavior from a Peer. This commit fixes the generation of the
configuration.

Signed-off-by: Lucas Servén Marín <lserven@gmail.com>
Lucas Servén Marín 4 jaren geleden
bovenliggende
commit
df8d2cb68f
1 gewijzigde bestanden met toevoegingen van 1 en 1 verwijderingen
  1. 1 1
      pkg/mesh/topology.go

+ 1 - 1
pkg/mesh/topology.go

@@ -371,7 +371,7 @@ func (t *Topology) PeerConf(name string) *wireguard.Conf {
 	for _, s := range t.segments {
 	for _, s := range t.segments {
 		peer := wireguard.Peer{
 		peer := wireguard.Peer{
 			PeerConfig: wgtypes.PeerConfig{
 			PeerConfig: wgtypes.PeerConfig{
-				AllowedIPs:                  s.allowedIPs,
+				AllowedIPs:                  append(s.allowedIPs, s.allowedLocationIPs...),
 				PersistentKeepaliveInterval: pka,
 				PersistentKeepaliveInterval: pka,
 				PresharedKey:                psk,
 				PresharedKey:                psk,
 				PublicKey:                   s.key,
 				PublicKey:                   s.key,