Skip to contentSkip to conversation

wg syncconf not clearing PresharedKey/PersistentKeepalive

PATCH New Andreas Weigel 1 participant 2 messages Apr 24, 2022

lore
Share & tools
lore
#0 lore raw

cover wg syncconf not clearing PresharedKey/PersistentKeepalive

Hi,

I noticed that wg syncconf does not actually clear PresharedKey and PersistentKeepalive values if those are not set in the file but set in the running config. The proposed patch changes that to always clear those if they are not set in the configuration file, which imho is the correct behavior.

Andreas

Andreas Weigel (1):
wg syncconf: explicitly reset PresharedKey/PersistentKeepalive

 src/setconf.c | 8 ++++++++
 1 file changed, 8 insertions(+)
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 wg syncconf: explicitly reset PresharedKey/PersistentKeepalive

make wg syncconf correctly clear a preshared key or keepalive in case the file config does not define those; currently syncconf does not change these settings at all if runtime has them set but file does not

---
 src/setconf.c | 8 ++++++++
 1 file changed, 8 insertions(+)
src/setconf.c +8 -0
index bfd0a3a..8661a92 100644
@@ -63,6 +63,14 @@ static bool sync_conf(struct wgdevice *file)
 	}
 
 	for_each_wgpeer(file, peer) {
+		if (!(peer->flags & WGPEER_HAS_PRESHARED_KEY)) {
+			memset(peer->preshared_key, 0, WG_KEY_LEN);
+			peer->flags |= WGPEER_HAS_PRESHARED_KEY;
+		}
+		if (!(peer->flags & WGPEER_HAS_PERSISTENT_KEEPALIVE_INTERVAL)) {
+			peer->persistent_keepalive_interval = 0;
+			peer->flags |= WGPEER_HAS_PERSISTENT_KEEPALIVE_INTERVAL;
+		}
 		pubkeys[i].pubkey = peer->public_key;
 		pubkeys[i].from_file = true;
 		++i;
Signature · 1 line
2.25.1