15055 Commits

Author SHA1 Message Date
Rainer Gerhards
03ba122e90
mmanon bugfix: shortened IPv6 form not always anonymized
If the IPv6 is in non-recommended form followed by a 5 digit port number, it
is not anonymized.

A reproducer for this is: 1a00:c820:1180:c84c::ad3f:d991:ec2e:49255

closes https://github.com/rsyslog/rsyslog/issues/4856
2022-04-25 18:00:01 +02:00
Rainer Gerhards
d6f4f64848
Merge pull request #4854 from rgerhards/remove-nongit-file
cleanup: remove file accidentally added to git
2022-04-25 10:24:22 +02:00
Rainer Gerhards
aaf3ffd364
cleanup: remove file accidentally added to git 2022-04-22 10:45:20 +02:00
Rainer Gerhards
41df565b14
maintain ChangeLog 2022-04-22 10:44:10 +02:00
Rainer Gerhards
6bcca357b2
Merge pull request #4850 from VultureProject/fix_mmdb_parse_upstream
MMDBLOOKUP::FIXED:: Fix parsing of data received from mmdb lib
2022-04-22 10:39:31 +02:00
Rainer Gerhards
30cbfd2cc7
bump version number for next dev cycle
also fix minor copy&paste date error in ChangeLog
2022-04-20 08:28:23 +02:00
Rainer Gerhards
d886418e4d
prepare for v8.2204.0 scheduled stable release v8.2204.0 2022-04-18 11:18:13 +02:00
Rainer Gerhards
2bc7ece976
maintain ChangeLog 2022-04-18 11:11:57 +02:00
Rainer Gerhards
0459cde144
Merge pull request #4849 from bucko909/fix--memory--error
Fix non-null-terminated-string used with strlen
2022-04-18 11:08:55 +02:00
Rainer Gerhards
88c67d80e4
Merge pull request #4822 from sarroutbi/maxfilesize_non_empty_errorfile
Ensure error file does not increase appropriately when action.errorfile.maxsize option is enabled
2022-04-18 11:02:38 +02:00
Rainer Gerhards
33b7ccc928
Merge pull request #4823 from alorbach/pr-issue-4818
gnutls bugfix: Fix error handling in gtlsRecordRecv
2022-04-18 11:01:35 +02:00
Rainer Gerhards
715b36949a
Merge pull request #4845 from artbristol/pr_validation_links
Fixed a broken link in the PR failure message
2022-04-18 10:46:03 +02:00
frikilax
b427de5109 MMDBLOOKUP::FIXED:: Fix parsing of data received from mmdb lib 2022-04-15 17:33:15 +02:00
David Buckley
2c8c9db065 Fix non-null-terminated-string used with strlen
The `failedmsg_entry` expects a null-terminated string in `key`, but
here we allocate with malloc and copy a string-with-length-n into only
the first n bytes. If the final byte is null, this is by coincidence
only.

We've observed this by means of seeing random binary data appended to
keys submitted to kafka apparently at random, and this looks like a
smoking gun.
2022-04-13 13:45:35 +01:00
Rainer Gerhards
a854538eb6
maintain ChangeLog 2022-04-06 09:19:33 +02:00
Rainer Gerhards
ae2ab5c5c7
Merge pull request #4592 from artbristol/json_include_programname
Include programname in a new JSON template
2022-04-06 09:16:56 +02:00
Art O Cathain
93eab59105 Include programname in a new JSON template
Without the program name, the logs intermingle output from multiple programs.

StdJSONFmt is left as-is for backwards-compatibility.
2022-04-05 14:18:32 +01:00
Art O Cathain
a5ba462da8 Fixed a broken link in the PR failure message 2022-04-05 14:05:47 +01:00
aefcfa4d0f gnutls bugfix: Fix error handling in gtlsRecordRecv
There was a rare possibility that the E_AGAIN/E_INTERRUPT handling
could cause an infinite loop (100% CPU Usage), for example when a TLS
handshake is interrupted at a certain stage.

- After gnutls_record_recv is called, and E_AGAIN/E_INTERRUPT error
  occurs, we need to do additional read/write direction handling
  with gnutls_record_get_direction.
- After the second call of gnutls_record_recv (Expand buffer)
  we needed to also check the eror codes for E_AGAIN/E_INTERRUPT
  to do propper errorhandling.
- Add extra debug output based on ossl driver.
- Potential fix for 100% CPU Loop Receiveloop after gtlsRecordRecv
  in doRetry call.

see also: https://github.com/rsyslog/rsyslog/issues/4818
2022-04-04 16:38:07 +02:00
Rainer Gerhards
f332bff979
maintain ChangeLog 2022-04-04 12:56:44 +02:00
Rainer Gerhards
fb2695c529
Merge pull request #4844 from rgerhards/tmpmaster
imfile: do_inotify() use only one blocking call
2022-04-04 12:08:37 +02:00
Mikko Kortelainen
758a5e28f6
imfile: do_inotify() use only one blocking call
do_inotify block only once for events with timeouts. There is possible
scenario where no data is available and read() enters blocking while poll()
is released.

The change introduced here changes the racy reading to be same for the
triggered file as for the rest of the files:

current:
- Inotify is triggered
- Triggering file is read for new data
- Rest of the files are read for timer expiration
- more inotifys are processed these may be at the end of the file already as well then

new:
- Inotify is triggered
- All files are read for timer expiration, which includes the triggering file
- Triggering files is read for data, this may be at the end of the file already then
- more inotifys are processed these may be at the end of the file already as well then

Therefore the change introduced harmonises the way triggering and the future triggers
are handled, by not making the triggering one as an exceptional one, so it is easier
to test the changes as well.
2022-04-04 09:26:40 +02:00
Rainer Gerhards
f2873d9cd6 maintain ChangeLog 2022-04-04 09:18:08 +02:00
Rainer Gerhards
f55abf10b7
Merge pull request #4842 from rgerhards/bChildDied-race
bugfix: cosmetic data races
2022-04-04 09:15:20 +02:00
Rainer Gerhards
f5b7129652
maintain ChangeLog 2022-04-01 13:00:11 +02:00
Rainer Gerhards
6c16d84237
Merge pull request #4758 from mbarbon/mbarbon/format-iso-week
add property options to support ISO week/year number
2022-04-01 12:57:31 +02:00
Rainer Gerhards
68ad91fc28
bugfix: cosmetic data races
there was a more or less cosmetic data race which could happen when children
processes died in quick sequence. Even then, no real harm happened, as all
children were reaped eventually.

A similar data race exists for HUP processing.

However, these races polluted TSAN test runs, and so we fixed them.
2022-04-01 12:39:44 +02:00
Sergio Arroutbi
5734b5853a Ensure errorfile max. size correct handling
When action.errorfile.maxsize configuration
option is enabled and error file already has a
certain size smaller than max size configured,
it is increasing higher than configured max
size as the error file is considered
to be zero in code.
This fix reads current error file size and
limits the size to the maximum size configured

fixes #4821

Signed-off-by: Sergio Arroutbi <sarroutb@redhat.com>
2022-04-01 11:17:46 +02:00
Rainer Gerhards
d8b3527ea6
Merge pull request #4792 from mbarbon/mbarbon/es-index-timeout
omelasticsearch: add optional timeout for the index operation
2022-04-01 10:19:51 +02:00
Rainer Gerhards
4b697a01e4
maintain ChangeLog 2022-04-01 09:23:27 +02:00
Rainer Gerhards
bcf638df48
Merge pull request #4829 from kostap8/fix_ReportSuspension_option
Fix: check ReportSuspension option before print message about action retry
2022-04-01 09:19:49 +02:00
Rainer Gerhards
39a773b986
Merge pull request #4839 from rgerhards/ci-buildbot-remove-docker
CI: move docker worker to github action
2022-04-01 09:06:43 +02:00
Rainer Gerhards
f20324f447
CI: move docker worker to github action
This makes things a bit more reliable and save us much-needed time
as we want to minimize our maintenance of the docker farm.
2022-03-31 15:24:34 +02:00
Rainer Gerhards
7fde0553e5
Merge pull request #4806 from rgerhards/script-compare-tests
testbench: add tests for rscript comparison operations
2022-03-31 12:57:05 +02:00
Rainer Gerhards
af02203dee
maintain ChangeLog 2022-03-31 12:38:22 +02:00
Rainer Gerhards
f6e5fd653f
Merge pull request #4833 from zy1306/order/doHUP/processImInternal
rsyslogd: adjust the order of doHUP() and processImInternal()
2022-03-31 12:34:09 +02:00
Rainer Gerhards
71b81626ef
testbench: add tests for rscript comparison operations 2022-03-31 10:16:27 +02:00
Rainer Gerhards
46c821bd2a
maintain ChangeLog 2022-03-31 09:32:02 +02:00
Rainer Gerhards
2e86607be9
Merge pull request #4832 from Cropi/omfilehardened-compilation
Add missing include to fix compilation error, resolves #4827
2022-03-30 17:01:25 +02:00
Rainer Gerhards
8a94aec1ae
Merge pull request #4830 from miztake/prototype
Fix message typo when pthread_create fails in KSI-LS12 support library
2022-03-30 15:53:55 +02:00
Rainer Gerhards
e1af01276c
Merge pull request #4831 from Cropi/parser-list
Move the parser directive to the main config
2022-03-30 15:42:49 +02:00
Rainer Gerhards
b0a92f34f0
Merge pull request #4835 from rgerhards/tb-fix-github-solaris
testbench: change git access protocol to cover github change
2022-03-30 11:17:13 +02:00
Rainer Gerhards
2387c248f3
testbench: change git access protocol to cover github change
github disabled anon access via git protocol, so we need to adjust
this to https

no functional change
2022-03-28 10:11:42 +02:00
Yun Zhou
857f77906f rsyslogd: adjust the order of doHUP() and processImInternal()
After call doHUP(), probably there is a internal log in the list. However, it
will not be wrote out immediately, because the mainloop will be blocked at
pselect in wait_timeout() until a long timeout or next message occur.
More deadly, the log may be lost if the deamon exits unexpectedly.

We might as well put processImInternal() after doHUP(), so that the message
will be flushed out immediately.

Fixes: 723f6fdfa6(rsyslogd: Fix race between signals and main loop timeout)
Signed-off-by: Yun Zhou <yun.zhou@windriver.com>
2022-03-24 16:50:43 +08:00
alakatos
aaad6623be Add missing include to fix compilation error, resolves #4827 2022-03-23 13:16:02 +01:00
alakatos
452f55efa0 Move the parser directive to the main config 2022-03-23 10:07:53 +01:00
MIZUTA Takeshi
988c3c2a67 Fix message typo when pthread_create fails in KSI-LS12 support library 2022-03-22 16:59:24 +09:00
Aleksey Deyneko
a7ffb1524f Fix: check ReportSuspension option before print message about action retry 2022-03-20 19:49:08 +03:00
Rainer Gerhards
53fb41a1eb
maintain ChangeLog 2022-03-16 12:51:36 +01:00
Rainer Gerhards
b0435d5e89
Merge pull request #4791 from Cropi/dynamic-config-queue
Make the main message queue part of the config
2022-03-16 12:48:22 +01:00