summaryrefslogtreecommitdiff
path: root/src/migration-scripts/openvpn/2-to-3
diff options
context:
space:
mode:
authorDaniil Baturin <daniil@vyos.io>2024-07-18 19:33:24 +0100
committerMergify <37929162+mergify[bot]@users.noreply.github.com>2024-07-18 18:58:05 +0000
commit3b9e283855556707d3df27465f571efb869aeb9b (patch)
tree3da93c87e531f4cf0373f322434107a9731ac4f5 /src/migration-scripts/openvpn/2-to-3
parenta64e2cebb07e782330b43298b655d0aff65dbcda (diff)
downloadvyos-1x-3b9e283855556707d3df27465f571efb869aeb9b.tar.gz
vyos-1x-3b9e283855556707d3df27465f571efb869aeb9b.zip
openvpn: T6591: deprecate OpenVPN server net30 topology (#3825)mergify/bp/circinus/pr-3825
(cherry picked from commit e2b05343b30d2f989968532106e792cbaf75ecf6)
Diffstat (limited to 'src/migration-scripts/openvpn/2-to-3')
-rw-r--r--src/migration-scripts/openvpn/2-to-343
1 files changed, 43 insertions, 0 deletions
diff --git a/src/migration-scripts/openvpn/2-to-3 b/src/migration-scripts/openvpn/2-to-3
new file mode 100644
index 000000000..0b9073ae6
--- /dev/null
+++ b/src/migration-scripts/openvpn/2-to-3
@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+#
+# Copyright (C) 2024 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 <http://www.gnu.org/licenses/>.
+#
+# Adds an explicit old default for 'server topology'
+# to keep old configs working as before even though the default has changed.
+
+from vyos.configtree import ConfigTree
+
+def migrate(config: ConfigTree) -> None:
+ if not config.exists(['interfaces', 'openvpn']):
+ # Nothing to do
+ return
+
+ ovpn_intfs = config.list_nodes(['interfaces', 'openvpn'])
+ for i in ovpn_intfs:
+ mode = config.return_value(['interfaces', 'openvpn', i, 'mode'])
+ if mode != 'server':
+ # If it's a client or a site-to-site OpenVPN interface,
+ # the topology setting is not applicable
+ # and will cause commit errors on load,
+ # so we must not change such interfaces.
+ continue
+ else:
+ # The default OpenVPN server topology was changed from net30 to subnet
+ # because net30 is deprecated and causes problems with Windows clients.
+ # We add 'net30' to old configs if topology is not set there
+ # to ensure that if anyone relies on net30, their configs work as before.
+ topology_path = ['interfaces', 'openvpn', i, 'server', 'topology']
+ if not config.exists(topology_path):
+ config.set(topology_path, value='net30', replace=False)