diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-04 08:26:41 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-04 08:26:41 +0200 |
| commit | f86d32638d6f7120608d9beeb25b4bb3be9ab5c2 (patch) | |
| tree | 21e0efdd01504a22bcfd2fe082f507ab2746acd9 | |
| parent | d18a9df25012bb1d9170f8d39e8ebf4c62f034f6 (diff) | |
| download | rsyslog-f86d32638d6f7120608d9beeb25b4bb3be9ab5c2.tar.gz rsyslog-f86d32638d6f7120608d9beeb25b4bb3be9ab5c2.tar.bz2 rsyslog-f86d32638d6f7120608d9beeb25b4bb3be9ab5c2.zip | |
mmanon: removed the check for specific "terminator characters" after last octet
As it turned out, this didn't work in practice as there
was an enormous set of potential terminator chars -- so removing
them was the best thing to do. Note that this may change behaviour of
existing installations. Yet, we still consider this an important
bugfix, that should be applied to the stable branch.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | doc/mmanon.html | 9 | ||||
| -rw-r--r-- | plugins/mmanon/mmanon.c | 2 |
3 files changed, 9 insertions, 12 deletions
@@ -1,9 +1,13 @@ --------------------------------------------------------------------------- Version 7.4.5 [v7.4-stable] 2013-09-?? -- mmanon: added "]" to set of acceptable chars after an IPv4 address - This is used in Exim and Postfix ... and probably a bunch of other tools +- mmanon: removed the check for specific "terminator characters" after + last octet. As it turned out, this didn't work in practice as there + was an enormous set of potential terminator chars -- so removing + them was the best thing to do. Note that this may change behaviour of + existing installations. Yet, we still consider this an important + bugfix, that should be applied to the stable branch. closes: http://bugzilla.adiscon.com/show_bug.cgi?id=477 - Thanks to Muri Cicanor for requesting the addition + Thanks to Muri Cicanor for initiating the discussion - bugfix: omprog blocked signals to executed programs The made it impossible to send signals to programs executed via omprog. diff --git a/doc/mmanon.html b/doc/mmanon.html index 16065a1f..e14d75cf 100644 --- a/doc/mmanon.html +++ b/doc/mmanon.html @@ -18,14 +18,7 @@ Note that anonymization will break digital signatures on the message, if they exist. <p><i>How are IP-Addresses defined?</i> <p>We assume that an IP address consists of four octets in dotted notation, -where each of the octets has a value between 0 and 255, inclusively. After -the last octet, there must be either a space or a colon. So, for example, -"1.2.3.4 Test" and "1.2.3.4:514 Test" are detected as containing valid IP -addresses, whereas this is not the case for "1.2.300.4 Test" or -"1.2.3.4-Test". The message text may contain multiple addresses. If so, -each of them is anonimized (according to the same rules). -<b>Important:</b> We may change the set of acceptable characters after -the last octet in the future, if there are good reasons to do so. +where each of the octets has a value between 0 and 255, inclusively. <p> </p> <p><b>Module Configuration Parameters</b>:</p> diff --git a/plugins/mmanon/mmanon.c b/plugins/mmanon/mmanon.c index 5a1aa7ad..7d8f9964 100644 --- a/plugins/mmanon/mmanon.c +++ b/plugins/mmanon/mmanon.c @@ -307,7 +307,7 @@ anonip(instanceData *pData, uchar *msg, int *pLenMsg, int *idx) ++i; ipstart[3] = i; octet = getnum(msg, lenMsg, &i); - if(octet > 255 || !(msg[i] == ' ' || msg[i] == ':' || msg[i] == ']')) goto done; + if(octet > 255) goto done; ipv4addr |= octet; /* OK, we now found an ip address */ |