Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

mmanon: add support for ipv6 #1748

Merged
merged 2 commits into from Sep 5, 2017
Merged

mmanon: add support for ipv6 #1748

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
21d64f3
mmanon: rewrite ipv4-anonymization
jgerhards Aug 17, 2017
f9ba3db
mmanon: add support for ipv6
jgerhards Aug 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
951 changes: 799 additions & 152 deletions plugins/mmanon/mmanon.c
View file
Open in desktop

Large diffs are not rendered by default.

34 changes: 34 additions & 0 deletions tests/Makefile.am
View file
Open in desktop
Expand Up @@ -239,6 +239,23 @@ TESTS += \
rscript_ne_var.sh \
rscript_num2ipv4.sh \
rscript_trim.sh \
mmanon_random_32_ipv4.sh \
mmanon_random_cons_32_ipv4.sh \
mmanon_recognize_ipv4.sh \
mmanon_zero_12_ipv4.sh \
mmanon_zero_33_ipv4.sh \
mmanon_zero_8_ipv4.sh \
mmanon_simple_12_ipv4.sh \
mmanon_simple_33_ipv4.sh \
mmanon_simple_8_ipv4.sh \
mmanon_random_128_ipv6.sh \
mmanon_zero_128_ipv6.sh \
mmanon_zero_96_ipv6.sh \
mmanon_random_cons_128_ipv6.sh \
mmanon_zero_50_ipv6.sh \
mmanon_recognize_ipv6.sh \
mmanon_zero_64_ipv6.sh \
mmanon_both_modes_compatible.sh \
empty-prop-comparison.sh \
rs_optimizer_pri.sh \
cee_simple.sh \
Expand Down Expand Up @@ -826,6 +843,23 @@ EXTRA_DIST= \
rscript_ne_var.sh \
rscript_num2ipv4.sh \
rscript_trim.sh \
mmanon_random_32_ipv4.sh \
mmanon_random_cons_32_ipv4.sh \
mmanon_recognize_ipv4.sh \
mmanon_zero_12_ipv4.sh \
mmanon_zero_33_ipv4.sh \
mmanon_zero_8_ipv4.sh \
mmanon_simple_12_ipv4.sh \
mmanon_simple_33_ipv4.sh \
mmanon_simple_8_ipv4.sh \
mmanon_random_128_ipv6.sh \
mmanon_zero_128_ipv6.sh \
mmanon_zero_96_ipv6.sh \
mmanon_random_cons_128_ipv6.sh \
mmanon_zero_50_ipv6.sh \
mmanon_recognize_ipv6.sh \
mmanon_zero_64_ipv6.sh \
mmanon_both_modes_compatible.sh \
testsuites/rscript_ne_var.conf \
rscript_eq.sh \
testsuites/rscript_eq.conf \
Expand Down
35 changes: 35 additions & 0 deletions tests/mmanon_both_modes_compatible.sh
View file
Open in desktop
@@ -0,0 +1,35 @@
#!/bin/bash
# add 2016-11-22 by Jan Gerhards, released under ASL 2.0
. $srcdir/diag.sh init
. $srcdir/diag.sh generate-conf
. $srcdir/diag.sh add-conf '
template(name="outfmt" type="string" string="%msg%\n")

module(load="../plugins/mmanon/.libs/mmanon")
module(load="../plugins/imtcp/.libs/imtcp")
input(type="imtcp" port="13514" ruleset="testing")

ruleset(name="testing") {
action(type="mmanon" ipv4.enable="on" ipv4.mode="zero" ipv4.bits="32" ipv6.bits="128" ipv6.anonmode="zero" ipv6.enable="on")
action(type="omfile" file="rsyslog.out.log" template="outfmt")
}'

. $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1 -M "\"<129>Mar 10 01:00:00 172.20.245.8 tag: FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF
<129>Mar 10 01:00:00 172.20.245.8 tag: 1.1.1.8 space 61:34:ad::7:F
<129>Mar 10 01:00:00 172.20.245.8 tag: 111.1.1.8
<129>Mar 10 01:00:00 172.20.245.8 tag: abf:3:002::500F:ce 1.1.1.9\""

. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
echo ' 0:0:0:0:0:0:0:0
0.0.0.0 space 0:0:0:0:0:0:0:0
0.0.0.0
0:0:0:0:0:0:0:0 0.0.0.0' | cmp rsyslog.out.log
if [ ! $? -eq 0 ]; then
echo "invalid response generated, rsyslog.out.log is:"
cat rsyslog.out.log
. $srcdir/diag.sh error-exit 1
fi;

. $srcdir/diag.sh exit
64 changes: 64 additions & 0 deletions tests/mmanon_random_128_ipv6.sh
View file
Open in desktop
@@ -0,0 +1,64 @@
#!/bin/bash
# add 2016-11-22 by Jan Gerhards, released under ASL 2.0
. $srcdir/diag.sh init
. $srcdir/diag.sh generate-conf
. $srcdir/diag.sh add-conf '
template(name="outfmt" type="string" string="%msg%\n")
template(name="filename" type="string" string="rsyslog.out.%syslogtag%.log")

module(load="../plugins/mmanon/.libs/mmanon")
module(load="../plugins/imtcp/.libs/imtcp")
input(type="imtcp" port="13514" ruleset="testing")

ruleset(name="testing") {
action(type="mmanon" ipv6.anonmode="random" ipv6.bits="128" ipv6.enable="on")
action(type="omfile" dynafile="filename" template="outfmt")
}'

echo 'Since this test tests randomization, there is a theoretical possibility of it failing even if rsyslog works correctly. Therefore, if the test unexpectedly fails try restarting it.'
. $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1 -M "\"<129>Mar 10 01:00:00 172.20.245.8 file1 33:45:DDD::4
<129>Mar 10 01:00:00 172.20.245.8 file2 ::
<129>Mar 10 01:00:00 172.20.245.8 file3 72:8374:adc7:47FF::43:0:1AFE
<129>Mar 10 01:00:00 172.20.245.8 file4 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF
<129>Mar 10 01:00:00 172.20.245.8 file5 72:8374:adc7:47FF::43:0:1AFE\""

. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
echo ' 33:45:DDD::4' | cmp rsyslog.out.file1.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file1.log is:"
cat rsyslog.out.file1.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' ::' | cmp rsyslog.out.file2.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file2.log is:"
cat rsyslog.out.file2.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' 72:8374:adc7:47FF::43:0:1AFE' | cmp rsyslog.out.file3.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file3.log is:"
cat rsyslog.out.file3.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF' | cmp rsyslog.out.file4.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file4.log is:"
cat rsyslog.out.file4.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file3.log rsyslog.out.file5.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-addresses generated, rsyslog.out.file3.log and rsyslog.out.file5.log are:"
cat rsyslog.out.file3.log
cat rsyslog.out.file5.log
. $srcdir/diag.sh error-exit 1
fi;

. $srcdir/diag.sh exit
64 changes: 64 additions & 0 deletions tests/mmanon_random_32_ipv4.sh
View file
Open in desktop
@@ -0,0 +1,64 @@
#!/bin/bash
# add 2016-11-22 by Jan Gerhards, released under ASL 2.0
. $srcdir/diag.sh init
. $srcdir/diag.sh generate-conf
. $srcdir/diag.sh add-conf '
template(name="outfmt" type="string" string="%msg%\n")
template(name="filename" type="string" string="rsyslog.out.%syslogtag%.log")

module(load="../plugins/mmanon/.libs/mmanon")
module(load="../plugins/imtcp/.libs/imtcp")
input(type="imtcp" port="13514" ruleset="testing")

ruleset(name="testing") {
action(type="mmanon" ipv4.mode="random" ipv4.bits="32")
action(type="omfile" dynafile="filename" template="outfmt")
}'

echo 'Since this test tests randomization, there is a theoretical possibility of it failing even if rsyslog works correctly. Therefore, if the test unexpectedly fails try restarting it.'
. $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1 -M "\"<129>Mar 10 01:00:00 172.20.245.8 file1 1.1.1.8
<129>Mar 10 01:00:00 172.20.245.8 file2 0.0.0.0
<129>Mar 10 01:00:00 172.20.245.8 file3 172.0.234.255
<129>Mar 10 01:00:00 172.20.245.8 file4 111.1.1.8.
<129>Mar 10 01:00:00 172.20.245.8 file5 172.0.234.255\""

. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
echo ' 1.1.1.8' | cmp rsyslog.out.file1.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file1.log is:"
cat rsyslog.out.file1.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' 0.0.0.0' | cmp rsyslog.out.file2.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file2.log is:"
cat rsyslog.out.file2.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' 172.0.234.255' | cmp rsyslog.out.file3.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file3.log is:"
cat rsyslog.out.file3.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' 111.1.1.8.' | cmp rsyslog.out.file4.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file4.log is:"
cat rsyslog.out.file4.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file3.log rsyslog.out.file5.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-addresses generated, rsyslog.out.file3.log and rsyslog.out.file5.log are:"
cat rsyslog.out.file3.log
cat rsyslog.out.file5.log
. $srcdir/diag.sh error-exit 1
fi;

. $srcdir/diag.sh exit
81 changes: 81 additions & 0 deletions tests/mmanon_random_cons_128_ipv6.sh
View file
Open in desktop
@@ -0,0 +1,81 @@
#!/bin/bash
# add 2016-11-22 by Jan Gerhards, released under ASL 2.0
. $srcdir/diag.sh init
. $srcdir/diag.sh generate-conf
. $srcdir/diag.sh add-conf '
template(name="outfmt" type="string" string="%msg%\n")
template(name="filename" type="string" string="rsyslog.out.%syslogtag%.log")

module(load="../plugins/mmanon/.libs/mmanon")
module(load="../plugins/imtcp/.libs/imtcp")
input(type="imtcp" port="13514" ruleset="testing")

ruleset(name="testing") {
action(type="mmanon" ipv6.anonmode="random-consistent" ipv6.bits="128")
action(type="omfile" dynafile="filename" template="outfmt")
}'

echo 'Since this test tests randomization, there is a theoretical possibility of it failing even if rsyslog works correctly. Therefore, if the test unexpectedly fails try restarting it.'
. $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1 -M "\"<129>Mar 10 01:00:00 172.20.245.8 file1 33:45:DDD::4
<129>Mar 10 01:00:00 172.20.245.8 file2 ::
<129>Mar 10 01:00:00 172.20.245.8 file6 ::
<129>Mar 10 01:00:00 172.20.245.8 file3 72:8374:adc7:47FF::43:0:1AFE
<129>Mar 10 01:00:00 172.20.245.8 file4 FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF
<129>Mar 10 01:00:00 172.20.245.8 file5 72:8374:adc7:47FF::43:0:1AFE\""

. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
echo ' 33:45:DDD::4' | cmp rsyslog.out.file1.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file1.log is:"
cat rsyslog.out.file1.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' ::' | cmp rsyslog.out.file2.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file2.log is:"
cat rsyslog.out.file2.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' 72:8374:adc7:47FF::43:0:1AFE' | cmp rsyslog.out.file3.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file3.log is:"
cat rsyslog.out.file3.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF:FFFF' | cmp rsyslog.out.file4.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file4.log is:"
cat rsyslog.out.file4.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file3.log rsyslog.out.file5.log >/dev/null
if [ ! $? -eq 0 ]; then
echo "invalidly unequal ip-addresses generated, rsyslog.out.file1.log and rsyslog.out.file6.log are:"
cat rsyslog.out.file1.log
cat rsyslog.out.file6.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file2.log rsyslog.out.file6.log >/dev/null
if [ ! $? -eq 0 ]; then
echo "invalidly unequal ip-addresses generated, rsyslog.out.file1.log and rsyslog.out.file6.log are:"
cat rsyslog.out.file1.log
cat rsyslog.out.file6.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file4.log rsyslog.out.file5.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-addresses generated, rsyslog.out.file4.log and rsyslog.out.file5.log are:"
cat rsyslog.out.file4.log
cat rsyslog.out.file5.log
. $srcdir/diag.sh error-exit 1
fi;

. $srcdir/diag.sh exit
91 changes: 91 additions & 0 deletions tests/mmanon_random_cons_32_ipv4.sh
View file
Open in desktop
@@ -0,0 +1,91 @@
#!/bin/bash
# add 2016-11-22 by Jan Gerhards, released under ASL 2.0
. $srcdir/diag.sh init
. $srcdir/diag.sh generate-conf
. $srcdir/diag.sh add-conf '
template(name="outfmt" type="string" string="%msg%\n")
template(name="filename" type="string" string="rsyslog.out.%syslogtag%.log")

module(load="../plugins/mmanon/.libs/mmanon")
module(load="../plugins/imtcp/.libs/imtcp")
input(type="imtcp" port="13514" ruleset="testing")

ruleset(name="testing") {
action(type="mmanon" ipv4.mode="random-consistent" ipv4.bits="32")
action(type="omfile" dynafile="filename" template="outfmt")
}'

echo 'Since this test tests randomization, there is a theoretical possibility of it failing even if rsyslog works correctly. Therefore, if the test unexpectedly fails try restarting it.'
. $srcdir/diag.sh startup
. $srcdir/diag.sh tcpflood -m1 -M "\"<129>Mar 10 01:00:00 172.20.245.8 file1 1.1.1.8
<129>Mar 10 01:00:00 172.20.245.8 file2 0.0.0.0
<129>Mar 10 01:00:00 172.20.245.8 file3 0.0.0.0
<129>Mar 10 01:00:00 172.20.245.8 file4 172.0.234.255
<129>Mar 10 01:00:00 172.20.245.8 file5 172.1.234.255
<129>Mar 10 01:00:00 172.20.245.8 file6 1.1.1.8
<129>Mar 10 01:00:00 172.20.245.8 file7 111.1.1.8.
<129>Mar 10 01:00:00 172.20.245.8 file8 1.1.1.8\""

. $srcdir/diag.sh shutdown-when-empty
. $srcdir/diag.sh wait-shutdown
echo ' 1.1.1.8' | cmp rsyslog.out.file1.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file1.log is:"
cat rsyslog.out.file1.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' 0.0.0.0' | cmp rsyslog.out.file2.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file2.log is:"
cat rsyslog.out.file2.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' 172.0.234.255' | cmp rsyslog.out.file4.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file4.log is:"
cat rsyslog.out.file4.log
. $srcdir/diag.sh error-exit 1
fi;

echo ' 111.1.1.8.' | cmp rsyslog.out.file7.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-address generated, rsyslog.out.file7.log is:"
cat rsyslog.out.file7.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file1.log rsyslog.out.file6.log >/dev/null
if [ ! $? -eq 0 ]; then
echo "invalidly unequal ip-addresses generated, rsyslog.out.file1.log and rsyslog.out.file6.log are:"
cat rsyslog.out.file1.log
cat rsyslog.out.file6.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file6.log rsyslog.out.file8.log >/dev/null
if [ ! $? -eq 0 ]; then
echo "invalidly unequal ip-addresses generated, rsyslog.out.file6.log and rsyslog.out.file8.log are:"
cat rsyslog.out.file6.log
cat rsyslog.out.file8.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file2.log rsyslog.out.file3.log >/dev/null
if [ ! $? -eq 0 ]; then
echo "invalidly unequal ip-addresses generated, rsyslog.out.file2.log and rsyslog.out.file3.log are:"
cat rsyslog.out.file2.log
cat rsyslog.out.file3.log
. $srcdir/diag.sh error-exit 1
fi;

cmp rsyslog.out.file4.log rsyslog.out.file5.log >/dev/null
if [ $? -eq 0 ]; then
echo "invalidly equal ip-addresses generated, rsyslog.out.file4.log and rsyslog.out.file5.log are:"
cat rsyslog.out.file4.log
cat rsyslog.out.file5.log
. $srcdir/diag.sh error-exit 1
fi;

. $srcdir/diag.sh exit