12469 Commits

Author SHA1 Message Date
Rainer Gerhards
6d1a81e5ce
Merge pull request #2802 from rgerhards/no-memcheck
cleanup: remove no longer needed --enable-memcheck
2018-06-28 08:49:40 +02:00
Rainer Gerhards
3a25ed68ae
cleanup: remove no longer needed --enable-memcheck
veeeeery old testing capability, no longer functional but
causes build to fail if enabled. Replaced by ASAN/valgrind.

Issue detected while testing some other CI settings.
2018-06-27 10:29:48 +02:00
Rainer Gerhards
55b3e4e5e2
maintain ChangeLog 2018-06-27 10:11:15 +02:00
Rainer Gerhards
fba9c542be
Merge pull request #2798 from mbiebl/no-gcrypt
Don't link tcpflood against -lgcrypt
2018-06-27 10:04:14 +02:00
Rainer Gerhards
0979e2b627
maintain ChangeLog 2018-06-27 08:57:47 +02:00
Rainer Gerhards
58ade7cfb1
Merge pull request #2797 from rgerhards/i342
core: provide a somewhat better default action name
2018-06-27 08:54:15 +02:00
Rainer Gerhards
52e1580ac0 core: provide a somewhat better default action name
We now inlcude the module name (e.g. "omelasticsearch" or "builtin:omfile")
as part of the name. This is still not perfect, but hopefully a bit
easier to grasp.

see also https://github.com/rsyslog/rsyslog/issues/342
2018-06-26 19:08:25 +02:00
Rainer Gerhards
75c3d817e3
maintain ChangeLog 2018-06-26 19:07:04 +02:00
Rainer Gerhards
4db2f818ea
Merge pull request #2796 from rgerhards/CI-test-only
fix some build issues on CentOS 6
2018-06-26 19:05:40 +02:00
Michael Biebl
eb55f862fa Don't link tcpflood against -lgcrypt
While older GnuTLS versions do use gcrypt, newer version no longer do.

From
https://www.gnutls.org/manual/html_node/Cryptographic-Backend.html

"
Cryptographic library layer

The Cryptographic library layer, currently supports only libnettle.
Older versions of GnuTLS used to support libgcrypt, but it was switched
with nettle mainly for performance reasons and secondary because it is
a simpler library to use. In the future other cryptographic libraries
might be supported as well.
"
2018-06-26 17:57:05 +02:00
Rainer Gerhards
c4df7e90cd
testbench: enable mmkubernetes test only if dependencies are present
current test requries imfile and mmjsonparse, so we need to ensure test
is only run if these are also enabled.
2018-06-26 16:49:30 +02:00
Rainer Gerhards
7a485b7794
maintain ChangeLog 2018-06-26 15:04:31 +02:00
Rainer Gerhards
4a060a3c20
Merge pull request #2794 from radosroka/strmFlushInternal-race
Fixed race in asyncWriter
2018-06-26 15:02:51 +02:00
Rainer Gerhards
235e28b1e2
omelasticsearch: fix build warning on CentOS6
Long-standing "bug" (cosmetic). CentOS 6 libraries define a global
variable "index", which clashes with ours.

Detected after turning on building omelasticsearch on CentOS 6.
2018-06-26 14:03:26 +02:00
Rainer Gerhards
a14244eede
omelasticsearch: fix regression
Commit 6d4635efbb13907bf651b1a6e5a545effe84d9d9 introduced some compile
problems, which were only detected on CentOS6, which unfortunately did
not compile omelasticsearch during CI runs.
2018-06-26 13:56:50 +02:00
Rainer Gerhards
77ffd44413
maintain ChangeLog 2018-06-26 13:05:31 +02:00
Abdul Waheed
69f8e1d1f7 imjournal: add journal impstats
imjournal: journal visibility through additional impstats counters
2018-06-26 13:01:27 +02:00
Radovan Sroka
7e88634f3d Fixed race in asyncWriter
strmFlushInternal needs to be called with locked mutex
2018-06-26 12:50:02 +02:00
Rainer Gerhards
d7642c1567
bump version number for next development cycle 2018-06-25 17:27:19 +02:00
Rainer Gerhards
1d7e3af5d7
prepare for 8.35.0 release v8.36.0 2018-06-25 17:19:57 +02:00
Rainer Gerhards
b0e613c8df
Merge pull request #2792 from rgerhards/cov-190327
imrelp: fix regression from very recent commit
2018-06-25 17:01:53 +02:00
Rainer Gerhards
6ed63830e8 maintain ChangeLog 2018-06-25 14:11:28 +02:00
Rainer Gerhards
3267d70470
Merge pull request #2487 from HugoSoszynski/dev
[ommongodb] Adding possibility to ignore some insertion error code
2018-06-25 14:07:01 +02:00
Rainer Gerhards
a78220a933 imrelp: fix regression from very recent commit
Commit 32b71daa8aadb8f16fe0ca2945e54d593f47a824 introduced a
potential misadressing of "inst" during error processing. No
version with that commit was ever released.

Detected by Coverity Scan, CID 190327
2018-06-25 11:30:32 +02:00
Rainer Gerhards
1bcfe083df maintain ChangeLog 2018-06-25 10:33:30 +02:00
Rainer Gerhards
249bd0bce3
Merge pull request #2729 from rgerhards/imptcp-multiline
imptcp: experimental multiline support via regex
2018-06-25 10:30:51 +02:00
Rainer Gerhards
bd71022727 omongodb: use array-mode config interface where it makes sense 2018-06-25 09:57:52 +02:00
Hugo Soszynski
1b5f226693 Correcting line length 2018-06-25 09:57:52 +02:00
Hugo Soszynski
08ca400489 Added new directive to the README 2018-06-25 09:57:52 +02:00
Hugo Soszynski
0b2a79d8d8 Added new configuration option "allowed_error_codes".
The behavior of ommongodb was for a long time to abort on MongoDB insertion error; keeping this behavior, I wanted to add the possibility to ignore some error code that may be allowed in some configuration (ex. 11000 DuplicateKey in case of collection containing a unique filed).
The directive arguments MUST be in the following format (handling a maximum of 256 codes): "11000,...,17,64"
2018-06-25 09:57:52 +02:00
Rainer Gerhards
9411a6e5b6
Merge pull request #2788 from jgerhards/errmsg-mmnormalize
mmnormalize: use new errmsg interface
2018-06-23 10:55:57 +02:00
Rainer Gerhards
f81502b96f imptcp: add support for regex-based framing
for complex multi-line messages (XML in particular), the multiLine method
does not work. We now have a capability to specify via a regex when a frame
starts (and the previous thus ends).

adds imptcp input parameter "framing.delimiter.regex"
2018-06-22 19:09:45 +02:00
Rainer Gerhards
98d944bc55
Merge pull request #2785 from alorbach/openssl-fixes
openssl: fixed coverty issues
2018-06-22 19:01:25 +02:00
341e6a3f70 openssl: fixed coverty issues 190592, 190593, 190594 2018-06-22 14:40:08 +02:00
Rainer Gerhards
7620caeb29 maintain ChangeLog 2018-06-22 11:21:30 +02:00
Rainer Gerhards
978cca35a7
Merge pull request #2405 from rgerhards/testbench-improve
some testbench improvements
2018-06-22 11:18:35 +02:00
Jan Gerhards
8cd04da2c4 mmnormalize: use new errmsg interface
see also https://github.com/rsyslog/rsyslog/issues/1684
2018-06-21 17:21:21 +02:00
Rainer Gerhards
9cf9f2e8b7 testbench: change elasticsearch tests to use new plumbing
This makes the ES tests more universally available (they should now
also support running in containers). It also simplifies the tests
as fewer support files are needed.
2018-06-18 17:12:08 +02:00
Rainer Gerhards
32a4f35d26
Merge pull request #2779 from rgerhards/travis-openssl
travis: add checks for openssl drivers
2018-06-18 11:16:36 +02:00
Rainer Gerhards
8d49eb61d4 testbench: run test that require IPv6 stack only when available
First test was introduced in openssl work; failed when no IPv6 was
present.  Now it skips.
2018-06-18 09:34:03 +02:00
Rainer Gerhards
4816291576 openssl subsystem: fix build issue 2018-06-17 14:37:42 +02:00
Rainer Gerhards
31ce76d135 travis: add checks for openssl drivers 2018-06-17 14:35:43 +02:00
Rainer Gerhards
358f4c0a62
Merge pull request #2781 from jgerhards/errmsg-nsd_ossl
nsd_ossl: use new errmsg interface
2018-06-17 14:34:18 +02:00
Jan Gerhards
8b5692a26a nsd_ossl: use new errmsg interface
see also https://github.com/rsyslog/rsyslog/issues/1684
2018-06-17 12:43:09 +02:00
Rainer Gerhards
471a116830
Merge pull request #2777 from rgerhards/nsd-gtls-misadressing
nds_gtls: fix regression that could lead to attack (never released)
2018-06-15 08:48:21 +02:00
Rainer Gerhards
9da5eb8cd6 devtools: permit to override default container 2018-06-14 15:15:53 +02:00
Rainer Gerhards
63ad5ecf6d nds_gtls: fix regression that could lead to attack (never released version)
Commit 7589f42e45888b83f5c2a0d788896d41e6a6a598 introduced support
for loading certificate chains. Unfortunatley the max number of permitted
certificates was miscalculated and so a certificate chain with more than
10 certificates could lead to a buffer overrun. This patch corrects this.

Note that the commit was merged just yesterday and there was no release
with the affected code.

Also, this commit adds  GNUTLS_X509_CRT_LIST_IMPORT_FAIL_IF_EXCEED to
ensure the certificate export will fail with an error message if the
certificate list contains too many certificates. Thx to Arne Nordmark
for suggesting that option.
2018-06-14 14:19:22 +02:00
Rainer Gerhards
6442c85194
Merge pull request #2778 from sjvs/update-lgtm.yml-libfastjson
Update lgtm.yml for LGTM.com analysis (with more recent libfastjson-dev)
2018-06-14 14:17:06 +02:00
Bas van Schaik
556f87aa28 try installing tcl-dev for --enable-omtcl 2018-06-14 12:35:46 +01:00
Bas van Schaik
556227411b Try --enable-mmgrok --enable-omtcl as well 2018-06-14 12:26:24 +01:00