diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-12-15 19:33:18 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-12-15 19:33:18 +0000 |
| commit | 31ce591f9bd34edc8a5a5ee91a4367c741b93b7c (patch) | |
| tree | 89f6f2fce2d02242a38329d80382980abde10f32 /src/conf_mode | |
| parent | 6c6fa367118c6196a1fb01df8646269e91ac2a4f (diff) | |
| parent | ef13a6319a21c8030301aeebbeabf5148adb994c (diff) | |
| download | vyos-1x-31ce591f9bd34edc8a5a5ee91a4367c741b93b7c.tar.gz vyos-1x-31ce591f9bd34edc8a5a5ee91a4367c741b93b7c.zip | |
Merge pull request #4896 from c-po/ssh-config-test
ssh: T8090: T8098: add support for config test mode (sshd -t)
Diffstat (limited to 'src/conf_mode')
| -rwxr-xr-x | src/conf_mode/service_ssh.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/conf_mode/service_ssh.py b/src/conf_mode/service_ssh.py index dca021d02..d67c1fa3f 100755 --- a/src/conf_mode/service_ssh.py +++ b/src/conf_mode/service_ssh.py @@ -29,6 +29,7 @@ from vyos.configverify import verify_pki_openssh_key from vyos.defaults import config_files from vyos.defaults import SSH_DSA_DEPRECATION_WARNING from vyos.utils.process import call +from vyos.utils.process import rc_cmd from vyos.template import render from vyos import ConfigError from vyos import airbag @@ -173,6 +174,11 @@ def apply(ssh): call(f'systemctl stop {systemd_service_sshguard}') return None + # Verify generated sshd configuration is correct + rc, out = rc_cmd(f'/usr/sbin/sshd -t -f {config_file}') + if rc: + raise ConfigError(f'Unexpected error with SSH configuration! {out}') + if 'dynamic_protection' not in ssh: call(f'systemctl stop {systemd_service_sshguard}') else: |