summaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2011-02-22 11:55:12 +0100
committerRainer Gerhards <rgerhards@adiscon.com>2011-02-22 11:55:12 +0100
commit70bd55d51b6107231b841bfa03d5620bf984e3f2 (patch)
tree909ec036ba15cc3fb538d42b83a724040ec7a4ce /plugins
parent36c1649fc187090bfd5af2c48bb44ce25a0fdef6 (diff)
downloadrsyslog-70bd55d51b6107231b841bfa03d5620bf984e3f2.tar.gz
rsyslog-70bd55d51b6107231b841bfa03d5620bf984e3f2.tar.xz
rsyslog-70bd55d51b6107231b841bfa03d5620bf984e3f2.zip
bugfix: imuxsock does not sanitization at all (regression)
This also causes problems when NUL characters are present inside the message (as is the case with spamd).
Diffstat (limited to 'plugins')
-rw-r--r--plugins/imuxsock/imuxsock.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/plugins/imuxsock/imuxsock.c b/plugins/imuxsock/imuxsock.c
index 0b5ca6be..9f1e51b7 100644
--- a/plugins/imuxsock/imuxsock.c
+++ b/plugins/imuxsock/imuxsock.c
@@ -46,6 +46,7 @@
#include "net.h"
#include "glbl.h"
#include "msg.h"
+#include "parser.h"
#include "prop.h"
#include "debug.h"
#include "unlimited_select.h"
@@ -81,6 +82,7 @@ DEF_IMOD_STATIC_DATA
DEFobjCurrIf(errmsg)
DEFobjCurrIf(glbl)
DEFobjCurrIf(prop)
+DEFobjCurrIf(parser)
DEFobjCurrIf(datetime)
DEFobjCurrIf(statsobj)
@@ -517,10 +519,6 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
* rate-limiting as well.
*/
parse = pRcv;
- if(pRcv[lenRcv-1] == '\n') {
- DBGPRINTF("imuxsock: found trailing LF, removing\n");
- lenRcv--;
- }
lenMsg = lenRcv;
parse++; lenMsg--; /* '<' */
@@ -547,6 +545,7 @@ SubmitMsg(uchar *pRcv, int lenRcv, lstn_t *pLstn, struct ucred *cred)
/* we now create our own message object and submit it to the queue */
CHKiRet(msgConstructWithTime(&pMsg, &st, tt));
MsgSetRawMsg(pMsg, (char*)pRcv, lenRcv);
+ parser.SanitizeMsg(pMsg);
MsgSetInputName(pMsg, pInputName);
MsgSetFlowControlType(pMsg, pLstn->flowCtl);
@@ -840,6 +839,7 @@ BEGINmodExit
CODESTARTmodExit
statsobj.Destruct(&modStats);
+ objRelease(parser, CORE_COMPONENT);
objRelease(glbl, CORE_COMPONENT);
objRelease(errmsg, CORE_COMPONENT);
objRelease(prop, CORE_COMPONENT);
@@ -901,6 +901,7 @@ CODEmodInit_QueryRegCFSLineHdlr
CHKiRet(objUse(prop, CORE_COMPONENT));
CHKiRet(objUse(statsobj, CORE_COMPONENT));
CHKiRet(objUse(datetime, CORE_COMPONENT));
+ CHKiRet(objUse(parser, CORE_COMPONENT));
dbgprintf("imuxsock version %s initializing\n", PACKAGE_VERSION);