automatic import of nginxopeneuler24.03_LTS_SP2openeuler22.03_LTS_SP2

1 files changed, 34 insertions, 0 deletions

diff --git a/backport-CVE-2025-53859-after-Mail-logging-upstream-to-the-error-log-with-smtp_auth-none.patch b/backport-CVE-2025-53859-after-Mail-logging-upstream-to-the-error-log-with-smtp_auth-none.patch
new file mode 100644
index 0000000..e9beca9
--- /dev/null
+++ b/backport-CVE-2025-53859-after-Mail-logging-upstream-to-the-error-log-with-smtp_auth-none.patch
@@ -0,0 +1,34 @@
+From 239e10793adb1e32847095ba6c1d14249bf19a5c Mon Sep 17 00:00:00 2001
+From: Sergey Kandaurov <pluknet@nginx.com>
+Date: Mon, 21 Jul 2025 17:44:28 +0400
+Subject: [PATCH] Mail: logging upstream to the error log with "smtp_auth
+ none;".
+
+Previously, it was never logged because of missing login.
+---
+ src/mail/ngx_mail_handler.c | 10 ++++------
+ 1 file changed, 4 insertions(+), 6 deletions(-)
+
+diff --git a/src/mail/ngx_mail_handler.c b/src/mail/ngx_mail_handler.c
+index d3be7f3b3b..a88e6c2873 100644
+--- a/src/mail/ngx_mail_handler.c
++++ b/src/mail/ngx_mail_handler.c
+@@ -1006,14 +1006,12 @@ ngx_mail_log_error(ngx_log_t *log, u_char *buf, size_t len)
+     len -= p - buf;
+     buf = p;
+ 
+-    if (s->login.len == 0) {
+-        return p;
++    if (s->login.len) {
++        p = ngx_snprintf(buf, len, ", login: \"%V\"", &s->login);
++        len -= p - buf;
++        buf = p;
+     }
+ 
+-    p = ngx_snprintf(buf, len, ", login: \"%V\"", &s->login);
+-    len -= p - buf;
+-    buf = p;
+-
+     if (s->proxy == NULL) {
+         return p;
+     }