From 202e10e24ca658f91c3aef87c017e8f0525744b5 Mon Sep 17 00:00:00 2001 From: Rainer Gerhards Date: Mon, 25 Oct 2021 09:18:44 +0200 Subject: [PATCH] testbench: add test for legacy permittedPeer statement This is required to ensure backwards compatibility when doing changes to the networking subsystem. So far this was not covered by any test. Conflict:NA Reference:https://github.com/rsyslog/rsyslog/commit/202e10e24ca658f91c3aef87c017e8f0525744b5 --- tests/Makefile.am | 2 ++ tests/imtcp-tls-gtls-x509name-legacy.sh | 33 +++++++++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100755 tests/imtcp-tls-gtls-x509name-legacy.sh diff --git a/tests/Makefile.am b/tests/Makefile.am index a68b6eb..9cc18a4 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1267,6 +1267,7 @@ TESTS += \ imtcp-tls-gtls-x509fingerprint.sh \ imtcp-tls-gtls-x509name-invld.sh \ imtcp-tls-gtls-x509name.sh \ + imtcp-tls-gtls-x509name-legacy.sh \ imtcp-drvr-in-input-basic.sh \ imtcp-multi-drvr-basic.sh \ imtcp-multi-drvr-basic-parallel.sh @@ -2130,6 +2131,7 @@ EXTRA_DIST= \ imtcp-tls-gtls-x509fingerprint.sh \ imtcp-tls-gtls-x509name-invld.sh \ imtcp-tls-gtls-x509name.sh \ + imtcp-tls-gtls-x509name-legacy.sh \ imtcp-drvr-in-input-basic.sh \ imtcp-multi-drvr-basic.sh \ imtcp-multi-drvr-basic-parallel.sh \ diff --git a/tests/imtcp-tls-gtls-x509name-legacy.sh b/tests/imtcp-tls-gtls-x509name-legacy.sh new file mode 100755 index 0000000..c2c9bdd --- /dev/null +++ b/tests/imtcp-tls-gtls-x509name-legacy.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# This file is part of the rsyslog project, released under ASL 2.0 +. ${srcdir:=.}/diag.sh init +export NUMMESSAGES=1 +generate_conf +add_conf ' +global( defaultNetstreamDriverCAFile="'$srcdir/tls-certs/ca.pem'" + defaultNetstreamDriverCertFile="'$srcdir/tls-certs/cert.pem'" + defaultNetstreamDriverKeyFile="'$srcdir/tls-certs/key.pem'" +) + + +# NOTE: we intentionally use legacy statements here! This *IS* what we want to test! +$ModLoad ../plugins/imtcp/.libs/imtcp +$inputTcpserverStreamdriverPermittedPeer rsyslog-client + +input(type="imtcp" port="0" listenPortFileName="'$RSYSLOG_DYNNAME'.tcpflood_port" + StreamDriver.Name="gtls" + StreamDriver.Mode="1" + StreamDriver.AuthMode="x509/name") + +template(name="outfmt" type="string" string="%msg:F,58:2%\n") +:msg, contains, "msgnum:" action( type="omfile" + template="outfmt" + file=`echo $RSYSLOG_OUT_LOG`) +' +startup +tcpflood -p'$TCPFLOOD_PORT' -m$NUMMESSAGES -Ttls -x$srcdir/tls-certs/ca.pem -Z$srcdir/tls-certs/cert.pem -z$srcdir/tls-certs/key.pem +wait_file_lines +shutdown_when_empty +wait_shutdown +seq_check +exit_test -- 2.27.0