@@ -1,62 +1,74 @@
1+{-# LANGUAGE CPP #-}
12{-# LANGUAGE OverloadedStrings #-}
23{-# LANGUAGE RankNTypes #-}
34{-# LANGUAGE RecordWildCards #-}
45{-# LANGUAGE DeriveDataTypeable #-}
56{-# LANGUAGE PatternGuards #-}
6−{-# LANGUAGE CPP #-}
77
8−-- | HTTP over SSL/TLS support for Warp via the TLS package.
8+-- | HTTP over TLS support for Warp via the TLS package.
9+--
10+-- If HTTP\/2 is negotiated by ALPN, HTTP\/2 over TLS is used.
11+-- Otherwise HTTP\/1.1 over TLS is used.
12+--
13+-- Support for SSL is now obsoleted.
914
1015module Network.Wai.Handler.WarpTLS (
1116 -- * Settings
1217 TLSSettings
18+ , defaultTlsSettings
19+ -- * Smart constructors
20+ , tlsSettings
21+ , tlsSettingsMemory
22+ , tlsSettingsChain
23+ , tlsSettingsChainMemory
24+ -- * Accessors
1325 , certFile
1426 , keyFile
15− , onInsecure
1627 , tlsLogging
1728 , tlsAllowedVersions
1829 , tlsCiphers
1930 , tlsWantClientCert
2031 , tlsServerHooks
21− , defaultTlsSettings
22− , tlsSettings
23− , tlsSettingsMemory
24− , tlsSettingsChain
25− , tlsSettingsChainMemory
32+ , tlsServerDHEParams
33+ , tlsSessionManagerConfig
34+ , onInsecure
2635 , OnInsecure (..)
2736 -- * Runner
2837 , runTLS
2938 , runTLSSocket
3039 -- * Exception
3140 , WarpTLSException (..)
41+ , DH.Params
42+ , DH.generateParams
3243 ) where
3344
34−#if __GLASGOW_HASKELL__ < 709
35−import Control.Applicative ((<$>))
36−#endif
37−import Control.Exception (Exception, throwIO, bracket, finally, handle, fromException, try, IOException, onException)
38−import Control.Monad (unless, void)
39−import qualified Crypto.Random.AESCtr
40−import qualified Data.ByteString as B
45+import Control.Applicative ((<|>))
46+import Control.Exception (Exception, throwIO, bracket, finally, handle, fromException, try, IOException, onException, SomeException(..), handleJust)
47+import qualified Control.Exception as E
48+import Control.Monad (void, guard)
4149import qualified Data.ByteString as S
4250import qualified Data.ByteString.Lazy as L
43−import Data.ByteString.Lazy.Internal (defaultChunkSize)
4451import Data.Default.Class (def)
4552import qualified Data.IORef as I
4653import Data.Streaming.Network (bindPortTCP, safeRecv)
4754import Data.Typeable (Typeable)
48−import Network.Socket (Socket, sClose, withSocketsDo, SockAddr, accept)
55+import Network.Socket (Socket, close, withSocketsDo, SockAddr, accept)
56+#if MIN_VERSION_network(3,1,1)
57+import Network.Socket (gracefulClose)
58+#endif
4959import Network.Socket.ByteString (sendAll)
5060import qualified Network.TLS as TLS
61+import qualified Crypto.PubKey.DH as DH
5162import qualified Network.TLS.Extra as TLSExtra
63+import qualified Network.TLS.SessionManager as SM
5264import Network.Wai (Application)
5365import Network.Wai.Handler.Warp
54−import Network.Wai.Handler.Warp.Buffer (allocateBuffer, bufferSize, freeBuffer)
55−import qualified System.IO as IO
66+import Network.Wai.Handler.Warp.Internal
5667import System.IO.Error (isEOFError)
5768
5869----------------------------------------------------------------
5970
71+-- | Settings for WarpTLS.
6072data TLSSettings = TLSSettings {
6173 certFile :: FilePath
6274 -- ^ File containing the certificate.
@@ -68,8 +80,10 @@ data TLSSettings = TLSSettings {
6880 , chainCertsMemory :: [S.ByteString]
6981 , keyMemory :: Maybe S.ByteString
7082 , onInsecure :: OnInsecure
71− -- ^ Do we allow insecure connections with this server as well? Default
72− -- is a simple text response stating that a secure connection is required.
83+ -- ^ Do we allow insecure connections with this server as well?
84+ --
85+ -- >>> onInsecure defaultTlsSettings
86+ -- DenyInsecure "This server only accepts secure HTTPS connections."
7387 --
7488 -- Since 1.4.0
7589 , tlsLogging :: TLS.Logging
@@ -79,23 +93,44 @@ data TLSSettings = TLSSettings {
7993 --
8094 -- Since 1.4.0
8195 , tlsAllowedVersions :: [TLS.Version]
96+#if MIN_VERSION_tls(1,5,0)
97+ -- ^ The TLS versions this server accepts.
98+ --
99+ -- >>> tlsAllowedVersions defaultTlsSettings
100+ -- [TLS13,TLS12,TLS11,TLS10]
101+ --
102+ -- Since 1.4.2
103+#else
82104 -- ^ The TLS versions this server accepts.
83105 --
84− -- Default: '[TLS.TLS10,TLS.TLS11,TLS.TLS12]'.
106+ -- >>> tlsAllowedVersions defaultTlsSettings
107+ -- [TLS12,TLS11,TLS10]
85108 --
86109 -- Since 1.4.2
110+#endif
87111 , tlsCiphers :: [TLS.Cipher]
112+#if MIN_VERSION_tls(1,5,0)
113+ -- ^ The TLS ciphers this server accepts.
114+ --
115+ -- >>> tlsCiphers defaultTlsSettings
116+ -- [ECDHE-ECDSA-AES256GCM-SHA384,ECDHE-ECDSA-AES128GCM-SHA256,ECDHE-RSA-AES256GCM-SHA384,ECDHE-RSA-AES128GCM-SHA256,DHE-RSA-AES256GCM-SHA384,DHE-RSA-AES128GCM-SHA256,ECDHE-ECDSA-AES256CBC-SHA384,ECDHE-RSA-AES256CBC-SHA384,DHE-RSA-AES256-SHA256,ECDHE-ECDSA-AES256CBC-SHA,ECDHE-RSA-AES256CBC-SHA,DHE-RSA-AES256-SHA1,RSA-AES256GCM-SHA384,RSA-AES256-SHA256,RSA-AES256-SHA1,AES128GCM-SHA256,AES256GCM-SHA384]
117+ --
118+ -- Since 1.4.2
119+#else
88120 -- ^ The TLS ciphers this server accepts.
89121 --
90− -- Default: '[TLSExtra.cipher_AES128_SHA1, TLSExtra.cipher_AES256_SHA1, TLSEtra.cipher_RC4_128_MD5, TLSExtra.cipher_RC4_128_SHA1]'
122+ -- >>> tlsCiphers defaultTlsSettings
123+ -- [ECDHE-ECDSA-AES256GCM-SHA384,ECDHE-ECDSA-AES128GCM-SHA256,ECDHE-RSA-AES256GCM-SHA384,ECDHE-RSA-AES128GCM-SHA256,DHE-RSA-AES256GCM-SHA384,DHE-RSA-AES128GCM-SHA256,ECDHE-ECDSA-AES256CBC-SHA384,ECDHE-RSA-AES256CBC-SHA384,DHE-RSA-AES256-SHA256,ECDHE-ECDSA-AES256CBC-SHA,ECDHE-RSA-AES256CBC-SHA,DHE-RSA-AES256-SHA1,RSA-AES256GCM-SHA384,RSA-AES256-SHA256,RSA-AES256-SHA1]
91124 --
92125 -- Since 1.4.2
126+#endif
93127 , tlsWantClientCert :: Bool
94128 -- ^ Whether or not to demand a certificate from the client. If this
95129 -- is set to True, you must handle received certificates in a server hook
96130 -- or all connections will fail.
97131 --
98− -- Default: False
132+ -- >>> tlsWantClientCert defaultTlsSettings
133+ -- False
99134 --
100135 -- Since 3.0.2
101136 , tlsServerHooks :: TLS.ServerHooks
@@ -106,9 +141,25 @@ data TLSSettings = TLSSettings {
106141 -- Default: def
107142 --
108143 -- Since 3.0.2
144+ , tlsServerDHEParams :: Maybe DH.Params
145+ -- ^ Configuration for ServerDHEParams
146+ -- more function lives in `cryptonite` package
147+ --
148+ -- Default: Nothing
149+ --
150+ -- Since 3.2.2
151+ , tlsSessionManagerConfig :: Maybe SM.Config
152+ -- ^ Configuration for in-memory TLS session manager.
153+ -- If Nothing, 'TLS.noSessionManager' is used.
154+ -- Otherwise, an in-memory TLS session manager is created
155+ -- according to 'Config'.
156+ --
157+ -- Default: Nothing
158+ --
159+ -- Since 3.2.4
109160 }
110161
111−-- | Default 'TLSSettings'. Use this to create 'TLSSettings' with the field record name.
162+-- | Default 'TLSSettings'. Use this to create 'TLSSettings' with the field record name (aka accessors).
112163defaultTlsSettings :: TLSSettings
113164defaultTlsSettings = TLSSettings {
114165 certFile = "certificate.pem"
@@ -119,39 +170,32 @@ defaultTlsSettings = TLSSettings {
119170 , keyMemory = Nothing
120171 , onInsecure = DenyInsecure "This server only accepts secure HTTPS connections."
121172 , tlsLogging = def
122− , tlsAllowedVersions = [TLS.TLS10,TLS.TLS11,TLS.TLS12]
173+#if MIN_VERSION_tls(1,5,0)
174+ , tlsAllowedVersions = [TLS.TLS13,TLS.TLS12,TLS.TLS11,TLS.TLS10]
175+#else
176+ , tlsAllowedVersions = [TLS.TLS12,TLS.TLS11,TLS.TLS10]
177+#endif
123178 , tlsCiphers = ciphers
124179 , tlsWantClientCert = False
125180 , tlsServerHooks = def
181+ , tlsServerDHEParams = Nothing
182+ , tlsSessionManagerConfig = Nothing
126183 }
127184
128185-- taken from stunnel example in tls-extra
129186ciphers :: [TLS.Cipher]
130−ciphers =
131− [ TLSExtra.cipher_ECDHE_RSA_AES128GCM_SHA256
132− , TLSExtra.cipher_DHE_RSA_AES128GCM_SHA256
133− , TLSExtra.cipher_DHE_RSA_AES256_SHA256
134− , TLSExtra.cipher_DHE_RSA_AES128_SHA256
135− , TLSExtra.cipher_DHE_RSA_AES256_SHA1
136− , TLSExtra.cipher_DHE_RSA_AES128_SHA1
137− , TLSExtra.cipher_DHE_DSS_AES128_SHA1
138− , TLSExtra.cipher_DHE_DSS_AES256_SHA1
139− , TLSExtra.cipher_DHE_DSS_RC4_SHA1
140− , TLSExtra.cipher_AES128_SHA1
141− , TLSExtra.cipher_AES256_SHA1
142− , TLSExtra.cipher_RC4_128_MD5
143− , TLSExtra.cipher_RC4_128_SHA1
144− ]
187+ciphers = TLSExtra.ciphersuite_strong
145188
146189----------------------------------------------------------------
147190
148191-- | An action when a plain HTTP comes to HTTP over TLS/SSL port.
149192data OnInsecure = DenyInsecure L.ByteString
150193 | AllowInsecure
194+ deriving (Show)
151195
152196----------------------------------------------------------------
153197
154−-- | A smart constructor for 'TLSSettings'.
198+-- | A smart constructor for 'TLSSettings' based on 'defaultTlsSettings'.
155199tlsSettings :: FilePath -- ^ Certificate file
156200 -> FilePath -- ^ Key file
157201 -> TLSSettings
@@ -161,7 +205,7 @@ tlsSettings cert key = defaultTlsSettings {
161205 }
162206
163207-- | A smart constructor for 'TLSSettings' that allows specifying
164−-- chain certificates.
208+-- chain certificates based on 'defaultTlsSettings'.
165209--
166210-- Since 3.0.3
167211tlsSettingsChain
@@ -176,7 +220,7 @@ tlsSettingsChain cert chainCerts key = defaultTlsSettings {
176220 }
177221
178222-- | A smart constructor for 'TLSSettings', but uses in-memory representations
179−-- of the certificate and key
223+-- of the certificate and key based on 'defaultTlsSettings'.
180224--
181225-- Since 3.0.1
182226tlsSettingsMemory
@@ -189,7 +233,7 @@ tlsSettingsMemory cert key = defaultTlsSettings
189233 }
190234
191235-- | A smart constructor for 'TLSSettings', but uses in-memory representations
192−-- of the certificate and key
236+-- of the certificate and key based on 'defaultTlsSettings'.
193237--
194238-- Since 3.0.3
195239tlsSettingsChainMemory
@@ -205,13 +249,12 @@ tlsSettingsChainMemory cert chainCerts key = defaultTlsSettings
205249
206250----------------------------------------------------------------
207251
208−
209252-- | Running 'Application' with 'TLSSettings' and 'Settings'.
210253runTLS :: TLSSettings -> Settings -> Application -> IO ()
211254runTLS tset set app = withSocketsDo $
212255 bracket
213256 (bindPortTCP (getPort set) (getHost set))
214− sClose
257+ close
215258 (\sock -> runTLSSocket tset set sock app)
216259
217260----------------------------------------------------------------
@@ -229,101 +272,186 @@ runTLSSocket tlsset@TLSSettings{..} set sock app = do
229272 key <- maybe (S.readFile keyFile) return mkey
230273 either error return $
231274 TLS.credentialLoadX509ChainFromMemory cert chainCertsMemory key
232− runTLSSocket' tlsset set credential sock app
275+ mgr <- case tlsSessionManagerConfig of
276+ Nothing -> return TLS.noSessionManager
277+ Just config -> SM.newSessionManager config
278+ runTLSSocket' tlsset set credential mgr sock app
233279
234−runTLSSocket' :: TLSSettings -> Settings -> TLS.Credential -> Socket -> Application -> IO ()
235−runTLSSocket' tlsset@TLSSettings{..} set credential sock app =
280+runTLSSocket' :: TLSSettings -> Settings -> TLS.Credential -> TLS.SessionManager -> Socket -> Application -> IO ()
281+runTLSSocket' tlsset@TLSSettings{..} set credential mgr sock app =
236282 runSettingsConnectionMakerSecure set get app
237283 where
238− get = getter tlsset sock params
239− params = def {
284+ get = getter tlsset set sock params
285+ params = def { -- TLS.ServerParams
240286 TLS.serverWantClientCert = tlsWantClientCert
241− , TLS.serverSupported = def {
242− TLS.supportedVersions = tlsAllowedVersions
243− , TLS.supportedCiphers = tlsCiphers
244− }
245− , TLS.serverShared = def {
246− TLS.sharedCredentials = TLS.Credentials [credential]
247− }
248− , TLS.serverHooks = tlsServerHooks
287+ , TLS.serverCACertificates = []
288+ , TLS.serverDHEParams = tlsServerDHEParams
289+ , TLS.serverHooks = hooks
290+ , TLS.serverShared = shared
291+ , TLS.serverSupported = supported
292+#if MIN_VERSION_tls(1,5,0)
293+ , TLS.serverEarlyDataSize = 2018
294+#endif
295+ }
296+ -- Adding alpn to user's tlsServerHooks.
297+ hooks = tlsServerHooks {
298+ TLS.onALPNClientSuggest = TLS.onALPNClientSuggest tlsServerHooks <|>
299+ (if settingsHTTP2Enabled set then Just alpn else Nothing)
249300 }
301+ shared = def {
302+ TLS.sharedCredentials = TLS.Credentials [credential]
303+ , TLS.sharedSessionManager = mgr
304+ }
305+ supported = def { -- TLS.Supported
306+ TLS.supportedVersions = tlsAllowedVersions
307+ , TLS.supportedCiphers = tlsCiphers
308+ , TLS.supportedCompressions = [TLS.nullCompression]
309+ , TLS.supportedSecureRenegotiation = True
310+ , TLS.supportedClientInitiatedRenegotiation = False
311+ , TLS.supportedSession = True
312+ , TLS.supportedFallbackScsv = True
313+#if MIN_VERSION_tls(1,5,0)
314+ , TLS.supportedGroups = [TLS.X25519,TLS.P256,TLS.P384]
315+#endif
316+ }
317+
318+alpn :: [S.ByteString] -> IO S.ByteString
319+alpn xs
320+ | "h2" `elem` xs = return "h2"
321+ | otherwise = return "http/1.1"
250322
251323----------------------------------------------------------------
252324
253−getter :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
254−getter tlsset@TLSSettings{..} sock params = do
325+getter :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> params -> IO (IO (Connection, Transport), SockAddr)
326+getter tlsset@TLSSettings{..} set sock params = do
327+#if WINDOWS
328+ (s, sa) <- windowsThreadBlockHack $ accept sock
329+#else
255330 (s, sa) <- accept sock
256− return (mkConn tlsset s params, sa)
331+#endif
332+ setSocketCloseOnExec s
333+ return (mkConn tlsset set s params, sa)
257334
258−mkConn :: TLS.TLSParams params => TLSSettings -> Socket -> params -> IO (Connection, Transport)
259−mkConn tlsset s params = do
260− firstBS <- safeRecv s 4096
261− cachedRef <- I.newIORef firstBS
262− (if not (B.null firstBS) && B.head firstBS == 0x16 then
263− httpOverTls tlsset s cachedRef params
264− else
265− plainHTTP tlsset s cachedRef) `onException` sClose s
335+mkConn :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> params -> IO (Connection, Transport)
336+mkConn tlsset set s params = switch `onException` close s
337+ where
338+ switch = do
339+ firstBS <- safeRecv s 4096
340+ if not (S.null firstBS) && S.head firstBS == 0x16 then
341+ httpOverTls tlsset set s firstBS params
342+ else
343+ plainHTTP tlsset set s firstBS
266344
267345----------------------------------------------------------------
268346
269−httpOverTls :: TLS.TLSParams params => TLSSettings -> Socket -> I.IORef B.ByteString -> params -> IO (Connection, Transport)
270−httpOverTls TLSSettings{..} s cachedRef params = do
271− gen <- Crypto.Random.AESCtr.makeSystem
272− ctx <- TLS.contextNew backend params gen
347+httpOverTls :: TLS.TLSParams params => TLSSettings -> Settings -> Socket -> S.ByteString -> params -> IO (Connection, Transport)
348+httpOverTls TLSSettings{..} _set s bs0 params = do
349+ recvN <- makePlainReceiveN s bs0
350+ ctx <- TLS.contextNew (backend recvN) params
273351 TLS.contextHookSetLogging ctx tlsLogging
274352 TLS.handshake ctx
353+ h2 <- (== Just "h2") <$> TLS.getNegotiatedProtocol ctx
354+ isH2 <- I.newIORef h2
275355 writeBuf <- allocateBuffer bufferSize
356+ -- Creating a cache for leftover input data.
357+ ref <- I.newIORef ""
276358 tls <- getTLSinfo ctx
277− return (conn ctx writeBuf, tls)
359+ return (conn ctx writeBuf ref isH2, tls)
278360 where
279− backend = TLS.Backend {
361+ backend recvN = TLS.Backend {
280362 TLS.backendFlush = return ()
281− , TLS.backendClose = sClose s
282− , TLS.backendSend = sendAll s
283− , TLS.backendRecv = recvTLS cachedRef s
363+#if MIN_VERSION_network(3,1,1)
364+ , TLS.backendClose = gracefulClose s 5000 `E.catch` \(SomeException _) -> return ()
365+#else
366+ , TLS.backendClose = close s
367+#endif
368+ , TLS.backendSend = sendAll' s
369+ , TLS.backendRecv = recvN
284370 }
285− conn ctx writeBuf = Connection {
371+ sendAll' sock bs = sendAll sock bs `E.catch` \(SomeException _) ->
372+ throwIO ConnectionClosedByPeer
373+ conn ctx writeBuf ref isH2 = Connection {
286374 connSendMany = TLS.sendData ctx . L.fromChunks
287− , connSendAll = TLS.sendData ctx . L.fromChunks . return
375+ , connSendAll = sendall
288376 , connSendFile = sendfile
289− , connClose = close
290− , connRecv = recv
291− , connSendFileOverride = NotOverride
377+ , connClose = close'
378+ , connFree = freeBuffer writeBuf
379+ , connRecv = recv ref
380+ , connRecvBuf = recvBuf ref
292381 , connWriteBuffer = writeBuf
293382 , connBufferSize = bufferSize
383+ , connHTTP2 = isH2
294384 }
295385 where
296− sendfile fp offset len tickle' headers = do
297− TLS.sendData ctx $ L.fromChunks headers
298− IO.withBinaryFile fp IO.ReadMode $ \h -> do
299− IO.hSeek h IO.AbsoluteSeek offset
300− loop h $ fromIntegral len
301− where
302− loop _ remaining | remaining <= 0 = return ()
303− loop h remaining = do
304− bs <- B.hGetSome h defaultChunkSize
305− unless (B.null bs) $ do
306− let x = B.take remaining bs
307− TLS.sendData ctx $ L.fromChunks [x]
308− void $ tickle' -- This tickles the Timer. It MUST be called per chunk.
309− loop h $ remaining - B.length x
310−
311− close = freeBuffer writeBuf `finally`
312− void (tryIO $ TLS.bye ctx) `finally`
313− TLS.contextClose ctx
314−
315− recv = handle onEOF go
386+ sendall = TLS.sendData ctx . L.fromChunks . return
387+ sendfile fid offset len hook headers =
388+ readSendFile writeBuf bufferSize sendall fid offset len hook headers
389+
390+ close' = void (tryIO sendBye) `finally`
391+ TLS.contextClose ctx
392+
393+ sendBye =
394+ -- It's fine if the connection was closed by the other side before
395+ -- receiving close_notify, see RFC 5246 section 7.2.1.
396+ handleJust
397+ (\e -> guard (e == ConnectionClosedByPeer) >> return e)
398+ (const (return ()))
399+ (TLS.bye ctx)
400+
401+ -- TLS version of recv with a cache for leftover input data.
402+ -- The cache is shared with recvBuf.
403+ recv cref = do
404+ cached <- I.readIORef cref
405+ if cached /= "" then do
406+ I.writeIORef cref ""
407+ return cached
408+ else
409+ recv'
410+
411+ -- TLS version of recv (decrypting) without a cache.
412+ recv' = handle onEOF go
316413 where
317414 onEOF e
318− | Just TLS.Error_EOF <- fromException e = return B.empty
319− | Just ioe <- fromException e, isEOFError ioe = return B.empty | otherwise = throwIO e
415+ | Just TLS.Error_EOF <- fromException e = return S.empty
416+ | Just ioe <- fromException e, isEOFError ioe = return S.empty | otherwise = throwIO e
320417 go = do
321418 x <- TLS.recvData ctx
322− if B.null x then
419+ if S.null x then
323420 go
324421 else
325422 return x
326423
424+ -- TLS version of recvBuf with a cache for leftover input data.
425+ recvBuf cref buf siz = do
426+ cached <- I.readIORef cref
427+ (ret, leftover) <- fill cached buf siz recv'
428+ I.writeIORef cref leftover
429+ return ret
430+
431+fill :: S.ByteString -> Buffer -> BufSize -> Recv -> IO (Bool,S.ByteString)
432+fill bs0 buf0 siz0 recv
433+ | siz0 <= len0 = do
434+ let (bs, leftover) = S.splitAt siz0 bs0
435+ void $ copy buf0 bs
436+ return (True, leftover)
437+ | otherwise = do
438+ buf <- copy buf0 bs0
439+ loop buf (siz0 - len0)
440+ where
441+ len0 = S.length bs0
442+ loop _ 0 = return (True, "")
443+ loop buf siz = do
444+ bs <- recv
445+ let len = S.length bs
446+ if len == 0 then return (False, "")
447+ else if (len <= siz) then do
448+ buf' <- copy buf bs
449+ loop buf' (siz - len)
450+ else do
451+ let (bs1,bs2) = S.splitAt siz bs
452+ void $ copy buf bs1
453+ return (True, bs2)
454+
327455getTLSinfo :: TLS.Context -> IO Transport
328456getTLSinfo ctx = do
329457 proto <- TLS.getNegotiatedProtocol ctx
@@ -337,11 +465,16 @@ getTLSinfo ctx = do
337465 TLS.TLS10 -> (3,1)
338466 TLS.TLS11 -> (3,2)
339467 TLS.TLS12 -> (3,3)
468+#if MIN_VERSION_tls(1,5,0)
469+ TLS.TLS13 -> (3,4)
470+#endif
471+ clientCert <- TLS.getClientCertificateChain ctx
340472 return TLS {
341473 tlsMajorVersion = major
342474 , tlsMinorVersion = minor
343475 , tlsNegotiatedProtocol = proto
344476 , tlsChiperID = TLS.cipherID infoCipher
477+ , tlsClientCertificate = clientCert
345478 }
346479
347480tryIO :: IO a -> IO (Either IOException a)
@@ -349,52 +482,46 @@ tryIO = try
349482
350483----------------------------------------------------------------
351484
352−plainHTTP :: TLSSettings -> Socket -> I.IORef B.ByteString -> IO (Connection, Transport)
353−plainHTTP TLSSettings{..} s cachedRef = case onInsecure of
485+plainHTTP :: TLSSettings -> Settings -> Socket -> S.ByteString -> IO (Connection, Transport)
486+plainHTTP TLSSettings{..} set s bs0 = case onInsecure of
354487 AllowInsecure -> do
355− conn' <- socketConnection s
488+ conn' <- socketConnection set s
489+ cachedRef <- I.newIORef bs0
356490 let conn'' = conn'
357491 { connRecv = recvPlain cachedRef (connRecv conn')
358492 }
359493 return (conn'', TCP)
360494 DenyInsecure lbs -> do
361− sendAll s "HTTP/1.1 200 OK\r\nContent-Type: text/plain\r\n\r\n"
495+ -- Listening port 443 but TLS records do not arrive.
496+ -- We want to let the browser know that TLS is required.
497+ -- So, we use 426.
498+ -- http://tools.ietf.org/html/rfc2817#section-4.2
499+ -- https://tools.ietf.org/html/rfc7231#section-6.5.15
500+ -- FIXME: should we distinguish HTTP/1.1 and HTTP/2?
501+ -- In the case of HTTP/2, should we send
502+ -- GOAWAY + INADEQUATE_SECURITY?
503+ -- FIXME: Content-Length:
504+ -- FIXME: TLS/<version>
505+ sendAll s "HTTP/1.1 426 Upgrade Required\
506+ \r\nUpgrade: TLS/1.0, HTTP/1.1\
507+ \r\nConnection: Upgrade\
508+ \r\nContent-Type: text/plain\r\n\r\n"
362509 mapM_ (sendAll s) $ L.toChunks lbs
363− sClose s
510+ close s
364511 throwIO InsecureConnectionDenied
365512
366513----------------------------------------------------------------
367514
368−recvTLS :: I.IORef B.ByteString -> Socket -> Int -> IO B.ByteString
369−recvTLS cachedRef s size = do
370− cached <- I.readIORef cachedRef
371− loop cached
372− where
373− loop bs | B.length bs >= size = do
374− let (x, y) = B.splitAt size bs
375− I.writeIORef cachedRef y
376− return x
377− loop bs1 = do
378− bs2 <- safeRecv s 4096
379− if B.null bs2 then do
380− -- FIXME does this deserve an exception being thrown?
381− I.writeIORef cachedRef B.empty
382− return bs1
383− else
384− loop $ B.append bs1 bs2
385−
386−----------------------------------------------------------------
387−
388515-- | Modify the given receive function to first check the given @IORef@ for a
389516-- chunk of data. If present, takes the chunk of data from the @IORef@ and
390517-- empties out the @IORef@. Otherwise, calls the supplied receive function.
391−recvPlain :: I.IORef B.ByteString -> IO B.ByteString -> IO B.ByteString
518+recvPlain :: I.IORef S.ByteString -> IO S.ByteString -> IO S.ByteString
392519recvPlain ref fallback = do
393520 bs <- I.readIORef ref
394− if B.null bs
521+ if S.null bs
395522 then fallback
396523 else do
397− I.writeIORef ref B.empty
524+ I.writeIORef ref S.empty
398525 return bs
399526
400527----------------------------------------------------------------