From 812eea9a3a20afebc20b374a30ceac7f0d87c9b4 Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 14 Dec 2025 18:41:08 +0100 Subject: ssh: T8098: remove support for deprecated "rijndael-cbc@lysator.liu.se" cipher According to an Arch Linux forum discussion, the cipher rijndael-cbc@lysator.liu.se was removed in OpenSSH 6.7. References: - https://bbs.archlinux.org/viewtopic.php?id=188613 - https://www.openssh.org/txt/release-6.7 - https://github.com/openssh/openssh-portable/commit/03e93c753d7c223063a --- src/migration-scripts/ssh/2-to-3 | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 src/migration-scripts/ssh/2-to-3 (limited to 'src/migration-scripts/ssh') diff --git a/src/migration-scripts/ssh/2-to-3 b/src/migration-scripts/ssh/2-to-3 new file mode 100644 index 000000000..e18a6aa05 --- /dev/null +++ b/src/migration-scripts/ssh/2-to-3 @@ -0,0 +1,31 @@ +# Copyright VyOS maintainers and contributors +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this library. If not, see . + +# T8098: rijndael-cbc@lysator.liu.se was removed in OpenSSH 6.7 which is used +# starting with VyOS 1.4 + +from vyos.configtree import ConfigTree + +base = ['service', 'ssh'] + +def migrate(config: ConfigTree) -> None: + if not config.exists(base + ['ciphers']): + # Nothing to do + return + + deprecated_cipher = 'rijndael-cbc@lysator.liu.se' + for cipher in config.return_values(base + ['ciphers']): + if cipher == deprecated_cipher: + config.delete_value(base + ['ciphers'], value=deprecated_cipher) -- cgit v1.2.3 From ef13a6319a21c8030301aeebbeabf5148adb994c Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Sun, 14 Dec 2025 18:58:00 +0100 Subject: ssh: T8098: rename "ciphers" CLI node to "cipher" Follow VyOS CLI best practices for using singular whenever possible to build a CLI node. As we introduce a new migration 2 -> 3 for SSH we can correct this minor detail. --- data/templates/ssh/sshd_config.j2 | 6 +++--- interface-definitions/service_ssh.xml.in | 2 +- smoketest/configs/assert/basic-vyos | 8 ++++---- smoketest/scripts/cli/test_service_ssh.py | 2 +- src/migration-scripts/ssh/2-to-3 | 20 ++++++++++++++------ 5 files changed, 23 insertions(+), 15 deletions(-) (limited to 'src/migration-scripts/ssh') diff --git a/data/templates/ssh/sshd_config.j2 b/data/templates/ssh/sshd_config.j2 index 1315bf2cb..d5d155340 100644 --- a/data/templates/ssh/sshd_config.j2 +++ b/data/templates/ssh/sshd_config.j2 @@ -57,9 +57,9 @@ ListenAddress {{ address }} {% endfor %} {% endif %} -{% if ciphers is vyos_defined %} -# Specifies the ciphers allowed for protocol version 2 -Ciphers {{ ciphers | join(',') }} +{% if cipher is vyos_defined %} +# Specifies allowed ciphers for protocol version 2 +Ciphers {{ cipher | join(',') }} {% endif %} {% if hostkey_algorithm is vyos_defined %} diff --git a/interface-definitions/service_ssh.xml.in b/interface-definitions/service_ssh.xml.in index 4d10de646..9fd9e32c3 100644 --- a/interface-definitions/service_ssh.xml.in +++ b/interface-definitions/service_ssh.xml.in @@ -36,7 +36,7 @@ - + Allowed ciphers diff --git a/smoketest/configs/assert/basic-vyos b/smoketest/configs/assert/basic-vyos index 20363b77f..48ba51b21 100644 --- a/smoketest/configs/assert/basic-vyos +++ b/smoketest/configs/assert/basic-vyos @@ -81,10 +81,10 @@ set service dns forwarding allow-from '192.168.0.0/16' set service dns forwarding cache-size '10000' set service dns forwarding dnssec 'off' set service dns forwarding listen-address '192.168.0.1' -set service ssh ciphers 'aes128-ctr' -set service ssh ciphers 'aes192-ctr' -set service ssh ciphers 'aes256-ctr' -set service ssh ciphers 'chacha20-poly1305@openssh.com' +set service ssh cipher 'aes128-ctr' +set service ssh cipher 'aes192-ctr' +set service ssh cipher 'aes256-ctr' +set service ssh cipher 'chacha20-poly1305@openssh.com' set service ssh key-exchange 'curve25519-sha256@libssh.org' set service ssh key-exchange 'diffie-hellman-group1-sha1' set service ssh key-exchange 'diffie-hellman-group-exchange-sha1' diff --git a/smoketest/scripts/cli/test_service_ssh.py b/smoketest/scripts/cli/test_service_ssh.py index 6935464a7..4ef3dd51d 100755 --- a/smoketest/scripts/cli/test_service_ssh.py +++ b/smoketest/scripts/cli/test_service_ssh.py @@ -378,7 +378,7 @@ class TestServiceSSH(VyOSUnitTestSHIM.TestCase): rekey_data = '1024' for cipher in ciphers: - self.cli_set(base_path + ['ciphers', cipher]) + self.cli_set(base_path + ['cipher', cipher]) for host_key in host_key_algs: self.cli_set(base_path + ['hostkey-algorithm', host_key]) for kex in kexes: diff --git a/src/migration-scripts/ssh/2-to-3 b/src/migration-scripts/ssh/2-to-3 index e18a6aa05..ac9f7156c 100644 --- a/src/migration-scripts/ssh/2-to-3 +++ b/src/migration-scripts/ssh/2-to-3 @@ -14,18 +14,26 @@ # along with this library. If not, see . # T8098: rijndael-cbc@lysator.liu.se was removed in OpenSSH 6.7 which is used -# starting with VyOS 1.4 +# starting with VyOS 1.4. Also rename "ciphers" -> "cipher" to follow our +# CLI guidelines to use singular when possible from vyos.configtree import ConfigTree base = ['service', 'ssh'] +old_path = base + ['ciphers'] +new_path = base + ['cipher'] + def migrate(config: ConfigTree) -> None: - if not config.exists(base + ['ciphers']): + if not config.exists(base): # Nothing to do return - deprecated_cipher = 'rijndael-cbc@lysator.liu.se' - for cipher in config.return_values(base + ['ciphers']): - if cipher == deprecated_cipher: - config.delete_value(base + ['ciphers'], value=deprecated_cipher) + if config.exists(old_path): + config.rename(old_path, new_path[-1]) + + if config.exists(new_path): + deprecated_cipher = 'rijndael-cbc@lysator.liu.se' + for cipher in config.return_values(new_path): + if cipher == deprecated_cipher: + config.delete_value(new_path, value=deprecated_cipher) -- cgit v1.2.3