Page MenuHomeVyOS Platform
Files F119062958

No OneTemporary
Actions

Size
7 KB
Referenced Files
None
Subscribers
None

View Options

diff --git a/src/migration-scripts/firewall/12-to-13 b/src/migration-scripts/firewall/12-to-13
index c2b34b2d8..4eaae779b 100755
--- a/src/migration-scripts/firewall/12-to-13
+++ b/src/migration-scripts/firewall/12-to-13
@@ -1,83 +1,83 @@
#!/usr/bin/env python3
#
# Copyright (C) 2023 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/>.
# T5729: Switch to valueless whenever is possible.
# From
# set firewall ... rule <rule> log enable
# set firewall ... rule <rule> state <state> enable
# set firewall ... rule <rule> log disable
# set firewall ... rule <rule> state <state> disable
# To
# set firewall ... rule <rule> log
# set firewall ... rule <rule> state <state>
# Remove command if log=disable or <state>=disable
import re
from sys import argv
from sys import exit
from vyos.configtree import ConfigTree
from vyos.ifconfig import Section
if len(argv) < 2:
print("Must specify file name!")
exit(1)
file_name = argv[1]
with open(file_name, 'r') as f:
config_file = f.read()
base = ['firewall']
config = ConfigTree(config_file)
if not config.exists(base):
# Nothing to do
exit(0)
for family in ['ipv4', 'ipv6', 'bridge']:
if config.exists(base + [family]):
for hook in ['forward', 'input', 'output', 'name']:
if config.exists(base + [family, hook]):
for priority in config.list_nodes(base + [family, hook]):
if config.exists(base + [family, hook, priority, 'rule']):
for rule in config.list_nodes(base + [family, hook, priority, 'rule']):
# Log
if config.exists(base + [family, hook, priority, 'rule', rule, 'log']):
log_value = config.return_value(base + [family, hook, priority, 'rule', rule, 'log'])
config.delete(base + [family, hook, priority, 'rule', rule, 'log'])
if log_value == 'enable':
config.set(base + [family, hook, priority, 'rule', rule, 'log'])
# State
if config.exists(base + [family, hook, priority, 'rule', rule, 'state']):
flag_enable = 'False'
for state in ['established', 'invalid', 'new', 'related']:
if config.exists(base + [family, hook, priority, 'rule', rule, 'state', state]):
state_value = config.return_value(base + [family, hook, priority, 'rule', rule, 'state', state])
config.delete(base + [family, hook, priority, 'rule', rule, 'state', state])
if state_value == 'enable':
- config.set(base + [family, hook, priority, 'rule', rule, 'state', state])
+ config.set(base + [family, hook, priority, 'rule', rule, 'state'], value=state, replace=False)
flag_enable = 'True'
if flag_enable == 'False':
config.delete(base + [family, hook, priority, 'rule', rule, 'state'])
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))
exit(1)
\ No newline at end of file
diff --git a/src/migration-scripts/policy/6-to-7 b/src/migration-scripts/policy/6-to-7
index 1f955aa02..727b8487a 100755
--- a/src/migration-scripts/policy/6-to-7
+++ b/src/migration-scripts/policy/6-to-7
@@ -1,79 +1,79 @@
#!/usr/bin/env python3
#
# Copyright (C) 2023 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/>.
# T5729: Switch to valueless whenever is possible.
# From
# set policy [route | route6] ... rule <rule> log enable
# set policy [route | route6] ... rule <rule> log disable
# To
# set policy [route | route6] ... rule <rule> log
# Remove command if log=disable
import re
from sys import argv
from sys import exit
from vyos.configtree import ConfigTree
from vyos.ifconfig import Section
if len(argv) < 2:
print("Must specify file name!")
exit(1)
file_name = argv[1]
with open(file_name, 'r') as f:
config_file = f.read()
base = ['policy']
config = ConfigTree(config_file)
if not config.exists(base):
# Nothing to do
exit(0)
for family in ['route', 'route6']:
if config.exists(base + [family]):
for policy_name in config.list_nodes(base + [family]):
if config.exists(base + [family, policy_name, 'rule']):
for rule in config.list_nodes(base + [family, policy_name, 'rule']):
# Log
if config.exists(base + [family, policy_name, 'rule', rule, 'log']):
log_value = config.return_value(base + [family, policy_name, 'rule', rule, 'log'])
config.delete(base + [family, policy_name, 'rule', rule, 'log'])
if log_value == 'enable':
config.set(base + [family, policy_name, 'rule', rule, 'log'])
# State
if config.exists(base + [family, policy_name, 'rule', rule, 'state']):
flag_enable = 'False'
for state in ['established', 'invalid', 'new', 'related']:
if config.exists(base + [family, policy_name, 'rule', rule, 'state', state]):
state_value = config.return_value(base + [family, policy_name, 'rule', rule, 'state', state])
config.delete(base + [family, policy_name, 'rule', rule, 'state', state])
if state_value == 'enable':
- config.set(base + [family, policy_name, 'rule', rule, 'state', state])
+ config.set(base + [family, policy_name, 'rule', rule, 'state'], value=state, replace=False)
flag_enable = 'True'
if flag_enable == 'False':
config.delete(base + [family, policy_name, 'rule', rule, 'state'])
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))
exit(1)
\ No newline at end of file

File Metadata

Mime Type
text/x-diff
Expires
Fri, Nov 6, 7:42 AM (1 d, 17 h)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
4645987
Default Alt Text
(7 KB)

Event Timeline