Fix xtables-monitor rule printing, partially RFC
Phil Sutter
reviewercover Fix xtables-monitor rule printing, partially RFC
The patches in this series progress from fixes to features, and for the last two I'm not sure they are acceptable as-is: Patch 7 is not entirely complete, one should follow-up printing ebtables policy rules like builtin chain policies in traces but it requires quite some code churn. Patch 8 changes output of both events and traces, thus might break existing scripts parsing xtables-monitor output.
Phil Sutter (8):
xtables-monitor: Proper re-init for rule's family
xtables-monitor: Flush stdout after all lines of output
xtables-monitor: Align builtin chain and table output
xtables-monitor: Support arptables chain events
tests: shell: New xtables-monitor test
xtables-monitor: Fix for ebtables rule events
xtables-monitor: Ignore ebtables policy rules unless tracing
xtables-monitor: Print commands instead of -4/-6/-0 flags
iptables/nft.c | 2 +- iptables/nft.h | 1 + .../testcases/nft-only/0012-xtables-monitor_0 | 139 ++++++++++++++++++ iptables/xtables-monitor.c | 74 ++++++---- 4 files changed, 183 insertions(+), 33 deletions(-) create mode 100755 iptables/tests/shell/testcases/nft-only/0012-xtables-monitor_0
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 1/8 xtables-monitor: Proper re-init for rule's family
When not running for a specific family only (via -4/-6 flags), xtables-monitor potentially sees events/traces for all families. To correctly parse rules when printing for NEWRULE, DELRULE or TRACE messages, nft_handle has to be reinitialized for the rule's family.
It is not sufficient to reset nft_handle::ops: Some expression parsers rely upon nft_handle::family to be properly set, too (cf. references to 'ctx->h->family in nft-ruleparse.c). Adjusting the 'afinfo' pointer provided by libxtables is even more crucial, as e.g. do_parse() in xshared.c relies upon it for the proper optstring.
This is actually a day-1 bug in xtables-monitor which surfaced due to commit 9075c3aa983d9 ("nft: Increase rule parser strictness"). Therefore make this fix the commit it is following-up.
--- iptables/xtables-monitor.c | 2 ++ 1 file changed, 2 insertions(+)
iptables/xtables-monitor.c +2 -0
@@ -92,7 +92,9 @@ static int rule_cb(const struct nlmsghdr *nlh, void *data)if (arg->nfproto && arg->nfproto != family) goto err_free; +xtables_set_nfproto (family); arg->h->ops =nft_family_ops_lookup (family); + arg->h->family = family;if (arg->is_event)printf (" EVENT: " );
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 2/8 xtables-monitor: Flush stdout after all lines of output
In reply to Phil SutterWriting an xtables-monitor testsuite is pretty much impossible without this due to unreliable output flushing. Just move the fflush() call from trace_cb() to its caller so monitor events benefit from it as well.
--- iptables/xtables-monitor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
iptables/xtables-monitor.c +1 -1
@@ -544,7 +544,6 @@ static int trace_cb(const struct nlmsghdr *nlh, struct cb_arg *arg) err_free:nftnl_trace_free (nlt); err: -fflush (stdout);return MNL_CB_OK ; }
@@ -576,6 +575,7 @@ static int monitor_cb(const struct nlmsghdr *nlh, void *data)break ; } +fflush (stdout);return ret; }
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 3/8 xtables-monitor: Align builtin chain and table output
In reply to Phil SutterDrop the leading hash sign and add "NEW/DEL chain" annotation.
--- iptables/xtables-monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
iptables/xtables-monitor.c +2 -1
@@ -153,7 +153,8 @@ static int chain_cb(const struct nlmsghdr *nlh, void *data)break ;default :nftnl_chain_snprintf (buf,sizeof (buf), c,NFTNL_OUTPUT_DEFAULT ,0 ); -printf ("# nft: %s\n" , buf); +printf ("nft: %s chain: %s\n" , + type ==NFT_MSG_NEWCHAIN ?"NEW" :"DEL" , buf); goto err_free; }
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 4/8 xtables-monitor: Support arptables chain events
In reply to Phil SutterPrint arptables NEWCHAIN/DELCHAIN events just like for iptables, using the '-0' prefix rule callback already uses.
--- iptables/xtables-monitor.c | 3 +++ 1 file changed, 3 insertions(+)
iptables/xtables-monitor.c +3 -0
@@ -151,6 +151,9 @@ static int chain_cb(const struct nlmsghdr *nlh, void *data)case NFPROTO_IPV6 : family =6 ;break ; +case NFPROTO_ARP : + family =0 ; +break ;default :nftnl_chain_snprintf (buf,sizeof (buf), c,NFTNL_OUTPUT_DEFAULT ,0 ); printf("nft: %s chain: %s\n",
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 5/8 tests: shell: New xtables-monitor test
In reply to Phil SutterOnly events monitoring for now.
--- .../testcases/nft-only/0012-xtables-monitor_0 | 149 ++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100755 iptables/tests/shell/testcases/nft-only/0012-xtables-monitor_0
iptables/tests/shell/testcases/nft-only/0012-xtables-monitor_0 new file +149 -0
@@ -0,0 +1,149 @@ +#!/bin/bash + +[[ $XT_MULTI == *xtables-nft-multi ]] || { echo "skip $XT_MULTI"; exit 0; } + +log=$(mktemp) +trap "rm -f $log" EXIT +echo "logging into file $log" +rc=0 + +# Filter monitor output: +# - NEWGEN event is moot: +# - GENID/PID are arbitrary, +# - NAME always "xtables-nft-mul" +# - handle is arbitrary as well +logfilter() { # (logfile) + grep -v '^NEWGEN:' "$1" | sed -e 's/handle [0-9]\+/handle 0/' +} + +# Compare monitor output for given command against content of the global $EXP +monitorcheck() { # (cmd ...) + $XT_MULTI xtables-monitor -e >"$log"& + monpid=$! + sleep 0.5 + + $XT_MULTI "$@" || { + echo "Error: command failed: $@" + let "rc++" + kill $monpid + wait + return + } + sleep 0.5 + kill $monpid + wait + diffout=$(diff -u <(echo "$EXP") <(logfilter "$log")) || { + echo "Fail: unexpected result for command: '$@':" + grep -v '^\(---\|+++\|@@\)' <<< "$diffout" + let "rc++" + } +} + +EXP="\ + EVENT: nft: NEW table: table filter ip flags 0 use 1 handle 0 + EVENT: nft: NEW chain: ip filter FORWARD use 1 type filter hook forward prio 0 policy accept packets 0 bytes 0 flags 1 + EVENT: -4 -t filter -A FORWARD -j ACCEPT" +monitorcheck iptables -A FORWARD -j ACCEPT + +EXP="\ + EVENT: nft: NEW table: table filter ip6 flags 0 use 1 handle 0 + EVENT: nft: NEW chain: ip6 filter FORWARD use 1 type filter hook forward prio 0 policy accept packets 0 bytes 0 flags 1 + EVENT: -6 -t filter -A FORWARD -j ACCEPT" +monitorcheck ip6tables -A FORWARD -j ACCEPT + +# FIXME +EXP="\ + EVENT: nft: NEW table: table filter bridge flags 0 use 1 handle 0 + EVENT: nft: NEW chain: bridge filter FORWARD use 1 type filter hook forward prio -200 policy accept packets 0 bytes 0 flags 1 + EVENT: " +monitorcheck ebtables -A FORWARD -j ACCEPT + +EXP="\ + EVENT: nft: NEW table: table filter arp flags 0 use 1 handle 0 + EVENT: nft: NEW chain: arp filter INPUT use 1 type filter hook input prio 0 policy accept packets 0 bytes 0 flags 1 + EVENT: -0 -t filter -A INPUT -j ACCEPT" +monitorcheck arptables -A INPUT -j ACCEPT + +EXP=" EVENT: -4 -t filter -N foo" +monitorcheck iptables -N foo + +EXP=" EVENT: -6 -t filter -N foo" +monitorcheck ip6tables -N foo + +# FIXME +EXP="\ + EVENT: nft: NEW chain: bridge filter foo use 1 + EVENT: " +monitorcheck ebtables -N foo + +EXP=" EVENT: -0 -t filter -N foo" +monitorcheck arptables -N foo + +# meta l4proto matches require proper nft_handle:family value +EXP=" EVENT: -4 -t filter -A FORWARD -i eth1 -o eth2 -p tcp -m tcp --dport 22 -j ACCEPT" +monitorcheck iptables -A FORWARD -i eth1 -o eth2 -p tcp --dport 22 -j ACCEPT + +EXP=" EVENT: -6 -t filter -A FORWARD -i eth1 -o eth2 -p udp -m udp --sport 1337 -j ACCEPT" +monitorcheck ip6tables -A FORWARD -i eth1 -o eth2 -p udp --sport 1337 -j ACCEPT + +# FIXME +EXP=" EVENT: " +monitorcheck ebtables -A FORWARD -i eth1 -o eth2 -p ip --ip-protocol udp --ip-source-port 1337 -j ACCEPT + +EXP=" EVENT: -0 -t filter -A INPUT -j ACCEPT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06" +monitorcheck arptables -A INPUT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06 -j ACCEPT + +EXP=" EVENT: -4 -t filter -D FORWARD -i eth1 -o eth2 -p tcp -m tcp --dport 22 -j ACCEPT" +monitorcheck iptables -D FORWARD -i eth1 -o eth2 -p tcp --dport 22 -j ACCEPT + +EXP=" EVENT: -6 -t filter -D FORWARD -i eth1 -o eth2 -p udp -m udp --sport 1337 -j ACCEPT" +monitorcheck ip6tables -D FORWARD -i eth1 -o eth2 -p udp --sport 1337 -j ACCEPT + +# FIXME +EXP=" EVENT: " +monitorcheck ebtables -D FORWARD -i eth1 -o eth2 -p ip --ip-protocol udp --ip-source-port 1337 -j ACCEPT + +EXP=" EVENT: -0 -t filter -D INPUT -j ACCEPT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06" +monitorcheck arptables -D INPUT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06 -j ACCEPT + +EXP=" EVENT: -4 -t filter -X foo" +monitorcheck iptables -X foo + +EXP=" EVENT: -6 -t filter -X foo" +monitorcheck ip6tables -X foo + +# FIXME +EXP="\ + EVENT: + EVENT: nft: DEL chain: bridge filter foo use 0" +monitorcheck ebtables -X foo + +EXP=" EVENT: -0 -t filter -X foo" +monitorcheck arptables -X foo + +EXP=" EVENT: -4 -t filter -D FORWARD -j ACCEPT" +monitorcheck iptables -F FORWARD + +EXP=" EVENT: -6 -t filter -D FORWARD -j ACCEPT" +monitorcheck ip6tables -F FORWARD + +# FIXME +EXP=" EVENT: " +monitorcheck ebtables -F FORWARD + +EXP=" EVENT: -0 -t filter -D INPUT -j ACCEPT" +monitorcheck arptables -F INPUT + +EXP=" EVENT: nft: DEL chain: ip filter FORWARD use 0 type filter hook forward prio 0 policy accept packets 0 bytes 0 flags 1" +monitorcheck iptables -X FORWARD + +EXP=" EVENT: nft: DEL chain: ip6 filter FORWARD use 0 type filter hook forward prio 0 policy accept packets 0 bytes 0 flags 1" +monitorcheck ip6tables -X FORWARD + +EXP=" EVENT: nft: DEL chain: bridge filter FORWARD use 0 type filter hook forward prio -200 policy accept packets 0 bytes 0 flags 1" +monitorcheck ebtables -X FORWARD + +EXP=" EVENT: nft: DEL chain: arp filter INPUT use 0 type filter hook input prio 0 policy accept packets 0 bytes 0 flags 1" +monitorcheck arptables -X INPUT + +exit $rc
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 6/8 xtables-monitor: Fix for ebtables rule events
In reply to Phil SutterBridge family wasn't recognized in rule_cb(), so merely an empty "EVENT:" line was printed for ebtables rule changes. For lack of a well-known family modifier flag for bridge family, simply prefix rules by "ebtables".
--- .../testcases/nft-only/0012-xtables-monitor_0 | 15 ++++++--------- iptables/xtables-monitor.c | 3 +++ 2 files changed, 9 insertions(+), 9 deletions(-)
iptables/tests/shell/testcases/nft-only/0012-xtables-monitor_0 +6 -9
@@ -55,7 +55,7 @@ monitorcheck ip6tables -A FORWARD -j ACCEPT EXP="\ EVENT: nft: NEW table: table filter bridge flags 0 use 1 handle 0 EVENT: nft: NEW chain: bridge filter FORWARD use 1 type filter hook forward prio -200 policy accept packets 0 bytes 0 flags 1 - EVENT: " + EVENT: ebtables -t filter -A FORWARD -j ACCEPT" monitorcheck ebtables -A FORWARD -j ACCEPT EXP="\
@@ -73,7 +73,7 @@ monitorcheck ip6tables -N foo # FIXME EXP="\ EVENT: nft: NEW chain: bridge filter foo use 1 - EVENT: " + EVENT: ebtables -t filter -A foo -j ACCEPT" monitorcheck ebtables -N foo EXP=" EVENT: -0 -t filter -N foo"
@@ -86,8 +86,7 @@ monitorcheck iptables -A FORWARD -i eth1 -o eth2 -p tcp --dport 22 -j ACCEPT EXP=" EVENT: -6 -t filter -A FORWARD -i eth1 -o eth2 -p udp -m udp --sport 1337 -j ACCEPT" monitorcheck ip6tables -A FORWARD -i eth1 -o eth2 -p udp --sport 1337 -j ACCEPT -# FIXME -EXP=" EVENT: " +EXP=" EVENT: ebtables -t filter -A FORWARD -p IPv4 -i eth1 -o eth2 --ip-proto udp --ip-sport 1337 -j ACCEPT" monitorcheck ebtables -A FORWARD -i eth1 -o eth2 -p ip --ip-protocol udp --ip-source-port 1337 -j ACCEPT EXP=" EVENT: -0 -t filter -A INPUT -j ACCEPT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06"
@@ -99,8 +98,7 @@ monitorcheck iptables -D FORWARD -i eth1 -o eth2 -p tcp --dport 22 -j ACCEPT EXP=" EVENT: -6 -t filter -D FORWARD -i eth1 -o eth2 -p udp -m udp --sport 1337 -j ACCEPT" monitorcheck ip6tables -D FORWARD -i eth1 -o eth2 -p udp --sport 1337 -j ACCEPT -# FIXME -EXP=" EVENT: " +EXP=" EVENT: ebtables -t filter -D FORWARD -p IPv4 -i eth1 -o eth2 --ip-proto udp --ip-sport 1337 -j ACCEPT" monitorcheck ebtables -D FORWARD -i eth1 -o eth2 -p ip --ip-protocol udp --ip-source-port 1337 -j ACCEPT EXP=" EVENT: -0 -t filter -D INPUT -j ACCEPT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06"
@@ -114,7 +112,7 @@ monitorcheck ip6tables -X foo # FIXME EXP="\ - EVENT: + EVENT: ebtables -t filter -D foo -j ACCEPT EVENT: nft: DEL chain: bridge filter foo use 0" monitorcheck ebtables -X foo
@@ -127,8 +125,7 @@ monitorcheck iptables -F FORWARD EXP=" EVENT: -6 -t filter -D FORWARD -j ACCEPT" monitorcheck ip6tables -F FORWARD -# FIXME -EXP=" EVENT: " +EXP=" EVENT: ebtables -t filter -D FORWARD -j ACCEPT" monitorcheck ebtables -F FORWARD EXP=" EVENT: -0 -t filter -D INPUT -j ACCEPT"
iptables/xtables-monitor.c +3 -0
@@ -106,6 +106,9 @@ static int rule_cb(const struct nlmsghdr *nlh, void *data)case NFPROTO_ARP :printf ("-0 " );break ; +case NFPROTO_BRIDGE : +printf ("ebtables " ); +break ;default :puts ("" ); goto err_free;
Signature · 1 line
2.43.0
Phil Sutter
reviewerPATCH 7/8 xtables-monitor: Ignore ebtables policy rules unless tracing
In reply to Phil SutterDo not expose this implementation detail to users, otherwise new user-defined chains are followed by a new rule event.
When tracing, they are useful as they potentially terminate rule traversal.
--- iptables/nft.c | 2 +- iptables/nft.h | 1 + .../shell/testcases/nft-only/0012-xtables-monitor_0 | 11 ++--------- iptables/xtables-monitor.c | 7 +++++++ 4 files changed, 11 insertions(+), 10 deletions(-)
iptables/nft.c +1 -1
@@ -1813,7 +1813,7 @@ nft_rule_print_save(struct nft_handle *h, const struct nftnl_rule *r,return ret; } -static bool nft_rule_is_policy_rule (struct nftnl_rule *r) +bool nft_rule_is_policy_rule (struct nftnl_rule *r) {const struct nftnl_udata *tb[UDATA_TYPE_MAX +1 ] = {};const void *data;
iptables/nft.h +1 -0
@@ -185,6 +185,7 @@ int nft_rule_list_save(struct nft_handle *h, const char *chain, const char *tablint nft_rule_save (struct nft_handle *h,const char *table,unsigned int format);int nft_rule_flush (struct nft_handle *h,const char *chain,const char *table,bool verbose);int nft_rule_zero_counters (struct nft_handle *h,const char *chain,const char *table,int rulenum); +bool nft_rule_is_policy_rule (struct nftnl_rule *r);/* * Operations used in userspace tools
iptables/tests/shell/testcases/nft-only/0012-xtables-monitor_0 +2 -9
@@ -51,7 +51,6 @@ EXP="\ EVENT: -6 -t filter -A FORWARD -j ACCEPT" monitorcheck ip6tables -A FORWARD -j ACCEPT -# FIXME EXP="\ EVENT: nft: NEW table: table filter bridge flags 0 use 1 handle 0 EVENT: nft: NEW chain: bridge filter FORWARD use 1 type filter hook forward prio -200 policy accept packets 0 bytes 0 flags 1
@@ -70,10 +69,7 @@ monitorcheck iptables -N foo EXP=" EVENT: -6 -t filter -N foo" monitorcheck ip6tables -N foo -# FIXME -EXP="\ - EVENT: nft: NEW chain: bridge filter foo use 1 - EVENT: ebtables -t filter -A foo -j ACCEPT" +EXP=" EVENT: nft: NEW chain: bridge filter foo use 1" monitorcheck ebtables -N foo EXP=" EVENT: -0 -t filter -N foo"
@@ -110,10 +106,7 @@ monitorcheck iptables -X foo EXP=" EVENT: -6 -t filter -X foo" monitorcheck ip6tables -X foo -# FIXME -EXP="\ - EVENT: ebtables -t filter -D foo -j ACCEPT - EVENT: nft: DEL chain: bridge filter foo use 0" +EXP=" EVENT: nft: DEL chain: bridge filter foo use 0" monitorcheck ebtables -X foo EXP=" EVENT: -0 -t filter -X foo"
iptables/xtables-monitor.c +7 -0
@@ -96,6 +96,13 @@ static int rule_cb(const struct nlmsghdr *nlh, void *data) arg->h->ops =nft_family_ops_lookup (family); arg->h->family = family; +/* ignore policy rules unless tracing, +* they are reported when deleting user-defined chains */ +if (family ==NFPROTO_BRIDGE && + arg->is_event && +nft_rule_is_policy_rule (r)) + goto err_free; +if (arg->is_event)printf (" EVENT: " );switch (family) {
Signature · 1 line
2.43.0
Phil Sutter
reviewerRFC PATCH 8/8 xtables-monitor: Print commands instead of -4/-6/-0 flags
In reply to Phil SutterThe '-4' and '-6' flags are a rarely used feature of iptables-restore. The '-0' flag is purely artificial and not recognized anywhere (at least not as an arptables rule prefix in this sense). Finally, there is no such flag for ebtables in the first place. Go with a more intuitively clear approach and instead print the typical command which added the rule being printed.
--- .../testcases/nft-only/0012-xtables-monitor_0 | 40 +++++------ iptables/xtables-monitor.c | 66 +++++++++---------- 2 files changed, 50 insertions(+), 56 deletions(-)
iptables/tests/shell/testcases/nft-only/0012-xtables-monitor_0 +20 -20
@@ -42,13 +42,13 @@ monitorcheck() { # (cmd ...) EXP="\ EVENT: nft: NEW table: table filter ip flags 0 use 1 handle 0 EVENT: nft: NEW chain: ip filter FORWARD use 1 type filter hook forward prio 0 policy accept packets 0 bytes 0 flags 1 - EVENT: -4 -t filter -A FORWARD -j ACCEPT" + EVENT: iptables -t filter -A FORWARD -j ACCEPT" monitorcheck iptables -A FORWARD -j ACCEPT EXP="\ EVENT: nft: NEW table: table filter ip6 flags 0 use 1 handle 0 EVENT: nft: NEW chain: ip6 filter FORWARD use 1 type filter hook forward prio 0 policy accept packets 0 bytes 0 flags 1 - EVENT: -6 -t filter -A FORWARD -j ACCEPT" + EVENT: ip6tables -t filter -A FORWARD -j ACCEPT" monitorcheck ip6tables -A FORWARD -j ACCEPT EXP="\
@@ -60,68 +60,68 @@ monitorcheck ebtables -A FORWARD -j ACCEPT EXP="\ EVENT: nft: NEW table: table filter arp flags 0 use 1 handle 0 EVENT: nft: NEW chain: arp filter INPUT use 1 type filter hook input prio 0 policy accept packets 0 bytes 0 flags 1 - EVENT: -0 -t filter -A INPUT -j ACCEPT" + EVENT: arptables -t filter -A INPUT -j ACCEPT" monitorcheck arptables -A INPUT -j ACCEPT -EXP=" EVENT: -4 -t filter -N foo" +EXP=" EVENT: iptables -t filter -N foo" monitorcheck iptables -N foo -EXP=" EVENT: -6 -t filter -N foo" +EXP=" EVENT: ip6tables -t filter -N foo" monitorcheck ip6tables -N foo -EXP=" EVENT: nft: NEW chain: bridge filter foo use 1" +EXP=" EVENT: ebtables -t filter -N foo" monitorcheck ebtables -N foo -EXP=" EVENT: -0 -t filter -N foo" +EXP=" EVENT: arptables -t filter -N foo" monitorcheck arptables -N foo # meta l4proto matches require proper nft_handle:family value -EXP=" EVENT: -4 -t filter -A FORWARD -i eth1 -o eth2 -p tcp -m tcp --dport 22 -j ACCEPT" +EXP=" EVENT: iptables -t filter -A FORWARD -i eth1 -o eth2 -p tcp -m tcp --dport 22 -j ACCEPT" monitorcheck iptables -A FORWARD -i eth1 -o eth2 -p tcp --dport 22 -j ACCEPT -EXP=" EVENT: -6 -t filter -A FORWARD -i eth1 -o eth2 -p udp -m udp --sport 1337 -j ACCEPT" +EXP=" EVENT: ip6tables -t filter -A FORWARD -i eth1 -o eth2 -p udp -m udp --sport 1337 -j ACCEPT" monitorcheck ip6tables -A FORWARD -i eth1 -o eth2 -p udp --sport 1337 -j ACCEPT EXP=" EVENT: ebtables -t filter -A FORWARD -p IPv4 -i eth1 -o eth2 --ip-proto udp --ip-sport 1337 -j ACCEPT" monitorcheck ebtables -A FORWARD -i eth1 -o eth2 -p ip --ip-protocol udp --ip-source-port 1337 -j ACCEPT -EXP=" EVENT: -0 -t filter -A INPUT -j ACCEPT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06" +EXP=" EVENT: arptables -t filter -A INPUT -j ACCEPT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06" monitorcheck arptables -A INPUT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06 -j ACCEPT -EXP=" EVENT: -4 -t filter -D FORWARD -i eth1 -o eth2 -p tcp -m tcp --dport 22 -j ACCEPT" +EXP=" EVENT: iptables -t filter -D FORWARD -i eth1 -o eth2 -p tcp -m tcp --dport 22 -j ACCEPT" monitorcheck iptables -D FORWARD -i eth1 -o eth2 -p tcp --dport 22 -j ACCEPT -EXP=" EVENT: -6 -t filter -D FORWARD -i eth1 -o eth2 -p udp -m udp --sport 1337 -j ACCEPT" +EXP=" EVENT: ip6tables -t filter -D FORWARD -i eth1 -o eth2 -p udp -m udp --sport 1337 -j ACCEPT" monitorcheck ip6tables -D FORWARD -i eth1 -o eth2 -p udp --sport 1337 -j ACCEPT EXP=" EVENT: ebtables -t filter -D FORWARD -p IPv4 -i eth1 -o eth2 --ip-proto udp --ip-sport 1337 -j ACCEPT" monitorcheck ebtables -D FORWARD -i eth1 -o eth2 -p ip --ip-protocol udp --ip-source-port 1337 -j ACCEPT -EXP=" EVENT: -0 -t filter -D INPUT -j ACCEPT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06" +EXP=" EVENT: arptables -t filter -D INPUT -j ACCEPT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06" monitorcheck arptables -D INPUT -i eth1 -s 1.2.3.4 --src-mac 01:02:03:04:05:06 -j ACCEPT -EXP=" EVENT: -4 -t filter -X foo" +EXP=" EVENT: iptables -t filter -X foo" monitorcheck iptables -X foo -EXP=" EVENT: -6 -t filter -X foo" +EXP=" EVENT: ip6tables -t filter -X foo" monitorcheck ip6tables -X foo -EXP=" EVENT: nft: DEL chain: bridge filter foo use 0" +EXP=" EVENT: ebtables -t filter -X foo" monitorcheck ebtables -X foo -EXP=" EVENT: -0 -t filter -X foo" +EXP=" EVENT: arptables -t filter -X foo" monitorcheck arptables -X foo -EXP=" EVENT: -4 -t filter -D FORWARD -j ACCEPT" +EXP=" EVENT: iptables -t filter -D FORWARD -j ACCEPT" monitorcheck iptables -F FORWARD -EXP=" EVENT: -6 -t filter -D FORWARD -j ACCEPT" +EXP=" EVENT: ip6tables -t filter -D FORWARD -j ACCEPT" monitorcheck ip6tables -F FORWARD EXP=" EVENT: ebtables -t filter -D FORWARD -j ACCEPT" monitorcheck ebtables -F FORWARD -EXP=" EVENT: -0 -t filter -D INPUT -j ACCEPT" +EXP=" EVENT: arptables -t filter -D INPUT -j ACCEPT" monitorcheck arptables -F INPUT EXP=" EVENT: nft: DEL chain: ip filter FORWARD use 0 type filter hook forward prio 0 policy accept packets 0 bytes 0 flags 1"
iptables/xtables-monitor.c +30 -36
92 lines not on this page · raw message
Signature · 1 line
2.43.0
Phil Sutter
reviewerQuoted 7 lines · Phil Sutter
The patches in this series progress from fixes to features, and for the last two I'm not sure they are acceptable as-is: Patch 7 is not entirely complete, one should follow-up printing ebtables policy rules like builtin chain policies in traces but it requires quite some code churn. Patch 8 changes output of both events and traces, thus might break existing scripts parsing xtables-monitor output.
Quoted 9 lines
Phil Sutter (8):
xtables-monitor: Proper re-init for rule's family
xtables-monitor: Flush stdout after all lines of output
xtables-monitor: Align builtin chain and table output
xtables-monitor: Support arptables chain events
tests: shell: New xtables-monitor test
xtables-monitor: Fix for ebtables rule events
xtables-monitor: Ignore ebtables policy rules unless tracing
xtables-monitor: Print commands instead of -4/-6/-0 flags
Series applied.