You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/02 08:17:52 UTC
[james-project] 03/04: JAMES-2114 Improve MDC logging context for
SMTP LMTP and POP3
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 6c5f4a5fe218984b65175cdf903afb5ec4ad4748
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Fri Jan 29 18:20:53 2021 +0700
JAMES-2114 Improve MDC logging context for SMTP LMTP and POP3
---
.../src/main/java/org/apache/james/imap/processor/LoginProcessor.java | 2 +-
.../org/apache/james/protocols/netty/ProtocolMDCContextFactory.java | 3 ++-
.../org/apache/james/protocols/smtp/core/SMTPMDCContextFactory.java | 4 +++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
index 568a245..b5df53c 100644
--- a/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
+++ b/protocols/imap/src/main/java/org/apache/james/imap/processor/LoginProcessor.java
@@ -72,7 +72,7 @@ public class LoginProcessor extends AbstractAuthProcessor<LoginRequest> implemen
protected Closeable addContextToMDC(LoginRequest request) {
return MDCBuilder.create()
.addContext(MDCBuilder.ACTION, "LOGIN")
- .addContext(MDCBuilder.USER, request.getUserid())
+ .addContext(MDCBuilder.USER, request.getUserid().asString())
.build();
}
}
diff --git a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContextFactory.java b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContextFactory.java
index 17a34cc..d277b08 100644
--- a/protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContextFactory.java
+++ b/protocols/netty/src/main/java/org/apache/james/protocols/netty/ProtocolMDCContextFactory.java
@@ -24,6 +24,7 @@ import java.net.InetSocketAddress;
import java.net.SocketAddress;
import java.util.Optional;
+import org.apache.james.core.Username;
import org.apache.james.protocols.api.Protocol;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.util.MDCBuilder;
@@ -77,7 +78,7 @@ public interface ProtocolMDCContextFactory {
return MDCBuilder.create()
.addContext(MDCBuilder.SESSION_ID, protocolSession.getSessionID())
.addContext(MDCBuilder.CHARSET, protocolSession.getCharset().displayName())
- .addContext(MDCBuilder.USER, protocolSession.getUsername());
+ .addContext(MDCBuilder.USER, Optional.ofNullable(protocolSession.getUsername()).map(Username::asString));
}
}
diff --git a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPMDCContextFactory.java b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPMDCContextFactory.java
index 87f7d94..58fbe85 100644
--- a/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPMDCContextFactory.java
+++ b/protocols/smtp/src/main/java/org/apache/james/protocols/smtp/core/SMTPMDCContextFactory.java
@@ -22,6 +22,7 @@ package org.apache.james.protocols.smtp.core;
import java.io.Closeable;
import java.util.Optional;
+import org.apache.james.core.MaybeSender;
import org.apache.james.protocols.api.Protocol;
import org.apache.james.protocols.api.ProtocolSession;
import org.apache.james.protocols.netty.ProtocolMDCContextFactory;
@@ -55,7 +56,8 @@ public class SMTPMDCContextFactory implements ProtocolMDCContextFactory {
private static MDCBuilder forSMTPSession(SMTPSession smtpSession) {
return MDCBuilder.create()
.addContext("ehlo", smtpSession.getAttachment(SMTPSession.CURRENT_HELO_NAME, ProtocolSession.State.Connection))
- .addContext("sender", smtpSession.getAttachment(SMTPSession.SENDER, ProtocolSession.State.Transaction))
+ .addContext("sender", smtpSession.getAttachment(SMTPSession.SENDER, ProtocolSession.State.Transaction)
+ .map(MaybeSender::asString))
.addContext("recipients", smtpSession.getAttachment(SMTPSession.RCPT_LIST, ProtocolSession.State.Transaction));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org