summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/templates/system/ssh_config.tmpl3
-rw-r--r--interface-definitions/system-options.xml.in10
-rwxr-xr-xsrc/conf_mode/system-options.py31
3 files changed, 38 insertions, 6 deletions
diff --git a/data/templates/system/ssh_config.tmpl b/data/templates/system/ssh_config.tmpl
new file mode 100644
index 000000000..509bd5479
--- /dev/null
+++ b/data/templates/system/ssh_config.tmpl
@@ -0,0 +1,3 @@
+{% if ssh_client is defined and ssh_client.source_address is defined and ssh_client.source_address is not none %}
+BindAddress {{ ssh_client.source_address }}
+{% endif %}
diff --git a/interface-definitions/system-options.xml.in b/interface-definitions/system-options.xml.in
index 194773329..a5fec10db 100644
--- a/interface-definitions/system-options.xml.in
+++ b/interface-definitions/system-options.xml.in
@@ -46,13 +46,21 @@
</leafNode>
<node name="http-client">
<properties>
- <help>Global options used for HTTP based commands</help>
+ <help>Global options used for HTTP client</help>
</properties>
<children>
#include <include/source-interface.xml.i>
#include <include/source-address-ipv4-ipv6.xml.i>
</children>
</node>
+ <node name="ssh-client">
+ <properties>
+ <help>Global options used for SSH client</help>
+ </properties>
+ <children>
+ #include <include/source-address-ipv4-ipv6.xml.i>
+ </children>
+ </node>
</children>
</node>
</children>
diff --git a/src/conf_mode/system-options.py b/src/conf_mode/system-options.py
index d7c5c0443..0aacd19d8 100755
--- a/src/conf_mode/system-options.py
+++ b/src/conf_mode/system-options.py
@@ -22,11 +22,13 @@ from sys import exit
from vyos.config import Config
from vyos.template import render
from vyos.util import call
+from vyos.validate import is_addr_assigned
from vyos import ConfigError
from vyos import airbag
airbag.enable()
-config_file = r'/etc/curlrc'
+curlrc_config = r'/etc/curlrc'
+ssh_config = r'/etc/ssh/ssh_config'
systemd_action_file = '/lib/systemd/system/ctrl-alt-del.target'
def get_config():
@@ -36,9 +38,9 @@ def get_config():
return options
def verify(options):
- if 'http_client' in options.keys():
+ if 'http_client' in options:
config = options['http_client']
- if 'source_interface' in config.keys():
+ if 'source_interface' in config:
if not config['source_interface'] in interfaces():
raise ConfigError(f'Source interface {source_interface} does not '
f'exist'.format(**config))
@@ -46,10 +48,21 @@ def verify(options):
if {'source_address', 'source_interface'} <= set(config):
raise ConfigError('Can not define both HTTP source-interface and source-address')
+ if 'source_address' in config:
+ if not is_addr_assigned(config['source_address']):
+ raise ConfigError('No interface with give address specified!')
+
+ if 'ssh_client' in options:
+ config = options['ssh_client']
+ if 'source_address' in config:
+ if not is_addr_assigned(config['source_address']):
+ raise ConfigError('No interface with give address specified!')
+
return None
def generate(options):
- render(config_file, 'system/curlrc.tmpl', options, trim_blocks=True)
+ render(curlrc_config, 'system/curlrc.tmpl', options, trim_blocks=True)
+ render(ssh_config, 'system/ssh_config.tmpl', options, trim_blocks=True)
return None
def apply(options):
@@ -63,12 +76,20 @@ def apply(options):
if os.path.exists(systemd_action_file):
os.unlink(systemd_action_file)
- if 'ctrl_alt_del_action' in options.keys():
+ if 'ctrl_alt_del_action' in options:
if options['ctrl_alt_del_action'] == 'reboot':
os.symlink('/lib/systemd/system/reboot.target', systemd_action_file)
elif options['ctrl_alt_del_action'] == 'poweroff':
os.symlink('/lib/systemd/system/poweroff.target', systemd_action_file)
+ if 'http_client' not in options:
+ if os.path.exists(curlrc_config):
+ os.unlink(curlrc_config)
+
+ if 'ssh_client' not in options:
+ if os.path.exists(ssh_config):
+ os.unlink(ssh_config)
+
# Reboot system on kernel panic
with open('/proc/sys/kernel/panic', 'w') as f:
if 'reboot_on_panic' in options.keys():