You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by sw...@apache.org on 2026/08/19 02:36:20 UTC
(logging-log4cxx) branch harden_smtp_appender created (now e5b2d106)
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a change to branch harden_smtp_appender
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
at e5b2d106 Prevent an embedded NUL character truncating a SMTP alert email
This branch includes the following new commits:
new e5b2d106 Prevent an embedded NUL character truncating a SMTP alert email
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(logging-log4cxx) 01/01: Prevent an embedded NUL character truncating a SMTP alert email
Posted by sw...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
swebb2066 pushed a commit to branch harden_smtp_appender
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git
commit e5b2d106a75cc941cb18a1b47bf5c27727ca9181
Author: Stephen Webb <sw...@gmail.com>
AuthorDate: Wed Aug 19 12:35:54 2026 +1000
Prevent an embedded NUL character truncating a SMTP alert email
---
src/main/cpp/smtpappender.cpp | 18 ++++++++++++------
src/main/include/log4cxx/net/smtpappender.h | 1 -
2 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/cpp/smtpappender.cpp b/src/main/cpp/smtpappender.cpp
index 496c3d53..02b5a2e0 100644
--- a/src/main/cpp/smtpappender.cpp
+++ b/src/main/cpp/smtpappender.cpp
@@ -222,8 +222,7 @@ class SMTPMessage
const LogString msg, Pool& p)
{
message = smtp_add_message(session);
- current_len = msg.length();
- body = current = toMessage(msg, p);
+ body = current = toMessage(msg, p, current_len);
messagecbState = 0;
smtp_set_reverse_path(message, toAscii(from, p));
addRecipients(to, "To", p);
@@ -273,8 +272,9 @@ class SMTPMessage
/**
* Message bodies can only contain US-ASCII characters and
* CR and LFs can only occur together.
+ * On return \c lenOut holds the length of the converted body.
*/
- static const char* toMessage(const LogString& str, Pool& p)
+ static const char* toMessage(const LogString& str, Pool& p, size_t& lenOut)
{
//
// count the number of carriage returns and line feeds
@@ -301,9 +301,10 @@ class SMTPMessage
for (unsigned int c : str)
{
//
- // replace non-ASCII characters with '?'
+ // replace non-ASCII characters and embedded NULs with '?'
+ // (a NUL octet must never act as a body terminator)
//
- if (c > 0x7F)
+ if (c > 0x7F || c == 0)
{
*current++ = 0x3F; // '?'
}
@@ -335,6 +336,7 @@ class SMTPMessage
}
*current = 0;
+ lenOut = current - retval;
return retval;
}
@@ -362,7 +364,11 @@ class SMTPMessage
if (pThis->current)
{
- *len = strnlen_s(pThis->current, pThis->current_len);
+ // Use the stored post-conversion length: strnlen_s over the
+ // pre-conversion length truncates at an embedded NUL and
+ // undercounts the CRLF-expanded body, silently dropping the
+ // newest content from the alert email.
+ *len = static_cast<int>(pThis->current_len);
}
retval = pThis->current;
diff --git a/src/main/include/log4cxx/net/smtpappender.h b/src/main/include/log4cxx/net/smtpappender.h
index d7107697..55894982 100644
--- a/src/main/include/log4cxx/net/smtpappender.h
+++ b/src/main/include/log4cxx/net/smtpappender.h
@@ -119,7 +119,6 @@ class LOG4CXX_EXPORT SMTPAppender : public AppenderSkeleton
cc | (\ref asciiCheck "1") | - |
bcc | (\ref asciiCheck "1") | - |
subject | {any} | - |
- subject | {any} | - |
buffersize | {int} | 512 |
evaluatorClass | (\ref AppenderSkeleton "2") | - |