10304 Commits

Author SHA1 Message Date
Rainer Gerhards
876f574987 maintain ChangeLog 2016-11-03 12:02:06 +01:00
Rainer Gerhards
cd5a131017 Merge pull request #1232 from rgerhards/i-1040-incl-testbench
merge fixe for #1040 including new testbench
2016-11-03 12:00:02 +01:00
Rainer Gerhards
63d9439a48 Merge pull request #1237 from zinix-workshop/fix-incorrect-word-spelling-in-mmgrok-plugin
Fix an incorrect spelling of `mmgrok`'s README.md
2016-11-03 11:59:08 +01:00
Rainer Gerhards
7505685a04 maintain ChangeLog 2016-11-03 11:57:27 +01:00
Rainer Gerhards
248f302b17 Merge pull request #1242 from rgerhards/i-1239-testbench
testbench: add test for object persisting
2016-11-03 11:51:58 +01:00
Rainer Gerhards
99aecbdb85 testbench: add test for object persisting
see also https://github.com/rsyslog/rsyslog/issues/1239
2016-11-03 10:43:56 +01:00
Rainer Gerhards
a69ced1131 maintain ChangeLog 2016-11-03 10:43:25 +01:00
Rainer Gerhards
ce3519b316 Merge pull request #1241 from rgerhards/i-1239
bugfix: abort when persisting object state
2016-11-03 10:41:46 +01:00
Rainer Gerhards
d93fe1af36 bugfix: abort when persisting object state
This causes a segfault. It happens whenever an object state larger
than 4095 byte is persisted. Then, incorrectly a try to rollover to
a new state file is tried, which will lead to a division by zero
as the necessary variables for this operation are not set because we
are NOT in circular mode.

This problem can happen wherever state files are written. It has been
experienced with imfile and queue files.

Many thanks to github user mostolog for his help in reproducing the
issue, which was very important to finally nail down this long-standing
bug.

closes https://github.com/rsyslog/rsyslog/issues/1239
closes https://github.com/rsyslog/rsyslog/issues/1162
closes https://github.com/rsyslog/rsyslog/issues/1074
2016-11-02 18:59:23 +01:00
Henri Lakk
a429fbc7b9 Merge branch 'removed_sha224' of github.com:vii5ard/rsyslog into removed_sha224 2016-11-02 16:25:32 +02:00
Henri Lakk
966c7a5b06 The SHA3-224 should be kept. 2016-11-02 16:24:29 +02:00
zacharyzhao
b31f40be37 Fix an incorrect spelling of mmgrok's README.md
This incorrect spelling may confusing people who follows `README.md`'s
instruction.
2016-11-02 18:00:17 +08:00
Henri Lakk
544cb4e006 Removed the use of the deprecated hash function SHA-224. 2016-11-01 16:31:09 +02:00
Rainer Gerhards
aeb77e4d2d maintain ChangeLog 2016-11-01 14:34:44 +01:00
Rainer Gerhards
452015d029 Merge pull request #1234 from rgerhards/fix-warnings
omelasticsearch: tries to modify constant memory under some circumsta…
2016-11-01 14:32:32 +01:00
Rainer Gerhards
aff40b570a travis: run elasticsearch tests in debug mode as well 2016-11-01 13:29:09 +01:00
Rainer Gerhards
f8e2b4b422 omelasticsearch: tries to modify constant memory under some circumstances
Function computeBaseUrl may modify its serverParam parameter, but
this may contain the constant string "localhost". Depending on the
platform, this can lead to a segfault.

Noticed while working on compiler warnings, not seen in practice.

closes https://github.com/rsyslog/rsyslog/issues/1233
2016-11-01 13:29:00 +01:00
Rainer Gerhards
6de3578f38 testbench: libfaketime y2k38 detection needs fix
due to new LD_PRELOAD support
2016-10-31 09:52:02 +01:00
Rainer Gerhards
7fa116c7f4 testbench: improve pilot program for API override
among others, this is necessary to pass CI, as we otherwise (rightfully)
get compiler warnings
2016-10-31 09:51:38 +01:00
Rainer Gerhards
36c1fd176d Merge branch 'i-1040-testbench' into i-1040-incl-testbench 2016-10-30 18:08:38 +01:00
Rainer Gerhards
86e8b9c0aa testbench: adapt existing framework to upcoming LD_PRELOAD tests 2016-10-27 15:05:29 +02:00
Rainer Gerhards
75715fe2f8 testbench: add test for empty host name 2016-10-27 11:12:47 +02:00
Rainer Gerhards
faca48813a bugfix: segfault if hostname is unset on system
happens when gethostname() returns empty string. This will cause
the createon of the localhostname prop_t to fail, which in turn
leads to a NULL pointer dereference when emitting local messages.
As we emit a startup message by default, this had usually lead
to a segfault on startup.

Thanks to Erik Potter and github user mostolog for their help
in analyzing this problem.

closes https://github.com/rsyslog/rsyslog/issues/1040
closes https://github.com/rsyslog/rsyslog/issues/335
2016-10-27 09:31:11 +02:00
Rainer Gerhards
1ab0d897a4 Merge pull request #1220 from rgerhards/i-1219
remove "inline" attribute from excessivly long functions
2016-10-26 16:11:02 +02:00
Rainer Gerhards
974ec81df2 maintain ChangeLog 2016-10-26 16:10:23 +02:00
Rainer Gerhards
0a838d8d32 Merge pull request #1223 from rgerhards/merge-1216
Merge #1216
2016-10-26 16:08:26 +02:00
Rainer Gerhards
a31015abe2 template emergency json escaping: use slash instead of backslash
This is only triggered if we do not get memory to do proper escaping,
so this code is unlikely to be executed. However, we think that
forwards slash is a better susbstitute for backslash than is the
single quote char.
2016-10-26 11:59:38 +02:00
Rainer Gerhards
b0dc6c16f2 fix json template encoding (correct predicate check)
commit 27af112637b47fd80c9ffb80565e61e049b88774 tried to fix
json encoding, but introduced an invalid predicate check that
lead to no encoding at all.

see also https://github.com/rsyslog/rsyslog/pull/1216
2016-10-26 11:54:29 +02:00
Rainer Gerhards
448f16495c remove "inline" attribute from excessivly long functions 2016-10-26 11:50:15 +02:00
Rainer Gerhards
8e448d4f58 testbench: add test for json formatting in templates 2016-10-26 11:21:43 +02:00
Rainer Gerhards
2566332aca Merge branch 'fix1211' of https://github.com/mostolog/rsyslog into merge-1216 2016-10-26 11:09:22 +02:00
Rainer Gerhards
4a8ec99192 maintain ChangeLog 2016-10-26 11:01:02 +02:00
Rainer Gerhards
7a930d791b Merge pull request #1210 from rgerhards/i-1209
rsyslog.conf: add ability to set environment variables
2016-10-26 10:58:36 +02:00
Rainer Gerhards
a35340bff9 maintain ChangeLog 2016-10-26 10:57:31 +02:00
Rainer Gerhards
73abfaa188 Merge pull request #1222 from alorbach/ksi-i1206
Ksi i1206
2016-10-26 10:52:17 +02:00
23019616b4 rsgtutil: Fixed adding 0 byte to constrain oid and value helper variables 2016-10-25 12:37:50 +02:00
usuario
27af112637 Modified template to add "\\" on doEscape for JSON_ESCAPE fixing #1126 2016-10-24 22:00:14 +02:00
2ce5557502 testsuite: Added tests for rsgtutil ksi verify cnstr options 2016-10-24 16:28:18 +02:00
99832e7626 rsgtutil: Added Option to specify KSI publications certificate constraints
closes: https://github.com/rsyslog/rsyslog/issues/1207
2016-10-24 16:00:36 +02:00
d6c7d209b0 libksi: Fixed adding LOGSIG Fileheader if an empty ksisig file already exists
When previous signing failed, the newly created ksisig file is empty.
This has been fixed now. However if a logfile previously existed, the signature
verification process with fail because signatures for the loglines before
are missing. This problem needs to be evaluated in another issue.

closes https://github.com/rsyslog/rsyslog/issues/1206
2016-10-24 13:10:13 +02:00
Rainer Gerhards
2f119e426b testbench: add tests for new "environment" global parameter 2016-10-22 11:25:52 +02:00
mostolog
f01e694710 Change pmrfc3164 to initialize parseHostnameAndTag fixing #1190 2016-10-21 10:02:57 +02:00
Rainer Gerhards
61c401a982 rsyslog.conf: provide a capability to set environment variables
We should provide a vehicle to set environment variables via the
config file. This is most importantly for things like HTTP_PROXY.
Currently, to do this system startup files need to be modified,
which is cumbersome and different from platform to platform.

closes https://github.com/rsyslog/rsyslog/issues/1209
2016-10-20 15:22:43 +02:00
Rainer Gerhards
bcbda82493 Merge pull request #1173 from rgerhards/i-1162
imfile: abort in stream handler
2016-10-20 12:24:03 +02:00
Rainer Gerhards
2484a636cc maintain ChangeLog 2016-10-20 09:26:14 +02:00
Rainer Gerhards
476912dcf5 Merge pull request #1196 from barakshechter/barakshechter/omelasticsearch-ha-server-config
omelasticsearch high availability addressing of ElasticSearch cluster
2016-10-20 09:25:00 +02:00
Rainer Gerhards
a9e2a14800 doc: mention that developers should not build with adiscon repo 2016-10-20 09:23:56 +02:00
Rainer Gerhards
9f3e35495a Merge pull request #1203 from mostolog/patch-1
Update README.md
2016-10-20 09:20:51 +02:00
Barak Shechter
4c01054c3c Adding test with singleton server, fix indentation 2016-10-19 21:06:40 -04:00
Rainer Gerhards
592bca81ac maintain ChangeLog 2016-10-19 13:02:40 +02:00