From ca2c349a4a95f79e1f8b5315bf7e7617386f266e Mon Sep 17 00:00:00 2001
From: Norman Maurer <norman_maurer@apple.com>
Date: Thu, 23 Feb 2017 20:44:11 +0100
Subject: [PATCH] Correctly have exceptions thrown from decode(...) method be
 wrapped with DecodingException

Motivation:

Normally if a decoder produces an exception its wrapped with DecodingException. This is not the cause for NotSslRecordException in SslHandler and SniHandler.

Modifications:

Just throw the NotSslRecordException exception for decode(...) and so ensure its correctly wrapped in a DecodingException before its passed through the pipeline.

Result:

Consist behavior.
---
 .../main/java/io/netty/handler/ssl/SniHandler.java | 14 +++++++++-----
 .../main/java/io/netty/handler/ssl/SslHandler.java |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/handler/src/main/java/io/netty/handler/ssl/SniHandler.java b/handler/src/main/java/io/netty/handler/ssl/SniHandler.java
index c70e28ad35..af21b14015 100644
--- a/handler/src/main/java/io/netty/handler/ssl/SniHandler.java
+++ b/handler/src/main/java/io/netty/handler/ssl/SniHandler.java
@@ -36,6 +36,7 @@ import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.FutureListener;
 import io.netty.util.concurrent.Promise;
 import io.netty.util.internal.ObjectUtil;
+import io.netty.util.internal.PlatformDependent;
 import io.netty.util.internal.logging.InternalLogger;
 import io.netty.util.internal.logging.InternalLoggerFactory;
 
@@ -135,10 +136,9 @@ public class SniHandler extends ByteToMessageDecoder implements ChannelOutboundH
                                 NotSslRecordException e = new NotSslRecordException(
                                         "not an SSL/TLS record: " + ByteBufUtil.hexDump(in));
                                 in.skipBytes(in.readableBytes());
-                                ctx.fireExceptionCaught(e);
 
                                 SslUtils.notifyHandshakeFailure(ctx, e);
-                                return;
+                                throw e;
                             }
                             if (len == SslUtils.NOT_ENOUGH_DATA ||
                                     writerIndex - readerIndex - SslUtils.SSL_RECORD_HEADER_LENGTH < len) {
@@ -247,7 +247,7 @@ public class SniHandler extends ByteToMessageDecoder implements ChannelOutboundH
                                                 select(ctx, IDN.toASCII(hostname,
                                                                         IDN.ALLOW_UNASSIGNED).toLowerCase(Locale.US));
                                             } catch (Throwable t) {
-                                                ctx.fireExceptionCaught(t);
+                                                PlatformDependent.throwException(t);
                                             }
                                             return;
                                         } else {
@@ -292,7 +292,11 @@ public class SniHandler extends ByteToMessageDecoder implements ChannelOutboundH
                     try {
                         suppressRead = false;
                         if (future.isSuccess()) {
-                            onSslContext(ctx, hostname, future.getNow());
+                            try {
+                                onSslContext(ctx, hostname, future.getNow());
+                            } catch (Throwable cause) {
+                                ctx.fireExceptionCaught(new DecoderException(cause));
+                            }
                         } else {
                             ctx.fireExceptionCaught(new DecoderException("failed to get the SslContext for "
                                     + hostname, future.cause()));
@@ -329,7 +333,7 @@ public class SniHandler extends ByteToMessageDecoder implements ChannelOutboundH
             replaceHandler(ctx, hostname, sslContext);
         } catch (Throwable cause) {
             selection = EMPTY_SELECTION;
-            ctx.fireExceptionCaught(cause);
+            PlatformDependent.throwException(cause);
         }
     }
 
diff --git a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
index c05347394d..5c5e70f40f 100644
--- a/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
+++ b/handler/src/main/java/io/netty/handler/ssl/SslHandler.java
@@ -1068,7 +1068,7 @@ public class SslHandler extends ByteToMessageDecoder implements ChannelOutboundH
             // be released because the user will remove the SslHandler in an exceptionCaught(...) implementation.
             setHandshakeFailure(ctx, e);
 
-            ctx.fireExceptionCaught(e);
+            throw e;
         }
     }