From b8d41c226d70b3cc5a45f6b8dceca323c8e18bb7 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 28 Dec 2019 14:14:02 +0100 Subject: ipv6: migrate 'system ipv6' subsystem to XML/Python --- src/conf_mode/system-ipv6.py | 124 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 124 insertions(+) create mode 100755 src/conf_mode/system-ipv6.py (limited to 'src/conf_mode/system-ipv6.py') diff --git a/src/conf_mode/system-ipv6.py b/src/conf_mode/system-ipv6.py new file mode 100755 index 000000000..a39d00f9f --- /dev/null +++ b/src/conf_mode/system-ipv6.py @@ -0,0 +1,124 @@ +#!/usr/bin/env python3 +# +# Copyright (C) 2019 VyOS maintainers and contributors +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 or later as +# published by the Free Software Foundation. +# +# This program 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 General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +import os +import sys + +from sys import exit +from copy import deepcopy +from vyos.config import Config +from vyos import ConfigError + +ipv6_blacklist_file = '/etc/modprobe.d/vyos_blacklist_ipv6.conf' +ipv6_disable_file = '/etc/modprobe.d/vyos_disable_ipv6.conf' + +default_config_data = { + 'blacklist': False, + 'reboot_message': False, + 'ipv6_forward': '1', + 'disable_addr_assignment': False, + 'mp_layer4_hashing': '0', + 'neighbor_cache': 8192, + 'strict_dad': '1' + +} + +def sysctl(name, value): + os.system('sysctl -wq {}={}'.format(name, value)) + +def get_config(): + ip_opt = deepcopy(default_config_data) + conf = Config() + conf.set_level('system ipv6') + if conf.exists(''): + ip_opt['blacklist'] = conf.exists('blacklist') + if conf.exists_effective('blacklist') != conf.exists('blacklist'): + ip_opt['reboot_message'] = True + + ip_opt['disable_addr_assignment'] = conf.exists('disable') + if conf.exists_effective('disable') != conf.exists('disable'): + ip_opt['reboot_message'] = True + + if conf.exists('disable-forwarding'): + ip_opt['ipv6_forward'] = '0' + + if conf.exists('multipath layer4-hashing'): + ip_opt['mp_layer4_hashing'] = '1' + + if conf.exists('neighbor table-size'): + ip_opt['neighbor_cache'] = int(conf.return_value('neighbor table-size')) + + if conf.exists('strict-dad'): + ip_opt['strict_dad'] = 2 + + return ip_opt + +def verify(ip_opt): + pass + +def generate(ip_opt): + pass + +def apply(ip_opt): + # disable IPv6 kernel module + if ip_opt['blacklist']: + with open(ipv6_blacklist_file, 'w') as f: + f.write('blacklist ipv6') + else: + if os.path.exists(ipv6_blacklist_file): + os.unlink(ipv6_blacklist_file) + + # disable IPv6 address assignment + if ip_opt['disable_addr_assignment']: + with open(ipv6_disable_file, 'w') as f: + f.write('options ipv6 disable_ipv6=1') + else: + if os.path.exists(ipv6_disable_file): + os.unlink(ipv6_disable_file) + + if ip_opt['reboot_message']: + print('Changing IPv6 blacklist/disable parameter will only take affect\n' \ + 'when the system is rebooted.') + + # configure multipath + sysctl('net.ipv6.fib_multipath_hash_policy', ip_opt['mp_layer4_hashing']) + + # apply neighbor table threshold values + sysctl('net.ipv6.neigh.default.gc_thresh3', ip_opt['neighbor_cache']) + sysctl('net.ipv6.neigh.default.gc_thresh2', ip_opt['neighbor_cache'] // 2) + sysctl('net.ipv6.neigh.default.gc_thresh1', ip_opt['neighbor_cache'] // 8) + + # enable/disable IPv6 forwarding + with open('/proc/sys/net/ipv6/conf/all/forwarding', 'w') as f: + f.write(ip_opt['ipv6_forward']) + + # configure IPv6 strict-dad + for root, dirs, files in os.walk('/proc/sys/net/ipv6/conf'): + for name in files: + if name == "accept_dad": + print(os.path.join(root, name)) + with open(os.path.join(root, name), 'w') as f: + f.write(str(ip_opt['strict_dad'])) + +if __name__ == '__main__': + try: + c = get_config() + verify(c) + generate(c) + apply(c) + except ConfigError as e: + print(e) + exit(1) -- cgit v1.2.3 From b0ca6b1fc4c365463837553e925b472dc2d7e7f6 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 28 Dec 2019 14:19:40 +0100 Subject: ipv6: T1912: remove debug print() --- src/conf_mode/system-ipv6.py | 1 - 1 file changed, 1 deletion(-) (limited to 'src/conf_mode/system-ipv6.py') diff --git a/src/conf_mode/system-ipv6.py b/src/conf_mode/system-ipv6.py index a39d00f9f..cfbbf80ee 100755 --- a/src/conf_mode/system-ipv6.py +++ b/src/conf_mode/system-ipv6.py @@ -109,7 +109,6 @@ def apply(ip_opt): for root, dirs, files in os.walk('/proc/sys/net/ipv6/conf'): for name in files: if name == "accept_dad": - print(os.path.join(root, name)) with open(os.path.join(root, name), 'w') as f: f.write(str(ip_opt['strict_dad'])) -- cgit v1.2.3 From dcc8f87b0e2a442668b7851fb48b665c0394e86a Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Sat, 28 Dec 2019 20:00:17 +0100 Subject: ipv6: T1915: remove 'system ipv6 blacklist' --- interface-definitions/system-ipv6.xml.in | 6 ----- src/conf_mode/system-ipv6.py | 16 +------------ src/migration-scripts/system/13-to-14 | 40 ++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+), 21 deletions(-) create mode 100755 src/migration-scripts/system/13-to-14 (limited to 'src/conf_mode/system-ipv6.py') diff --git a/interface-definitions/system-ipv6.xml.in b/interface-definitions/system-ipv6.xml.in index 623418100..47fbeb4e1 100644 --- a/interface-definitions/system-ipv6.xml.in +++ b/interface-definitions/system-ipv6.xml.in @@ -8,12 +8,6 @@ 290 - - - Prevent IPv6 Kernel Module from being loaded - - - Disable IPv6 forwarding on all interfaces diff --git a/src/conf_mode/system-ipv6.py b/src/conf_mode/system-ipv6.py index cfbbf80ee..bd28ec357 100755 --- a/src/conf_mode/system-ipv6.py +++ b/src/conf_mode/system-ipv6.py @@ -22,11 +22,9 @@ from copy import deepcopy from vyos.config import Config from vyos import ConfigError -ipv6_blacklist_file = '/etc/modprobe.d/vyos_blacklist_ipv6.conf' ipv6_disable_file = '/etc/modprobe.d/vyos_disable_ipv6.conf' default_config_data = { - 'blacklist': False, 'reboot_message': False, 'ipv6_forward': '1', 'disable_addr_assignment': False, @@ -44,10 +42,6 @@ def get_config(): conf = Config() conf.set_level('system ipv6') if conf.exists(''): - ip_opt['blacklist'] = conf.exists('blacklist') - if conf.exists_effective('blacklist') != conf.exists('blacklist'): - ip_opt['reboot_message'] = True - ip_opt['disable_addr_assignment'] = conf.exists('disable') if conf.exists_effective('disable') != conf.exists('disable'): ip_opt['reboot_message'] = True @@ -73,14 +67,6 @@ def generate(ip_opt): pass def apply(ip_opt): - # disable IPv6 kernel module - if ip_opt['blacklist']: - with open(ipv6_blacklist_file, 'w') as f: - f.write('blacklist ipv6') - else: - if os.path.exists(ipv6_blacklist_file): - os.unlink(ipv6_blacklist_file) - # disable IPv6 address assignment if ip_opt['disable_addr_assignment']: with open(ipv6_disable_file, 'w') as f: @@ -90,7 +76,7 @@ def apply(ip_opt): os.unlink(ipv6_disable_file) if ip_opt['reboot_message']: - print('Changing IPv6 blacklist/disable parameter will only take affect\n' \ + print('Changing IPv6 disable parameter will only take affect\n' \ 'when the system is rebooted.') # configure multipath diff --git a/src/migration-scripts/system/13-to-14 b/src/migration-scripts/system/13-to-14 new file mode 100755 index 000000000..c055dad1f --- /dev/null +++ b/src/migration-scripts/system/13-to-14 @@ -0,0 +1,40 @@ +#!/usr/bin/env python3 +# +# Delete 'system ipv6 blacklist' option as the IPv6 module can no longer be +# blacklisted as it is required by e.g. WireGuard and thus will always be +# loaded. + +import os +import sys + +ipv6_blacklist_file = '/etc/modprobe.d/vyatta_blacklist_ipv6.conf' + +from vyos.configtree import ConfigTree + +if (len(sys.argv) < 1): + print("Must specify file name!") + sys.exit(1) + +file_name = sys.argv[1] + +with open(file_name, 'r') as f: + config_file = f.read() + +config = ConfigTree(config_file) +ip_base = ['system', 'ipv6'] +if not config.exists(ip_base): + # Nothing to do + sys.exit(0) +else: + # delete 'system ipv6 blacklist' node + if config.exists(ip_base + ['blacklist']): + config.delete(ip_base + ['blacklist']) + if os.path.isfile(ipv6_blacklist_file): + os.unlink(ipv6_blacklist_file) + + try: + with open(file_name, 'w') as f: + f.write(config.to_string()) + except OSError as e: + print("Failed to save the modified config: {}".format(e)) + sys.exit(1) -- cgit v1.2.3