rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-12 19:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

testbench bugfix: some tests did not work in make distcheck

Browse Source 
- certificate file missing in dist tarball
- some test cases did not properly specify path to cert file
- also bumping some zookeeper component versions

Thanks to Michael Biebl for alerting us and providing part of
the fix.

closes https://github.com/rsyslog/rsyslog/issues/4446
This commit is contained in:
Rainer Gerhards 2020-11-30 11:31:46 +01:00
parent 17467d6ac8
commit 2ed8a931eb
No known key found for this signature in database
GPG Key ID: 0CB6B2A8BE80B499
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/Makefile.am
View File

@ -1609,6 +1609,7 @@ EXTRA_DIST= \
tls-certs/ca-key.pem \ tls-certs/ca-key.pem \
tls-certs/ca.pem \ tls-certs/ca.pem \
tls-certs/cert.pem \ tls-certs/cert.pem \
tls-certs/certchained.pem \
tls-certs/key.pem \ tls-certs/key.pem \
tls-certs/ca-fail.pem \ tls-certs/ca-fail.pem \
tls-certs/cert-fail.pem \ tls-certs/cert-fail.pem \

12
tests/sndrcv_relp_tls_certvalid.sh
View File

@ -12,9 +12,9 @@ add_conf '
module(load="../plugins/imrelp/.libs/imrelp") module(load="../plugins/imrelp/.libs/imrelp")
# then SENDER sends to this port (not tcpflood!) # then SENDER sends to this port (not tcpflood!)
input(type="imrelp" port="'$PORT_RCVR'" tls="on" input(type="imrelp" port="'$PORT_RCVR'" tls="on"
tls.cacert="tls-certs/ca.pem" tls.cacert="'$srcdir'/tls-certs/ca.pem"
tls.mycert="tls-certs/cert.pem" tls.mycert="'$srcdir'/tls-certs/cert.pem"
tls.myprivkey="tls-certs/key.pem" tls.myprivkey="'$srcdir'/tls-certs/key.pem"
tls.authmode="certvalid" tls.authmode="certvalid"
tls.permittedpeer="rsyslog") tls.permittedpeer="rsyslog")
@ -31,9 +31,9 @@ module(load="../plugins/omrelp/.libs/omrelp")
:msg, contains, "msgnum:" action(type="omrelp" :msg, contains, "msgnum:" action(type="omrelp"
target="127.0.0.1" port="'$PORT_RCVR'" tls="on" target="127.0.0.1" port="'$PORT_RCVR'" tls="on"
tls.cacert="tls-certs/ca.pem" tls.cacert="'$srcdir'/tls-certs/ca.pem"
tls.mycert="tls-certs/cert.pem" tls.mycert="'$srcdir'/tls-certs/cert.pem"
tls.myprivkey="tls-certs/key.pem" tls.myprivkey="'$srcdir'/tls-certs/key.pem"
tls.authmode="certvalid" tls.authmode="certvalid"
tls.permittedpeer="rsyslog") tls.permittedpeer="rsyslog")
action(type="omfile" file="'$RSYSLOG_DYNNAME.errmsgs'") action(type="omfile" file="'$RSYSLOG_DYNNAME.errmsgs'")

8
tests/sndrcv_relp_tls_chainedcert.sh
View File

@ -18,8 +18,8 @@ module( load="../plugins/imrelp/.libs/imrelp"
# then SENDER sends to this port (not tcpflood!) # then SENDER sends to this port (not tcpflood!)
input(type="imrelp" port="'$PORT_RCVR'" input(type="imrelp" port="'$PORT_RCVR'"
tls="on" tls="on"
tls.mycert="tls-certs/certchained.pem" tls.mycert="'$srcdir'/tls-certs/certchained.pem"
tls.myprivkey="tls-certs/key.pem" tls.myprivkey="'$srcdir'/tls-certs/key.pem"
tls.authmode="certvalid" tls.authmode="certvalid"
tls.permittedpeer="rsyslog") tls.permittedpeer="rsyslog")
@ -38,8 +38,8 @@ module( load="../plugins/omrelp/.libs/omrelp"
:msg, contains, "msgnum:" action(type="omrelp" :msg, contains, "msgnum:" action(type="omrelp"
target="127.0.0.1" port="'$PORT_RCVR'" target="127.0.0.1" port="'$PORT_RCVR'"
tls="on" tls="on"
tls.mycert="tls-certs/certchained.pem" tls.mycert="'$srcdir'/tls-certs/certchained.pem"
tls.myprivkey="tls-certs/key.pem" tls.myprivkey="'$srcdir'/tls-certs/key.pem"
tls.authmode="certvalid" tls.authmode="certvalid"
tls.permittedpeer="rsyslog") tls.permittedpeer="rsyslog")
action(type="omfile" file="'$RSYSLOG_DYNNAME.errmsgs'") action(type="omfile" file="'$RSYSLOG_DYNNAME.errmsgs'")