Merge pull request #619 from clj-commons/fix-connection-close-during-handshake

Fix #617 and #618

Author: KingMob

src/aleph/netty.clj

@@ -232,9 +232,7 @@
      (d/error! d (CancellationException. "future is cancelled."))
 
      (some? (.cause f))
-     (if (instance? ClosedChannelException (.cause f))
-       (d/success! d false)
-       (d/error! d (.cause f)))
+     (d/error! d (.cause f))
 
      :else
      (d/error! d (IllegalStateException. "future in unknown state"))))

src/aleph/tcp.clj

@@ -53,8 +53,8 @@
 
       :channel-inactive
       ([_ ctx]
-        (s/close! @in)
-        (.fireChannelInactive ctx))
+       (some-> @in s/close!)
+       (.fireChannelInactive ctx))
 
       :channel-active
       ([_ ctx]

test/aleph/netty_test.clj

@@ -0,0 +1,14 @@
+(ns aleph.netty-test
+  (:require
+   [aleph.netty :as netty]
+   [clojure.test :refer [deftest is]]
+   [manifold.stream :as s])
+  (:import
+   (io.netty.channel.embedded EmbeddedChannel)))
+
+(deftest closing-a-channel-sink
+  (let [ch (EmbeddedChannel.)
+        s (netty/sink ch)]
+    (is (= true @(s/put! s "foo")))
+    (is (nil? @(netty/wrap-future (netty/close ch))))
+    (is (= false @(s/put! s "foo")))))

test/aleph/ssl.clj

@@ -2,7 +2,6 @@
   (:require
    [aleph.netty :as netty])
   (:import
-   (io.netty.handler.ssl ClientAuth SslContextBuilder)
    (java.io ByteArrayInputStream)
    (java.security KeyFactory PrivateKey)
    (java.security.cert CertificateFactory X509Certificate)

test/aleph/tcp_ssl_test.clj

@@ -61,3 +61,22 @@
                                            :trust-store (into-array X509Certificate [ssl/ca-cert])})})]
         (is (nil? @(s/take! c)))
         (is (nil? @ssl-session) "SSL session should be undefined")))))
+
+(deftest test-connection-close-during-ssl-handshake
+  (let [ssl-session (atom nil)
+        connection-closed (promise)
+        notify-connection-closed #_:clj-kondo/ignore (netty/channel-handler
+                                                      :channel-inactive
+                                                      ([_ ctx]
+                                                       (deliver connection-closed true)
+                                                       (.fireChannelInactive ctx)))]
+    (with-server (tcp/start-server (ssl-echo-handler ssl-session)
+                                   {:port 10001
+                                    :ssl-context ssl/server-ssl-context
+                                    :pipeline-transform (fn [p]
+                                                          (.addLast p notify-connection-closed))})
+      (let [c @(tcp/client {:host "localhost"
+                            :port 10001})]
+        (s/close! c)
+        (is (deref connection-closed 1000 false))
+        (is (nil? @ssl-session) "SSL session should be undefined")))))