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 2022/04/04 05:45:10 UTC

[james-project] 01/19: JAMES-3715 ManageSieveServer: apply maxLineLength

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 9244a3202717d956925f2bca93176a07eeefa4f3
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Thu Mar 3 11:41:09 2022 +0700

    JAMES-3715 ManageSieveServer: apply maxLineLength
---
 .../netty/ManageSieveChannelUpstreamHandler.java       | 18 ++++++++++++------
 .../managesieveserver/netty/ManageSieveServer.java     |  4 +---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
index 463dc60a1c..28c3acb1c3 100644
--- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
+++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveChannelUpstreamHandler.java
@@ -29,6 +29,7 @@ import org.apache.james.managesieve.transcode.NotEnoughDataException;
 import org.apache.james.managesieve.util.SettableSession;
 import org.apache.james.protocols.api.Encryption;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import io.netty.buffer.Unpooled;
 import io.netty.channel.Channel;
@@ -41,17 +42,19 @@ import io.netty.handler.ssl.SslHandler;
 
 @ChannelHandler.Sharable
 public class ManageSieveChannelUpstreamHandler extends ChannelInboundHandlerAdapter {
+    private static final Logger LOGGER = LoggerFactory.getLogger(ManageSieveChannelUpstreamHandler.class);
 
     static final String SSL_HANDLER = "sslHandler";
 
-    private final Logger logger;
     private final ManageSieveProcessor manageSieveProcessor;
     private final Encryption secure;
+    private final int maxLineLength;
 
-    public ManageSieveChannelUpstreamHandler(ManageSieveProcessor manageSieveProcessor, Encryption secure, Logger logger) {
-        this.logger = logger;
+    public ManageSieveChannelUpstreamHandler(
+        ManageSieveProcessor manageSieveProcessor, Encryption secure, int maxLineLength) {
         this.manageSieveProcessor = manageSieveProcessor;
         this.secure = secure;
+        this.maxLineLength = maxLineLength;
     }
 
     private boolean isSSL() {
@@ -66,6 +69,9 @@ public class ManageSieveChannelUpstreamHandler extends ChannelInboundHandlerAdap
             if (request.isEmpty() || request.startsWith("\r\n")) {
                 return;
             }
+            if (request.length() > maxLineLength) {
+                throw new TooLongFrameException();
+            }
 
             Session manageSieveSession = ctx.channel().attr(NettyConstants.SESSION_ATTRIBUTE_KEY).get();
             String responseString = manageSieveProcessor.handleRequest(manageSieveSession, request);
@@ -85,7 +91,7 @@ public class ManageSieveChannelUpstreamHandler extends ChannelInboundHandlerAdap
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
         try (Closeable closeable = ManageSieveMDCContext.from(ctx)) {
-            logger.warn("Error while processing ManageSieve request", cause);
+            LOGGER.warn("Error while processing ManageSieve request", cause);
 
             if (cause instanceof TooLongFrameException) {
                 // Max line length exceeded
@@ -112,7 +118,7 @@ public class ManageSieveChannelUpstreamHandler extends ChannelInboundHandlerAdap
     public void channelActive(ChannelHandlerContext ctx) throws Exception {
         try (Closeable closeable = ManageSieveMDCContext.from(ctx)) {
             InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress();
-            logger.info("Connection established from {}", address.getAddress().getHostAddress());
+            LOGGER.info("Connection established from {}", address.getAddress().getHostAddress());
 
             Session session = new SettableSession();
             if (isSSL()) {
@@ -129,7 +135,7 @@ public class ManageSieveChannelUpstreamHandler extends ChannelInboundHandlerAdap
     public void channelInactive(ChannelHandlerContext ctx) throws Exception {
         try (Closeable closeable = ManageSieveMDCContext.from(ctx)) {
             InetSocketAddress address = (InetSocketAddress) ctx.channel().remoteAddress();
-            logger.info("Connection closed for {}", address.getAddress().getHostAddress());
+            LOGGER.info("Connection closed for {}", address.getAddress().getHostAddress());
             ctx.channel().attr(NettyConstants.SESSION_ATTRIBUTE_KEY).getAndSet(null);
             super.channelInactive(ctx);
         }
diff --git a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
index 75d6b32423..70891286cb 100644
--- a/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
+++ b/server/protocols/protocols-managesieve/src/main/java/org/apache/james/managesieveserver/netty/ManageSieveServer.java
@@ -74,9 +74,7 @@ public class ManageSieveServer extends AbstractConfigurableAsyncServer implement
 
     @Override
     protected ChannelInboundHandlerAdapter createCoreHandler() {
-        return new ManageSieveChannelUpstreamHandler(manageSieveProcessor,
-            getEncryption(),
-            LOGGER);
+        return new ManageSieveChannelUpstreamHandler(manageSieveProcessor, getEncryption(), maxLineLength);
     }
 
     @Override


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org