diff options
| author | Christian Poessinger <christian@poessinger.com> | 2018-06-30 21:22:57 +0200 |
|---|---|---|
| committer | Christian Poessinger <christian@poessinger.com> | 2018-06-30 21:22:59 +0200 |
| commit | 22d903fd43a1366105e1236359dab399203c4d6e (patch) | |
| tree | 17f9edef2e9256e339af715a57e07b57389ed57f | |
| parent | 10e28b3e0a795a588b17305e87a1b2fc0875dbe2 (diff) | |
| download | vyos-1x-22d903fd43a1366105e1236359dab399203c4d6e.tar.gz vyos-1x-22d903fd43a1366105e1236359dab399203c4d6e.zip | |
T652: SNMP: bugfix preserving users engineid
In VyOS 1.1.x every user was forced to the systems engine ID when using SNMPv3,
even when a user wanted to have a custom engineID, thus the node 'service snmp
v3 user foo engineid' itself is useless.
| -rwxr-xr-x | src/conf_mode/snmp.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/conf_mode/snmp.py b/src/conf_mode/snmp.py index 863f7e2e2..923827631 100755 --- a/src/conf_mode/snmp.py +++ b/src/conf_mode/snmp.py @@ -750,13 +750,16 @@ def apply(snmp): # plaintext password inside the configuration was replaced by # the encrypted one which can be found in 'config_file_user' with open(config_file_user, 'r') as f: + engineID = '' for line in f: - # we are only interested in the user database + if line.startswith('oldEngineID'): + string = line.split(' ') + engineID = string[1] + if line.startswith('usmUser'): string = line.split(' ') cfg = { 'user': string[4].replace(r'"', ''), - 'engineID': string[3], 'auth_pw': string[8], 'priv_pw': string[10] } @@ -767,7 +770,7 @@ def apply(snmp): # Now update the running configuration # # Currently when executing os.system() the environment does not have the vyos_libexec_dir variable set, see T685 - os.system('vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_set service snmp v3 user "{0}" engineid {1} > /dev/null'.format(cfg['user'], cfg['engineID'])) + os.system('vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_set service snmp v3 user "{0}" engineid {1} > /dev/null'.format(cfg['user'], engineID)) os.system('vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_set service snmp v3 user "{0}" auth encrypted-key {1} > /dev/null'.format(cfg['user'], cfg['auth_pw'])) os.system('vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_set service snmp v3 user "{0}" privacy encrypted-key {1} > /dev/null'.format(cfg['user'], cfg['priv_pw'])) os.system('vyos_libexec_dir=/usr/libexec/vyos /opt/vyatta/sbin/my_delete service snmp v3 user "{0}" auth plaintext-key > /dev/null'.format(cfg['user'])) |