|
 |
4d3a0d |
From ff17d85fd863e7be2b4088c92360185aca6693b0 Mon Sep 17 00:00:00 2001
|
|
|
4d3a0d |
From: Eric Garver <eric@garver.life>
|
|
|
4d3a0d |
Date: Thu, 7 Nov 2019 08:21:52 -0500
|
|
|
4d3a0d |
Subject: [PATCH] fix: CLI: service: also output helpers for service info
|
|
|
4d3a0d |
|
|
|
4d3a0d |
Fixes: 0c07b704f76d ("feat: CLI: add "helper" support for services")
|
|
|
4d3a0d |
Fixes: rhbz 1769520
|
|
|
4d3a0d |
(cherry picked from commit 6bfffe65f55b727afc37a8c1fb4068f6589bb890)
|
|
|
4d3a0d |
---
|
|
|
4d3a0d |
src/firewall/command.py | 2 ++
|
|
|
4d3a0d |
src/tests/features/helpers_custom.at | 42 ++++++++++++++++++++++++++-
|
|
|
4d3a0d |
src/tests/features/service_include.at | 3 ++
|
|
|
4d3a0d |
3 files changed, 46 insertions(+), 1 deletion(-)
|
|
|
4d3a0d |
|
|
|
4d3a0d |
diff --git a/src/firewall/command.py b/src/firewall/command.py
|
|
|
4d3a0d |
index 85e58d731a80..c371dc23584c 100644
|
|
|
4d3a0d |
--- a/src/firewall/command.py
|
|
|
4d3a0d |
+++ b/src/firewall/command.py
|
|
|
4d3a0d |
@@ -449,6 +449,7 @@ class FirewallCommand(object):
|
|
|
4d3a0d |
destinations = settings.getDestinations()
|
|
|
4d3a0d |
short_description = settings.getShort()
|
|
|
4d3a0d |
includes = settings.getIncludes()
|
|
|
4d3a0d |
+ helpers = settings.getHelpers()
|
|
|
4d3a0d |
self.print_msg(service)
|
|
|
4d3a0d |
if self.verbose:
|
|
|
4d3a0d |
self.print_msg(" summary: " + short_description)
|
|
|
4d3a0d |
@@ -464,6 +465,7 @@ class FirewallCommand(object):
|
|
|
4d3a0d |
" ".join(["%s:%s" % (k, v)
|
|
|
4d3a0d |
for k, v in destinations.items()]))
|
|
|
4d3a0d |
self.print_msg(" includes: " + " ".join(sorted(includes)))
|
|
|
4d3a0d |
+ self.print_msg(" helpers: " + " ".join(sorted(helpers)))
|
|
|
4d3a0d |
|
|
|
4d3a0d |
def print_icmptype_info(self, icmptype, settings):
|
|
|
4d3a0d |
destinations = settings.getDestinations()
|
|
|
4d3a0d |
diff --git a/src/tests/features/helpers_custom.at b/src/tests/features/helpers_custom.at
|
|
|
4d3a0d |
index c65f067a06ec..4c9024d1e2b8 100644
|
|
|
4d3a0d |
--- a/src/tests/features/helpers_custom.at
|
|
|
4d3a0d |
+++ b/src/tests/features/helpers_custom.at
|
|
|
4d3a0d |
@@ -1,5 +1,5 @@
|
|
|
4d3a0d |
FWD_START_TEST([customer helpers])
|
|
|
4d3a0d |
-AT_KEYWORDS(helpers rhbz1733066 gh514)
|
|
|
4d3a0d |
+AT_KEYWORDS(helpers rhbz1733066 gh514 rhbz1769520)
|
|
|
4d3a0d |
|
|
|
4d3a0d |
FWD_CHECK([-q --permanent --new-helper="ftptest" --module="nf_conntrack_ftp"])
|
|
|
4d3a0d |
FWD_CHECK([-q --permanent --helper=ftptest --add-port="2121/tcp"])
|
|
|
4d3a0d |
@@ -8,7 +8,27 @@ FWD_CHECK([-q --permanent --new-service="ftptest"])
|
|
|
4d3a0d |
FWD_CHECK([-q --permanent --service=ftptest --add-module="ftptest"])
|
|
|
4d3a0d |
FWD_CHECK([-q --permanent --service=ftptest --query-module="ftptest"])
|
|
|
4d3a0d |
FWD_CHECK([-q --permanent --service=ftptest --add-port="2121/tcp"])
|
|
|
4d3a0d |
+FWD_CHECK([--permanent --info-service=ftptest | TRIM_WHITESPACE], 0, [m4_strip([dnl
|
|
|
4d3a0d |
+ftptest
|
|
|
4d3a0d |
+ ports: 2121/tcp
|
|
|
4d3a0d |
+ protocols:
|
|
|
4d3a0d |
+ source-ports:
|
|
|
4d3a0d |
+ modules: ftptest
|
|
|
4d3a0d |
+ destination:
|
|
|
4d3a0d |
+ includes:
|
|
|
4d3a0d |
+ helpers:
|
|
|
4d3a0d |
+])])
|
|
|
4d3a0d |
FWD_RELOAD
|
|
|
4d3a0d |
+FWD_CHECK([--info-service=ftptest | TRIM_WHITESPACE], 0, [m4_strip([dnl
|
|
|
4d3a0d |
+ftptest
|
|
|
4d3a0d |
+ ports: 2121/tcp
|
|
|
4d3a0d |
+ protocols:
|
|
|
4d3a0d |
+ source-ports:
|
|
|
4d3a0d |
+ modules: ftptest
|
|
|
4d3a0d |
+ destination:
|
|
|
4d3a0d |
+ includes:
|
|
|
4d3a0d |
+ helpers:
|
|
|
4d3a0d |
+])])
|
|
|
4d3a0d |
|
|
|
4d3a0d |
FWD_CHECK([-q --add-service=ftptest])
|
|
|
4d3a0d |
|
|
|
4d3a0d |
@@ -42,7 +62,27 @@ dnl Same thing as above, but with the new "helper" in service.
|
|
|
4d3a0d |
FWD_CHECK([-q --permanent --service=ftptest --remove-module="ftptest"])
|
|
|
4d3a0d |
FWD_CHECK([-q --permanent --service=ftptest --query-module="ftptest"], 1)
|
|
|
4d3a0d |
FWD_CHECK([-q --permanent --service=ftptest --add-helper="ftptest"])
|
|
|
4d3a0d |
+FWD_CHECK([--permanent --info-service=ftptest | TRIM_WHITESPACE], 0, [m4_strip([dnl
|
|
|
4d3a0d |
+ftptest
|
|
|
4d3a0d |
+ ports: 2121/tcp
|
|
|
4d3a0d |
+ protocols:
|
|
|
4d3a0d |
+ source-ports:
|
|
|
4d3a0d |
+ modules:
|
|
|
4d3a0d |
+ destination:
|
|
|
4d3a0d |
+ includes:
|
|
|
4d3a0d |
+ helpers: ftptest
|
|
|
4d3a0d |
+])])
|
|
|
4d3a0d |
FWD_RELOAD
|
|
|
4d3a0d |
+FWD_CHECK([--info-service=ftptest | TRIM_WHITESPACE], 0, [m4_strip([dnl
|
|
|
4d3a0d |
+ftptest
|
|
|
4d3a0d |
+ ports: 2121/tcp
|
|
|
4d3a0d |
+ protocols:
|
|
|
4d3a0d |
+ source-ports:
|
|
|
4d3a0d |
+ modules:
|
|
|
4d3a0d |
+ destination:
|
|
|
4d3a0d |
+ includes:
|
|
|
4d3a0d |
+ helpers: ftptest
|
|
|
4d3a0d |
+])])
|
|
|
4d3a0d |
|
|
|
4d3a0d |
FWD_CHECK([-q --add-service=ftptest])
|
|
|
4d3a0d |
|
|
|
4d3a0d |
diff --git a/src/tests/features/service_include.at b/src/tests/features/service_include.at
|
|
|
4d3a0d |
index 219d5b42767b..7f02701a9419 100644
|
|
|
4d3a0d |
--- a/src/tests/features/service_include.at
|
|
|
4d3a0d |
+++ b/src/tests/features/service_include.at
|
|
|
4d3a0d |
@@ -76,6 +76,7 @@ my-service-with-include
|
|
|
4d3a0d |
modules:
|
|
|
4d3a0d |
destination:
|
|
|
4d3a0d |
includes: mdns recursive-service ssdp
|
|
|
4d3a0d |
+ helpers:
|
|
|
4d3a0d |
])])
|
|
|
4d3a0d |
FWD_CHECK([--info-service=my-service-with-include | TRIM_WHITESPACE], 0, [m4_strip([dnl
|
|
|
4d3a0d |
my-service-with-include
|
|
|
4d3a0d |
@@ -85,6 +86,7 @@ my-service-with-include
|
|
|
4d3a0d |
modules:
|
|
|
4d3a0d |
destination:
|
|
|
4d3a0d |
includes: mdns recursive-service ssdp
|
|
|
4d3a0d |
+ helpers:
|
|
|
4d3a0d |
])])
|
|
|
4d3a0d |
|
|
|
4d3a0d |
dnl firewall-offline-cmd
|
|
|
4d3a0d |
@@ -106,6 +108,7 @@ my-service-with-include
|
|
|
4d3a0d |
modules:
|
|
|
4d3a0d |
destination:
|
|
|
4d3a0d |
includes: mdns recursive-service ssdp
|
|
|
4d3a0d |
+ helpers:
|
|
|
4d3a0d |
])])
|
|
|
4d3a0d |
|
|
|
4d3a0d |
dnl negative test for including service that doesn't exist
|
|
|
4d3a0d |
--
|
|
|
4d3a0d |
2.23.0
|
|
|
4d3a0d |
|