summaryrefslogtreecommitdiff
path: root/src/conf_mode
diff options
context:
space:
mode:
authoraapostoliuk <a.apostoliuk@vyos.io>2023-11-24 16:21:37 +0200
committeraapostoliuk <a.apostoliuk@vyos.io>2023-11-24 16:57:10 +0200
commit2c1c3613567e23e14ce89bbf872e6e9dee16badb (patch)
tree0c24ff28f6bd22507cdce5c5234a68aacb5599a6 /src/conf_mode
parentd026297e12e097bc1d178e320fa4f1a93ee37926 (diff)
downloadvyos-1x-2c1c3613567e23e14ce89bbf872e6e9dee16badb.tar.gz
vyos-1x-2c1c3613567e23e14ce89bbf872e6e9dee16badb.zip
wireguard: T5413: Blocked adding the peer with the router's public key
Disabled adding the peer with the same public key as the router has. Backport from current https://github.com/vyos/vyos-1x/pull/2122
Diffstat (limited to 'src/conf_mode')
-rwxr-xr-xsrc/conf_mode/interfaces-wireguard.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/conf_mode/interfaces-wireguard.py b/src/conf_mode/interfaces-wireguard.py
index b28aa9568..5748bf483 100755
--- a/src/conf_mode/interfaces-wireguard.py
+++ b/src/conf_mode/interfaces-wireguard.py
@@ -1,6 +1,6 @@
#!/usr/bin/env python3
#
-# Copyright (C) 2018-2020 VyOS maintainers and contributors
+# Copyright (C) 2018-2023 VyOS maintainers and contributors
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 2 or later as
@@ -28,6 +28,7 @@ from vyos.configverify import verify_bridge_delete
from vyos.configverify import verify_mtu_ipv6
from vyos.configverify import verify_bond_bridge_member
from vyos.ifconfig import WireGuardIf
+from vyos.validate import is_wireguard_key_pair
from vyos.util import check_kmod
from vyos import ConfigError
from vyos import airbag
@@ -94,6 +95,11 @@ def verify(wireguard):
raise ConfigError('Both Wireguard port and address must be defined '
f'for peer "{tmp}" if either one of them is set!')
+ if 'disable' not in peer:
+ with open(wireguard['private_key'], 'r') as file:
+ private_key = file.read().rstrip()
+ if is_wireguard_key_pair(private_key, peer['pubkey']):
+ raise ConfigError(f'Peer "{tmp}" has the same public key as the interface "{wireguard["ifname"]}"')
def apply(wireguard):
tmp = WireGuardIf(wireguard['ifname'])
if 'deleted' in wireguard: