|
 |
1ae9b3 |
From 15989f86b18c99d79b342e78a2c3bd26c4973868 Mon Sep 17 00:00:00 2001
|
|
|
1ae9b3 |
From: Vladislav Grigoryev <20725816+vgaetera@users.noreply.github.com>
|
|
|
1ae9b3 |
Date: Tue, 23 Jun 2020 13:34:40 +0300
|
|
|
1ae9b3 |
Subject: [PATCH 38/45] fix(cli): unify indentation for forward-ports and rich
|
|
|
1ae9b3 |
rules
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
Unify indentation for forward-ports and rich rules in the CLI zone listing.
|
|
|
1ae9b3 |
Do not insert redundant newlines when there are no forward-ports or rich rules.
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
(cherry picked from commit 41df4088cd98f35adb3ac836143e7be34bb07a21)
|
|
|
1ae9b3 |
(cherry picked from commit 809fc4b61321cd459dde65559af3dfbd73f4ce1e)
|
|
|
1ae9b3 |
---
|
|
|
1ae9b3 |
src/firewall/command.py | 6 +++---
|
|
|
1ae9b3 |
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
diff --git a/src/firewall/command.py b/src/firewall/command.py
|
|
|
1ae9b3 |
index c371dc23584c..8dee63bdda8f 100644
|
|
|
1ae9b3 |
--- a/src/firewall/command.py
|
|
|
1ae9b3 |
+++ b/src/firewall/command.py
|
|
|
1ae9b3 |
@@ -428,7 +428,7 @@ class FirewallCommand(object):
|
|
|
1ae9b3 |
for port in ports]))
|
|
|
1ae9b3 |
self.print_msg(" protocols: " + " ".join(sorted(protocols)))
|
|
|
1ae9b3 |
self.print_msg(" masquerade: %s" % ("yes" if masquerade else "no"))
|
|
|
1ae9b3 |
- self.print_msg(" forward-ports: " +
|
|
|
1ae9b3 |
+ self.print_msg(" forward-ports: " + ("\n\t" if forward_ports else "") +
|
|
|
1ae9b3 |
"\n\t".join(["port=%s:proto=%s:toport=%s:toaddr=%s" % \
|
|
|
1ae9b3 |
(port, proto, toport, toaddr)
|
|
|
1ae9b3 |
for (port, proto, toport, toaddr) in \
|
|
|
1ae9b3 |
@@ -437,8 +437,8 @@ class FirewallCommand(object):
|
|
|
1ae9b3 |
" ".join(["%s/%s" % (port[0], port[1])
|
|
|
1ae9b3 |
for port in source_ports]))
|
|
|
1ae9b3 |
self.print_msg(" icmp-blocks: " + " ".join(icmp_blocks))
|
|
|
1ae9b3 |
- self.print_msg(" rich rules: \n\t" + "\n\t".join(
|
|
|
1ae9b3 |
- sorted(rules, key=rich_rule_sorted_key)))
|
|
|
1ae9b3 |
+ self.print_msg(" rich rules: " + ("\n\t" if rules else "") +
|
|
|
1ae9b3 |
+ "\n\t".join(sorted(rules, key=rich_rule_sorted_key)))
|
|
|
1ae9b3 |
|
|
|
1ae9b3 |
def print_service_info(self, service, settings):
|
|
|
1ae9b3 |
ports = settings.getPorts()
|
|
|
1ae9b3 |
--
|
|
|
1ae9b3 |
2.27.0
|
|
|
1ae9b3 |
|