15266 Commits

Author SHA1 Message Date
Rainer Gerhards
31a46e35d1
CI: fix github CodeQL settings
removing invalid and not really needed stuff
2023-01-19 15:13:25 +01:00
Rainer Gerhards
6fae722b79
maintain ChangeLog 2023-01-18 16:56:42 +01:00
Rainer Gerhards
4cca1f564f
Merge pull request #4999 from Cropi/libcapng
Introduce --enable-libcap-ng configure option
2023-01-18 16:53:10 +01:00
alakatos
4d2408bdcb Remove CAP_DAC_OVERRIDE if privileges dropped
This is needed in order to not bypass file permission
checks if privileges are dropped
2023-01-17 13:35:11 +01:00
alakatos
5bbd44159b Adjust the capability set
Remove not needed CAP_PERFMON
Add CAP_DAC_OVERRIDE
2023-01-17 11:19:07 +01:00
Rainer Gerhards
2e50d6632f
maintain ChangeLog 2023-01-16 15:06:28 +01:00
Rainer Gerhards
cea55d31e8
Merge pull request #5051 from lonicerae/fix_wrong_type_conversion_in_cstrLen
Fixed wrong type conversion in cstrLen()
2023-01-16 15:00:31 +01:00
Rainer Gerhards
8d4b115f64
Merge pull request #5065 from rgerhards/substring-enhance
substring function: enhancement and hardening
2023-01-16 14:59:28 +01:00
Rainer Gerhards
accbe44113
maintain ChangeLog 2023-01-16 14:13:52 +01:00
Rainer Gerhards
8715e5556d
Merge pull request #5063 from rgerhards/modern-outchannel
omfile: add action parameters "rotation.*"
2023-01-16 13:16:46 +01:00
Rainer Gerhards
8142c29424
maintain ChangeLog 2023-01-16 12:19:04 +01:00
Rainer Gerhards
37df89e99f
Merge pull request #5027 from VultureProject/ffaup_thread_fix
Fix ffaup thread safety
2023-01-16 12:13:13 +01:00
Rainer Gerhards
c9f01c2ff8
Merge pull request #5041 from lgtm-migrator/codeql
Add CodeQL workflow for GitHub code scanning
2023-01-16 12:12:34 +01:00
Rainer Gerhards
c0d44af365
Merge pull request #5054 from alorbach/openssl-oldapifix
openssl: fix undefined reference to CRYPTO_set_id_callback
2023-01-16 12:08:34 +01:00
Rainer Gerhards
4355977bfe
Merge pull request #5064 from uniontech-lilinjie/master
fix typo
2023-01-16 12:04:57 +01:00
Rainer Gerhards
1e7abb8a1a
substring function: enhancement and hardening
Now, length can have a negative value -n to denote that the
substring should be build between startpos and the character
-n chars from the end. This is a shortcut for stripping charactes
on "both ends" of the string.

Also, some hardening against invalid startpos and length has
been added.
2023-01-13 13:20:24 +01:00
lilinjie
06d7ff2e4e fix typo
Signed-off-by: lilinjie <lilinjie@uniontech.com>
2023-01-13 11:03:55 +08:00
Rainer Gerhards
992ca872ce
Merge pull request #5055 from rgerhards/fix-version
fix version number for next scheduled stable release
2023-01-11 17:19:50 +01:00
Rainer Gerhards
a3d663d406
Merge pull request #5061 from uniontech-lilinjie/master
fix typo
2023-01-11 15:34:21 +01:00
Rainer Gerhards
05249d00ee
fix version number for next scheduled stable release 2023-01-11 15:33:23 +01:00
Rainer Gerhards
f95676d849
omfile: add action parameters "rotation.*"
Add new action parameters
- rotation.sizeLimit
- rotation.sizeLimitCommand
provide automatic output file rotation functionality feature-wise
equivalent to legacy $outchannel. This finally permits to use
this feature set in rscript.
2023-01-11 13:06:15 +01:00
Rainer Gerhards
2008fdd25c
Merge pull request #5062 from rgerhards/update-zookeeper
CI: use newer version of zookeeper
2023-01-11 13:06:06 +01:00
Rainer Gerhards
5f5fbef8f8
CI: use newer version of zookeeper
The older one is no longer available.
2023-01-11 09:15:27 +01:00
lilinjie
77f6833e46 fix typo
Signed-off-by: lilinjie <lilinjie@uniontech.com>
2023-01-11 13:30:15 +08:00
Thibaud Cartegnie
734508ff1f ffaup fix : memory corruption with concurrent workers
The ffaup function fails to work properly when it is used with multiple workers.
The faup_handler_t struct is not supposed to be shared between threads.

This may cause memory corruptions and race conditions when used inside of actions.
2023-01-09 10:44:01 +01:00
e0de99da5d openssl: fix undefined reference to CRYPTO_set_id_callback
Fix undefined reference for OpenSSL 1.1 or higher.
2023-01-02 10:47:08 +01:00
Rainer Gerhards
1acf1593af
maintain ChangeLog 2023-01-02 10:20:18 +01:00
Rainer Gerhards
5f8eafa0bd
Merge pull request #5052 from rgerhards/i5050
core bugfix: template system may generate invalid json
2023-01-02 10:19:03 +01:00
Rainer Gerhards
e6f1866f55
testbench: add test for invalid json template generation
see also: commit 246b8d8553b6880146d6c489a28cf4bacea8a199
see also: https://github.com/rsyslog/rsyslog/pull/5050
see also: https://github.com/rsyslog/rsyslog/pull/5052
2022-12-30 17:57:13 +01:00
Rainer Gerhards
246b8d8553
core bugfix: template system may generate invalid json
When
- a list template
- is created with option.jsonf="on"
- and the last list element is a property with onEmpty="skip"
- and that property is actually empty
invalid JSON is generated.

The JSON string in this case ends with ", " instead of "}\n". This
patch fixes the issue.

closes https://github.com/rsyslog/rsyslog/issues/5050
2022-12-30 17:13:17 +01:00
Flos Lonicerae
4c5ce90e7c Fixed wrong type conversion in cstrLen() 2022-12-28 12:38:30 +08:00
Rainer Gerhards
3b73e9ff26
Merge pull request #5040 from mbiebl/typo-fixes
Fix typos spotted by lintian
2022-12-10 11:18:06 +01:00
LGTM Migrator
8fde95fbcf
Add CodeQL workflow for GitHub code scanning 2022-12-08 16:52:39 +00:00
Michael Biebl
9b6cd6649b Fix typos spotted by lintian
I: rsyslog: typo-in-manual-page explicitely explicitly [usr/share/man/man5/rsyslog.conf.5.gz:225]
I: rsyslog: typo-in-manual-page sevrity severity [usr/share/man/man5/rsyslog.conf.5.gz:223]
2022-12-07 17:47:25 +01:00
Rainer Gerhards
62651b80e6
bump release number for new schedule stable cycle 2022-12-06 09:56:14 +01:00
Rainer Gerhards
8cc0c25edf
prepare for new scheduled stable release 8.2212.0 v8.2212.0 2022-12-05 16:02:44 +01:00
Rainer Gerhards
1d126ecedc
maintain ChangeLog 2022-12-05 15:58:22 +01:00
Rainer Gerhards
c8e0537e83
Merge pull request #5039 from rgerhards/testbench-py-server
testbench: make python http server based tests more reliable
2022-12-05 15:54:16 +01:00
Rainer Gerhards
e6c6491a9c
maintain ChangeLog 2022-12-05 11:08:18 +01:00
Rainer Gerhards
8f22e3b012
Merge pull request #5038 from rgerhards/i4967
omprog bugfix: invalid status handling at called program startup
2022-12-05 11:05:49 +01:00
Rainer Gerhards
2975a093ad
testbench: make python http server based tests more reliable
Harden them against races during server port assignment. Prevents
testbench flakes.
2022-12-05 11:03:34 +01:00
Rainer Gerhards
1128d32075
omprog bugfix: invalid status handling at called program startup
There is a bug when external program *startup* does not return "OK". This
can also lead to a misadressing with potentially a segfault (very unlikely).
Note that no problem exists once the initializiation phase of the external
program is finished and regular message transfer runs.

The problem basically is that for a startup failure, the control data for
that external program instance is freed on error. Unfortunately, that state
data is needed later on to detect a suspended instance. We now keep the control
data even on init failure (as we then need to do normal control options).

closes https://github.com/rsyslog/rsyslog/issues/4967
2022-12-04 16:05:22 +01:00
Rainer Gerhards
e77767e1ca
maintain ChangeLog 2022-11-29 15:29:06 +01:00
Rainer Gerhards
d2e71ae0d6
Merge pull request #5032 from rgerhards/pr4473
testbench: fix the wrong message injection object of instance 1
2022-11-29 15:26:05 +01:00
Guodong Zhu
18a824ca2f
testbench: fix the wrong message injection object of instance 1
In some client-server test cases, messages are supposed to be injected into
the instance 2(client), but they are actually injected into instance 1(server),
which may lead to false negative results. This patch fixed it by replacing
'injectmsg' with 'injectmsg2', and dealt with some minor issues.
2022-11-23 12:28:15 +01:00
Rainer Gerhards
0543d22c7c
Merge pull request #5031 from alorbach/pr-issue-5025b
imkafka: fix building imkafka with static librdkafka
2022-11-22 10:50:02 +01:00
2944d5f6a1 imkafka: fix building imkafka with static librdkafka
see also https://github.com/rsyslog/rsyslog/issues/5025
2022-11-22 09:16:29 +01:00
Rainer Gerhards
a3e4fc533b
maintain ChangeLog 2022-11-21 13:05:21 +01:00
Rainer Gerhards
5aa51642cb
Merge pull request #5028 from rgerhards/man-fix
rsyslog.conf man page bugfix: description of selectors
2022-11-21 13:00:54 +01:00
Rainer Gerhards
b12d81291d
rsyslog.conf man page bugfix: description of selectors
Note historic difference to BSD syslog selectors.
2022-11-18 17:33:42 +01:00