diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-04-09 10:52:52 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-09 10:52:52 +0200 |
| commit | 52efbd8f0e1b13ccbe4c623d17171a94d51186d2 (patch) | |
| tree | bd14f6b04a0650f2ec67965fdff035e54e9c9720 /test | |
| parent | 56d939e044d5cd009deb9fcd05d37c61c3a9949a (diff) | |
| parent | 78bb2866fd040b3810a664e92a9a950c391d0a04 (diff) | |
| download | systemd-52efbd8f0e1b13ccbe4c623d17171a94d51186d2.tar.gz | |
Merge pull request #12223 from yuwata/network-wireguard-preshared-key-file
network: add PresharedKeyFile= setting and make reading key file failure fatal
Diffstat (limited to 'test')
5 files changed, 10 insertions, 2 deletions
diff --git a/test/fuzz/fuzz-netdev-parser/directives.netdev b/test/fuzz/fuzz-netdev-parser/directives.netdev index e0756dc755..7da3955af6 100644 --- a/test/fuzz/fuzz-netdev-parser/directives.netdev +++ b/test/fuzz/fuzz-netdev-parser/directives.netdev @@ -52,6 +52,7 @@ Name= [WireGuardPeer] Endpoint= PresharedKey= +PresharedKeyFile= PersistentKeepalive= PublicKey= AllowedIPs= diff --git a/test/test-network/conf/25-wireguard-preshared-key.txt b/test/test-network/conf/25-wireguard-preshared-key.txt new file mode 100644 index 0000000000..021c443aba --- /dev/null +++ b/test/test-network/conf/25-wireguard-preshared-key.txt @@ -0,0 +1,3 @@ +cPLOy1YUrEI0EM + MIycPJmOo0aTu3RZnw8bL5 + meVD6m0= diff --git a/test/test-network/conf/25-wireguard.netdev b/test/test-network/conf/25-wireguard.netdev index 61afd1f5e7..4866c31cca 100644 --- a/test/test-network/conf/25-wireguard.netdev +++ b/test/test-network/conf/25-wireguard.netdev @@ -4,7 +4,6 @@ Kind=wireguard [WireGuard] PrivateKey=EEGlnEPYJV//kbvvIqxKkQwOiS+UENyPncC4bF46ong= -PrivateKeyFile=/run/systemd/network/not-exist ListenPort=51820 FwMark=1234 diff --git a/test/test-network/conf/25-wireguard.netdev.d/peer.conf b/test/test-network/conf/25-wireguard.netdev.d/peer.conf index 7ba692378e..f559ea68f6 100644 --- a/test/test-network/conf/25-wireguard.netdev.d/peer.conf +++ b/test/test-network/conf/25-wireguard.netdev.d/peer.conf @@ -2,3 +2,4 @@ PublicKey=lsDtM3AbjxNlauRKzHEPfgS1Zp7cp/VX5Use/P4PQSc= AllowedIPs=fdbc:bae2:7871:0500:e1fe:0793:8636:dad1/128 AllowedIPs=fdbc:bae2:7871:e1fe:0793:8636::/96 +PresharedKeyFile=/run/systemd/network/25-wireguard-preshared-key.txt diff --git a/test/test-network/systemd-networkd-tests.py b/test/test-network/systemd-networkd-tests.py index ffc63d0838..b44cfe8d45 100755 --- a/test/test-network/systemd-networkd-tests.py +++ b/test/test-network/systemd-networkd-tests.py @@ -307,6 +307,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): '25-vxlan.netdev', '25-wireguard-23-peers.netdev', '25-wireguard-23-peers.network', + '25-wireguard-preshared-key.txt', '25-wireguard-private-key.txt', '25-wireguard.netdev', '25-wireguard.network', @@ -528,7 +529,7 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): def test_wireguard(self): self.copy_unit_to_networkd_unit_path('25-wireguard.netdev', '25-wireguard.network', '25-wireguard-23-peers.netdev', '25-wireguard-23-peers.network', - '25-wireguard-private-key.txt') + '25-wireguard-preshared-key.txt', '25-wireguard-private-key.txt') self.start_networkd(0) self.wait_online(['wg99:carrier', 'wg98:routable']) @@ -551,6 +552,9 @@ class NetworkdNetDevTests(unittest.TestCase, Utilities): self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA=\t192.168.27.3:51820') output = subprocess.check_output(['wg', 'show', 'wg99', 'private-key']).rstrip().decode('utf-8') self.assertTrue(output, 'EEGlnEPYJV//kbvvIqxKkQwOiS+UENyPncC4bF46ong=') + output = subprocess.check_output(['wg', 'show', 'wg99', 'preshared-keys']).rstrip().decode('utf-8') + self.assertTrue(output, 'RDf+LSpeEre7YEIKaxg+wbpsNV7du+ktR99uBEtIiCA= IIWIV17wutHv7t4cR6pOT91z6NSz/T8Arh0yaywhw3M=') + self.assertTrue(output, 'lsDtM3AbjxNlauRKzHEPfgS1Zp7cp/VX5Use/P4PQSc= cPLOy1YUrEI0EMMIycPJmOo0aTu3RZnw8bL5meVD6m0=') output = subprocess.check_output(['wg', 'show', 'wg98', 'private-key']).rstrip().decode('utf-8') self.assertTrue(output, 'CJQUtcS9emY2fLYqDlpSZiE/QJyHkPWr+WHtZLZ90FU=') |