Add :aleph/channel to server's ring request map

This makes `aleph.http.core/ring-request-ssl-session` work with HTTP/2 requests, too, since we no
longer have to rely on the HTTP/1-only NettyRequest's `ch` field. However, since for HTTP/2 the
`SslHandler` lives on the connection channel rather than the request's stream channel, we have to
change `channel-ssl-session` to recur the channel ancestor chain to find it now.

Author: DerGuteMoritz

src/aleph/http/core.clj

@@ -242,6 +242,7 @@
   :server-name (netty/channel-server-name ch)
   :server-port (netty/channel-server-port ch)
   :remote-addr (netty/channel-remote-address ch)
+  :aleph/channel ch
   :aleph/request-arrived request-arrived
   :protocol "HTTP/1.1")
 
@@ -267,8 +268,8 @@
   [rsp destroy-conn? body]
   (->NettyResponse rsp destroy-conn? body))
 
-(defn ring-request-ssl-session [^NettyRequest req]
-  (netty/channel-ssl-session (.ch req)))
+(defn ring-request-ssl-session [req]
+  (netty/channel-ssl-session (:aleph/channel req)))
 
 ;;;
 

src/aleph/http/http2.clj

@@ -822,6 +822,7 @@
 
      :protocol              "HTTP/2.0"
 
+     :aleph/channel         ch
      :aleph/writable?       writable?
      :aleph/h2-exception    h2-exception
      :aleph/keep-alive?     true                            ; not applicable to HTTP/2, but here for compatibility

src/aleph/netty.clj

@@ -1190,11 +1190,12 @@
   (partial coerce-ssl-context ssl-client-context))
 
 (defn ^:no-doc channel-ssl-session [^Channel ch]
-  (some-> ch
-          ^ChannelPipeline (.pipeline)
-          ^SslHandler (.get SslHandler)
-          .engine
-          .getSession))
+  (or (some-> ch
+              ^ChannelPipeline (.pipeline)
+              ^SslHandler (.get SslHandler)
+              .engine
+              .getSession)
+      (recur (.parent ch))))
 
 (defn ^:no-doc ssl-handshake-error? [^Throwable ex]
   (and (instance? DecoderException ex)