@@ -1,5 +1,4 @@
11{-# LANGUAGE CPP #-}
2−{-# LANGUAGE OverloadedStrings #-}
32{-# LANGUAGE ExistentialQuantification #-}
43{-# LANGUAGE PatternGuards #-}
54{-# LANGUAGE TypeFamilies #-}
@@ -12,7 +11,7 @@ module Network.Wai.Parse
1211 , RequestBodyType (..)
1312 , getRequestBodyType
1413 , sinkRequestBody
15− , conduitRequestBody
14+ , sinkRequestBodyEx
1615 , BackEnd
1716 , lbsBackEnd
1817 , tempFileBackEnd
@@ -21,6 +20,24 @@ module Network.Wai.Parse
2120 , File
2221 , FileInfo (..)
2322 , parseContentType
23+ , ParseRequestBodyOptions
24+ , defaultParseRequestBodyOptions
25+ , noLimitParseRequestBodyOptions
26+ , parseRequestBodyEx
27+ , setMaxRequestKeyLength
28+ , clearMaxRequestKeyLength
29+ , setMaxRequestNumFiles
30+ , clearMaxRequestNumFiles
31+ , setMaxRequestFileSize
32+ , clearMaxRequestFileSize
33+ , setMaxRequestFilesSize
34+ , clearMaxRequestFilesSize
35+ , setMaxRequestParmsSize
36+ , clearMaxRequestParmsSize
37+ , setMaxHeaderLines
38+ , clearMaxHeaderLines
39+ , setMaxHeaderLineLength
40+ , clearMaxHeaderLineLength
2441#if TEST
2542 , Bound (..)
2643 , findBound
@@ -31,31 +48,30 @@ module Network.Wai.Parse
3148#endif
3249 ) where
3350
34−import qualified Data.ByteString.Search as Search
51+import qualified Control.Exception as E
3552import qualified Data.ByteString as S
3653import qualified Data.ByteString.Lazy as L
3754import qualified Data.ByteString.Char8 as S8
3855import Data.Word (Word8)
39−import Data.Maybe (fromMaybe)
56+import Data.Int (Int64)
57+import Data.Maybe (catMaybes, fromMaybe)
4058import Data.List (sortBy)
41−import Data.Function (on)
59+import Data.Function (on, fix)
4260import System.Directory (removeFile, getTemporaryDirectory)
4361import System.IO (hClose, openBinaryTempFile)
62+import System.IO.Error (isDoesNotExistError)
4463import Network.Wai
45−import Data.Conduit
46−import Data.Conduit.Internal (sinkToPipe)
47−import qualified Data.Conduit.List as CL
48−import qualified Data.Conduit.Binary as CB
49−import Control.Monad.IO.Class (liftIO)
5064import qualified Network.HTTP.Types as H
51−import Data.Either (partitionEithers)
52−import Control.Monad (when, unless)
53−import Control.Monad.Trans.Class (lift)
54−import Control.Monad.Trans.Resource (allocate, release, register)
55−#if MIN_VERSION_conduit(1, 0, 0)
56−import Data.Conduit.Internal (Pipe (NeedInput, HaveOutput), (>+>), withUpstream, Sink (..), injectLeftovers, ConduitM (..))
57−import Data.Void (Void)
58−#endif
65+import Control.Applicative ((<$>))
66+import Control.Exception (catchJust)
67+import Control.Monad (when, unless, guard)
68+import Control.Monad.Trans.Resource (allocate, release, register, InternalState, runInternalState)
69+import Data.IORef
70+import Network.HTTP.Types (hContentType)
71+import Network.HTTP2( HTTP2Error (..), ErrorCodeId (..) )
72+import Data.CaseInsensitive (mk)
73+
74+import Prelude hiding (lines)
5975
6076breakDiscard :: Word8 -> S.ByteString -> (S.ByteString, S.ByteString)
6177breakDiscard w s =
@@ -87,28 +103,186 @@ parseHttpAccept = map fst
87103 _ -> 1.0
88104
89105-- | Store uploaded files in memory
90−lbsBackEnd :: Monad m => ignored1 -> ignored2 -> Sink S.ByteString m L.ByteString
91−lbsBackEnd _ _ = fmap L.fromChunks CL.consume
106+lbsBackEnd :: Monad m => ignored1 -> ignored2 -> m S.ByteString -> m L.ByteString
107+lbsBackEnd _ _ popper =
108+ loop id
109+ where
110+ loop front = do
111+ bs <- popper
112+ if S.null bs
113+ then return $ L.fromChunks $ front []
114+ else loop $ front . (bs:)
92115
93116-- | Save uploaded files on disk as temporary files
94−tempFileBackEnd :: MonadResource m => ignored1 -> ignored2 -> Sink S.ByteString m FilePath
117+--
118+-- Note: starting with version 2.0, removal of temp files is registered with
119+-- the provided @InternalState@. It is the responsibility of the caller to
120+-- ensure that this @InternalState@ gets cleaned up.
121+tempFileBackEnd :: InternalState -> ignored1 -> ignored2 -> IO S.ByteString -> IO FilePath
95122tempFileBackEnd = tempFileBackEndOpts getTemporaryDirectory "webenc.buf"
96123
97−-- | Same as 'tempFileSink', but use configurable temp folders and patterns.
98−tempFileBackEndOpts :: MonadResource m
99− => IO FilePath -- ^ get temporary directory
124+-- | Same as 'tempFileBackEnd', but use configurable temp folders and patterns.
125+tempFileBackEndOpts :: IO FilePath -- ^ get temporary directory
100126 -> String -- ^ filename pattern
127+ -> InternalState
101128 -> ignored1
102129 -> ignored2
103− -> Sink S.ByteString m FilePath
104−tempFileBackEndOpts getTmpDir pattern _ _ = do
105− (key, (fp, h)) <- lift $ allocate (do
106− tempDir <- getTmpDir
107− openBinaryTempFile tempDir pattern) (\(_, h) -> hClose h)
108− _ <- lift $ register $ removeFile fp
109− CB.sinkHandle h
110− lift $ release key
130+ -> IO S.ByteString
131+ -> IO FilePath
132+tempFileBackEndOpts getTmpDir pattrn internalState _ _ popper = do
133+ (key, (fp, h)) <- flip runInternalState internalState $ allocate it (hClose . snd)
134+ _ <- runInternalState (register $ removeFileQuiet fp) internalState
135+ fix $ \loop -> do
136+ bs <- popper
137+ unless (S.null bs) $ do
138+ S.hPut h bs
139+ loop
140+ release key
111141 return fp
142+ where
143+ it = do
144+ tempDir <- getTmpDir
145+ openBinaryTempFile tempDir pattrn
146+ removeFileQuiet fp = catchJust (guard . isDoesNotExistError)
147+ (removeFile fp)
148+ (const $ return ())
149+
150+-- | A data structure that describes the behavior of
151+-- the parseRequestBodyEx function.
152+--
153+-- @since 3.0.16.0
154+data ParseRequestBodyOptions = ParseRequestBodyOptions
155+ { -- | The maximum length of a filename
156+ prboKeyLength :: Maybe Int
157+ , -- | The maximum number of files.
158+ prboMaxNumFiles :: Maybe Int
159+ , -- | The maximum filesize per file.
160+ prboMaxFileSize :: Maybe Int64
161+ , -- | The maximum total filesize.
162+ prboMaxFilesSize :: Maybe Int64
163+ , -- | The maximum size of the sum of all parameters
164+ prboMaxParmsSize :: Maybe Int
165+ , -- | The maximum header lines per mime/multipart entry
166+ prboMaxHeaderLines :: Maybe Int
167+ , -- | The maximum header line length per mime/multipart entry
168+ prboMaxHeaderLineLength :: Maybe Int }
169+
170+-- | Set the maximum length of a filename.
171+--
172+-- @since 3.0.16.0
173+setMaxRequestKeyLength :: Int -> ParseRequestBodyOptions -> ParseRequestBodyOptions
174+setMaxRequestKeyLength l p = p { prboKeyLength=Just l }
175+
176+-- | Do not limit the length of filenames.
177+--
178+-- @since 3.0.16.0
179+clearMaxRequestKeyLength :: ParseRequestBodyOptions -> ParseRequestBodyOptions
180+clearMaxRequestKeyLength p = p { prboKeyLength=Nothing }
181+
182+-- | Set the maximum number of files per request.
183+--
184+-- @since 3.0.16.0
185+setMaxRequestNumFiles :: Int -> ParseRequestBodyOptions -> ParseRequestBodyOptions
186+setMaxRequestNumFiles l p = p { prboMaxNumFiles=Just l }
187+
188+-- | Do not limit the maximum number of files per request.
189+--
190+-- @since 3.0.16.0
191+clearMaxRequestNumFiles :: ParseRequestBodyOptions -> ParseRequestBodyOptions
192+clearMaxRequestNumFiles p = p { prboMaxNumFiles=Nothing }
193+
194+-- | Set the maximum filesize per file (in bytes).
195+--
196+-- @since 3.0.16.0
197+setMaxRequestFileSize :: Int64 -> ParseRequestBodyOptions -> ParseRequestBodyOptions
198+setMaxRequestFileSize l p = p { prboMaxFileSize=Just l }
199+
200+-- | Do not limit the maximum filesize per file.
201+--
202+-- @since 3.0.16.0
203+clearMaxRequestFileSize :: ParseRequestBodyOptions -> ParseRequestBodyOptions
204+clearMaxRequestFileSize p = p { prboMaxFileSize=Nothing }
205+
206+-- | Set the maximum size of all files per request.
207+--
208+-- @since 3.0.16.0
209+setMaxRequestFilesSize :: Int64 -> ParseRequestBodyOptions -> ParseRequestBodyOptions
210+setMaxRequestFilesSize l p = p { prboMaxFilesSize=Just l }
211+
212+-- | Do not limit the maximum size of all files per request.
213+--
214+-- @since 3.0.16.0
215+clearMaxRequestFilesSize :: ParseRequestBodyOptions -> ParseRequestBodyOptions
216+clearMaxRequestFilesSize p = p { prboMaxFilesSize=Nothing }
217+
218+-- | Set the maximum size of the sum of all parameters.
219+--
220+-- @since 3.0.16.0
221+setMaxRequestParmsSize :: Int -> ParseRequestBodyOptions -> ParseRequestBodyOptions
222+setMaxRequestParmsSize l p = p { prboMaxParmsSize=Just l }
223+
224+-- | Do not limit the maximum size of the sum of all parameters.
225+--
226+-- @since 3.0.16.0
227+clearMaxRequestParmsSize :: ParseRequestBodyOptions -> ParseRequestBodyOptions
228+clearMaxRequestParmsSize p = p { prboMaxParmsSize=Nothing }
229+
230+-- | Set the maximum header lines per mime/multipart entry.
231+--
232+-- @since 3.0.16.0
233+setMaxHeaderLines :: Int -> ParseRequestBodyOptions -> ParseRequestBodyOptions
234+setMaxHeaderLines l p = p { prboMaxHeaderLines=Just l }
235+
236+-- | Do not limit the maximum header lines per mime/multipart entry.
237+--
238+-- @since 3.0.16.0
239+clearMaxHeaderLines:: ParseRequestBodyOptions -> ParseRequestBodyOptions
240+clearMaxHeaderLines p = p { prboMaxHeaderLines=Nothing }
241+
242+-- | Set the maximum header line length per mime/multipart entry.
243+--
244+-- @since 3.0.16.0
245+setMaxHeaderLineLength :: Int -> ParseRequestBodyOptions -> ParseRequestBodyOptions
246+setMaxHeaderLineLength l p = p { prboMaxHeaderLineLength=Just l }
247+
248+-- | Do not limit the maximum header lines per mime/multipart entry.
249+--
250+-- @since 3.0.16.0
251+clearMaxHeaderLineLength :: ParseRequestBodyOptions -> ParseRequestBodyOptions
252+clearMaxHeaderLineLength p = p { prboMaxHeaderLineLength=Nothing }
253+
254+-- | A reasonable default set of parsing options.
255+-- Maximum key/filename length: 32 bytes;
256+-- maximum files: 10; filesize unlimited; maximum
257+-- size for parameters: 64kbytes; maximum number of header
258+-- lines: 32 bytes (applies only to headers of a mime/multipart message);
259+-- maximum header line length: Apache's default for that is 8190 bytes
260+-- (http://httpd.apache.org/docs/2.2/mod/core.html#limitrequestline)
261+-- so we're using that here as well.
262+--
263+-- @since 3.0.16.0
264+defaultParseRequestBodyOptions :: ParseRequestBodyOptions
265+defaultParseRequestBodyOptions = ParseRequestBodyOptions
266+ { prboKeyLength=Just 32
267+ , prboMaxNumFiles=Just 10
268+ , prboMaxFileSize=Nothing
269+ , prboMaxFilesSize=Nothing
270+ , prboMaxParmsSize=Just 65336
271+ , prboMaxHeaderLines=Just 32
272+ , prboMaxHeaderLineLength=Just 8190 }
273+
274+-- | Do not impose any memory limits.
275+--
276+-- @since 3.0.21.0
277+noLimitParseRequestBodyOptions :: ParseRequestBodyOptions
278+noLimitParseRequestBodyOptions = ParseRequestBodyOptions
279+ { prboKeyLength=Nothing
280+ , prboMaxNumFiles=Nothing
281+ , prboMaxFileSize=Nothing
282+ , prboMaxFilesSize=Nothing
283+ , prboMaxParmsSize=Nothing
284+ , prboMaxHeaderLines=Nothing
285+ , prboMaxHeaderLineLength=Nothing }
112286
113287-- | Information on an uploaded file.
114288data FileInfo c = FileInfo
@@ -124,17 +298,26 @@ type Param = (S.ByteString, S.ByteString)
124298-- | Post parameter name and associated file information.
125299type File y = (S.ByteString, FileInfo y)
126300
127−-- | A file uploading backend. Takes the parameter name, file name, and content
128−-- type, and returns a `Sink` for storing the contents.
301+-- | A file uploading backend. Takes the parameter name, file name, and a
302+-- stream of data.
129303type BackEnd a = S.ByteString -- ^ parameter name
130304 -> FileInfo ()
131− -> Sink S.ByteString (ResourceT IO) a
132−
133−data RequestBodyType = UrlEncoded | Multipart S.ByteString
134−
305+ -> IO S.ByteString
306+ -> IO a
307+
308+-- | The mimetype of the http body.
309+-- Depending on whether just parameters or parameters and files
310+-- are passed, one or the other mimetype should be used.
311+data RequestBodyType
312+ = -- | application/x-www-form-urlencoded (parameters only)
313+ UrlEncoded
314+ | -- | multipart/form-data (parameters and files)
315+ Multipart S.ByteString
316+
317+-- | Get the mimetype of the body of an http request.
135318getRequestBodyType :: Request -> Maybe RequestBodyType
136319getRequestBodyType req = do
137− ctype' <- lookup "Content-Type" $ requestHeaders req
320+ ctype' <- lookup hContentType $ requestHeaders req
138321 let (ctype, attrs) = parseContentType ctype'
139322 case ctype of
140323 "application/x-www-form-urlencoded" -> return UrlEncoded
@@ -144,7 +327,7 @@ getRequestBodyType req = do
144327-- | Parse a content type value, turning a single @ByteString@ into the actual
145328-- content type and a list of pairs of attributes.
146329--
147−-- Since 1.3.2
330+-- @since 1.3.2
148331parseContentType :: S.ByteString -> (S.ByteString, [(S.ByteString, S.ByteString)])
149332parseContentType a = do
150333 let (ctype, b) = S.break (== semicolon) a
@@ -154,6 +337,9 @@ parseContentType a = do
154337 semicolon = 59
155338 equals = 61
156339 space = 32
340+ dq s = if S.length s > 2 && S.head s == 34 && S.last s == 34 -- quote
341+ then S.tail $ S.init s
342+ else s
157343 goAttrs front bs
158344 | S.null bs = front []
159345 | otherwise =
@@ -162,81 +348,172 @@ parseContentType a = do
162348 goAttr bs =
163349 let (k, v') = S.break (== equals) bs
164350 v = S.drop 1 v'
165− in (strip k, strip v)
351+ in (strip k, dq $ strip v)
166352 strip = S.dropWhile (== space) . fst . S.breakEnd (/= space)
167353
354+-- | Parse the body of an HTTP request.
355+-- See parseRequestBodyEx for details.
356+-- Note: This function does not limit the memory it allocates.
357+-- When dealing with untrusted data (as is usually the case when
358+-- receiving input from the internet), it is recommended to
359+-- use the 'parseRequestBodyEx' function instead.
168360parseRequestBody :: BackEnd y
169361 -> Request
170− -> ResourceT IO ([Param], [File y])
171−parseRequestBody s r =
362+ -> IO ([Param], [File y])
363+parseRequestBody = parseRequestBodyEx noLimitParseRequestBodyOptions
364+
365+-- | Parse the body of an HTTP request, limit resource usage.
366+-- The HTTP body can contain both parameters and files.
367+-- This function will return a list of key,value pairs
368+-- for all parameters, and a list of key,a pairs
369+-- for filenames. The a depends on the used backend that
370+-- is responsible for storing the received files.
371+parseRequestBodyEx :: ParseRequestBodyOptions
372+ -> BackEnd y
373+ -> Request
374+ -> IO ([Param], [File y])
375+parseRequestBodyEx o s r =
172376 case getRequestBodyType r of
173377 Nothing -> return ([], [])
174− Just rbt -> fmap partitionEithers $ requestBody r $$ conduitRequestBody s rbt =$ CL.consume
378+ Just rbt -> sinkRequestBodyEx o s rbt (requestBody r)
175379
176380sinkRequestBody :: BackEnd y
177381 -> RequestBodyType
178− -> Sink S.ByteString (ResourceT IO) ([Param], [File y])
179−sinkRequestBody s r = fmap partitionEithers $ conduitRequestBody s r =$ CL.consume
382+ -> IO S.ByteString
383+ -> IO ([Param], [File y])
384+sinkRequestBody = sinkRequestBodyEx noLimitParseRequestBodyOptions
180385
181−conduitRequestBody :: BackEnd y
182− -> RequestBodyType
183− -> Conduit S.ByteString (ResourceT IO) (Either Param (File y))
184−conduitRequestBody _ UrlEncoded = do
386+-- |
387+--
388+-- @since 3.0.16.0
389+sinkRequestBodyEx :: ParseRequestBodyOptions
390+ -> BackEnd y
391+ -> RequestBodyType
392+ -> IO S.ByteString
393+ -> IO ([Param], [File y])
394+sinkRequestBodyEx o s r body = do
395+ ref <- newIORef ([], [])
396+ let add x = atomicModifyIORef ref $ \(y, z) ->
397+ case x of
398+ Left y' -> ((y':y, z), ())
399+ Right z' -> ((y, z':z), ())
400+ conduitRequestBodyEx o s r body add
401+ (\(a, b) -> (reverse a, reverse b)) <$> readIORef ref
402+
403+conduitRequestBodyEx :: ParseRequestBodyOptions
404+ -> BackEnd y
405+ -> RequestBodyType
406+ -> IO S.ByteString
407+ -> (Either Param (File y) -> IO ())
408+ -> IO ()
409+conduitRequestBodyEx o _ UrlEncoded rbody add = do
185410 -- NOTE: in general, url-encoded data will be in a single chunk.
186411 -- Therefore, I'm optimizing for the usual case by sticking with
187412 -- strict byte strings here.
188− bs <- CL.consume
189− mapM_ yield $ map Left $ H.parseSimpleQuery $ S.concat bs
190−conduitRequestBody backend (Multipart bound) =
191− parsePieces backend $ S8.pack "--" `S.append` bound
192−
193−#if MIN_VERSION_conduit(1, 0, 0)
194−takeLine :: Monad m => Consumer S.ByteString m (Maybe S.ByteString)
195−#else
196−takeLine :: Monad m => Pipe S.ByteString S.ByteString o u m (Maybe S.ByteString)
197−#endif
198−takeLine =
199− go id
413+ let loop size front = do
414+ bs <- rbody
415+ if S.null bs
416+ then return $ S.concat $ front []
417+ else do
418+ let newsize = size + S.length bs
419+ case prboMaxParmsSize o of
420+ Just maxSize -> when (newsize > maxSize) $
421+ error "Maximum size of parameters exceeded"
422+ Nothing -> return ()
423+ loop newsize $ front . (bs:)
424+ bs <- loop 0 id
425+ mapM_ (add . Left) $ H.parseSimpleQuery bs
426+conduitRequestBodyEx o backend (Multipart bound) rbody add =
427+ parsePiecesEx o backend (S8.pack "--" `S.append` bound) rbody add
428+
429+
430+-- | Take one header or subheader line.
431+-- Since: 3.0.26
432+-- Throw 431 if headers too large.
433+takeLine :: Maybe Int -> Source -> IO (Maybe S.ByteString)
434+takeLine maxlen src =
435+ go ""
200436 where
201− go front = await >>= maybe (close front) (push front)
202−
203− close front = leftover (front S.empty) >> return Nothing
437+ go front = do
438+ bs <- readSource src
439+ case maxlen of
440+ Just maxlen' -> when (S.length front > maxlen') $
441+ E.throwIO $ ConnectionError (UnknownErrorCode 431)
442+ "Request Header Fields Too Large"
443+ Nothing -> return ()
444+ if S.null bs
445+ then close front
446+ else push front bs
447+
448+ close front = leftover src front >> return Nothing
204449 push front bs = do
205− let (x, y) = S.break (== 10) $ front bs -- LF
450+ let (x, y) = S.break (== 10) bs -- LF
206451 in if S.null y
207− then go $ S.append x
452+ then go $ front `S.append` x
208453 else do
209− when (S.length y > 1) $ leftover $ S.drop 1 y
210− return $ Just $ killCR x
211−
212−#if MIN_VERSION_conduit(1, 0, 0)
213−takeLines :: Consumer S.ByteString (ResourceT IO) [S.ByteString]
214−#else
215−takeLines :: Pipe S.ByteString S.ByteString o u (ResourceT IO) [S.ByteString]
216−#endif
217−takeLines = do
218− res <- takeLine
454+ when (S.length y > 1) $ leftover src $ S.drop 1 y
455+ let res = front `S.append` x
456+ case maxlen of
457+ Just maxlen' -> when (S.length res > maxlen') $
458+ E.throwIO $ ConnectionError (UnknownErrorCode 431)
459+ "Request Header Fields Too Large"
460+ Nothing -> return ()
461+ return $ Just $ killCR $ res
462+
463+takeLines' :: Maybe Int -> Maybe Int -> Source -> IO [S.ByteString]
464+takeLines' lineLength maxLines source =
465+ reverse <$> takeLines'' [] lineLength maxLines source
466+
467+takeLines''
468+ :: [S.ByteString]
469+ -> Maybe Int
470+ -> Maybe Int
471+ -> Source
472+ -> IO [S.ByteString]
473+takeLines'' lines lineLength maxLines src = do
474+ case maxLines of
475+ Just maxLines' ->
476+ when (length lines > maxLines') $
477+ error "Too many lines in mime/multipart header"
478+ Nothing -> return ()
479+ res <- takeLine lineLength src
219480 case res of
220− Nothing -> return []
481+ Nothing -> return lines
221482 Just l
222− | S.null l -> return []
223− | otherwise -> do
224− ls <- takeLines
225− return $ l : ls
226−
227−parsePieces :: BackEnd y
228− -> S.ByteString
229−#if MIN_VERSION_conduit(1, 0, 0)
230− -> ConduitM S.ByteString (Either Param (File y)) (ResourceT IO) ()
231−#else
232− -> Pipe S.ByteString S.ByteString (Either Param (File y)) u (ResourceT IO) ()
233−#endif
234−parsePieces sink bound =
235− loop
483+ | S.null l -> return lines
484+ | otherwise -> takeLines'' (l:lines) lineLength maxLines src
485+
486+data Source = Source (IO S.ByteString) (IORef S.ByteString)
487+
488+mkSource :: IO S.ByteString -> IO Source
489+mkSource f = do
490+ ref <- newIORef S.empty
491+ return $ Source f ref
492+
493+readSource :: Source -> IO S.ByteString
494+readSource (Source f ref) = do
495+ bs <- atomicModifyIORef ref $ \bs -> (S.empty, bs)
496+ if S.null bs
497+ then f
498+ else return bs
499+
500+leftover :: Source -> S.ByteString -> IO ()
501+leftover (Source _ ref) bs = writeIORef ref bs
502+
503+parsePiecesEx :: ParseRequestBodyOptions
504+ -> BackEnd y
505+ -> S.ByteString
506+ -> IO S.ByteString
507+ -> (Either Param (File y) -> IO ())
508+ -> IO ()
509+parsePiecesEx o sink bound rbody add =
510+ mkSource rbody >>= loop 0 0 0 0
236511 where
237− loop = do
238− _boundLine <- takeLine
239− res' <- takeLines
512+ loop :: Int -> Int -> Int -> Int64 -> Source -> IO ()
513+ loop numParms numFiles parmSize filesSize src = do
514+ _boundLine <- takeLine (prboMaxHeaderLineLength o) src
515+ res' <- takeLines' (prboMaxHeaderLineLength o)
516+ (prboMaxHeaderLines o) src
240517 unless (null res') $ do
241518 let ls' = map parsePair res'
242519 let x = do
@@ -247,31 +524,57 @@ parsePieces sink bound =
247524 return (ct, name, lookup "filename" attrs)
248525 case x of
249526 Just (mct, name, Just filename) -> do
527+ case prboKeyLength o of
528+ Just maxKeyLength ->
529+ when (S.length name > maxKeyLength) $
530+ error "Filename is too long"
531+ Nothing -> return ()
532+ case prboMaxNumFiles o of
533+ Just maxFiles -> when (numFiles >= maxFiles) $
534+ error "Maximum number of files exceeded"
535+ Nothing -> return ()
250536 let ct = fromMaybe "application/octet-stream" mct
251537 fi0 = FileInfo filename ct ()
252− (wasFound, y) <- sinkTillBound' bound name fi0 sink
253− yield $ Right (name, fi0 { fileContent = y })
254− when wasFound loop
538+ fs = catMaybes [ prboMaxFileSize o
539+ , subtract filesSize <$> prboMaxFilesSize o ]
540+ mfs = if fs == [] then Nothing else Just $ minimum fs
541+ ((wasFound, fileSize), y) <- sinkTillBound' bound name fi0 sink src mfs
542+ let newFilesSize = filesSize + fileSize
543+ add $ Right (name, fi0 { fileContent = y })
544+ when wasFound $ loop numParms (numFiles + 1) parmSize newFilesSize src
255545 Just (_ct, name, Nothing) -> do
546+ case prboKeyLength o of
547+ Just maxKeyLength ->
548+ when (S.length name > maxKeyLength) $
549+ error "Parameter name is too long"
550+ Nothing -> return ()
256551 let seed = id
257552 let iter front bs = return $ front . (:) bs
258− (wasFound, front) <- sinkTillBound bound iter seed
553+ ((wasFound, _fileSize), front) <- sinkTillBound bound iter seed src
554+ (fromIntegral <$> prboMaxParmsSize o)
259555 let bs = S.concat $ front []
260556 let x' = (name, bs)
261− yield $ Left x'
262− when wasFound loop
557+ let newParmSize = parmSize + S.length name + S.length bs
558+ case prboMaxParmsSize o of
559+ Just maxParmSize -> when (newParmSize > maxParmSize) $
560+ error "Maximum size of parameters exceeded"
561+ Nothing -> return ()
562+ add $ Left x'
563+ when wasFound $ loop (numParms + 1) numFiles
564+ newParmSize filesSize src
263565 _ -> do
264566 -- ignore this part
265567 let seed = ()
266568 iter () _ = return ()
267− (wasFound, ()) <- sinkTillBound bound iter seed
268− when wasFound loop
569+ ((wasFound, _fileSize), ()) <- sinkTillBound bound iter seed src Nothing
570+ when wasFound $ loop numParms numFiles parmSize filesSize src
269571 where
270− contDisp = S8.pack "Content-Disposition"
271− contType = S8.pack "Content-Type"
572+ contDisp = mk $ S8.pack "Content-Disposition"
573+ contType = mk $ S8.pack "Content-Type"
272574 parsePair s =
273575 let (x, y) = breakDiscard 58 s -- colon
274− in (x, S.dropWhile (== 32) y) -- space
576+ in (mk $ x, S.dropWhile (== 32) y) -- space
577+
275578
276579data Bound = FoundBound S.ByteString S.ByteString
277580 | NoBound
@@ -279,7 +582,7 @@ data Bound = FoundBound S.ByteString S.ByteString
279582 deriving (Eq, Show)
280583
281584findBound :: S.ByteString -> S.ByteString -> Bound
282−findBound b bs = handleBreak $ Search.breakOn b bs
585+findBound b bs = handleBreak $ S.breakSubstring b bs
283586 where
284587 handleBreak (h, t)
285588 | S.null t = go [lowBound..S.length bs - 1]
@@ -305,90 +608,90 @@ sinkTillBound' :: S.ByteString
305608 -> S.ByteString
306609 -> FileInfo ()
307610 -> BackEnd y
308−#if MIN_VERSION_conduit(1, 0, 0)
309− -> ConduitM S.ByteString o (ResourceT IO) (Bool, y)
310−#else
311− -> Pipe S.ByteString S.ByteString o u (ResourceT IO) (Bool, y)
312−#endif
313−sinkTillBound' bound name fi sink =
314−#if MIN_VERSION_conduit(1, 0, 0)
315− ConduitM $ anyOutput $
316−#endif
317− conduitTillBound bound >+> withUpstream (fix $ sink name fi)
611+ -> Source
612+ -> Maybe Int64
613+ -> IO ((Bool, Int64), y)
614+sinkTillBound' bound name fi sink src max' = do
615+ (next, final) <- wrapTillBound bound src max'
616+ y <- sink name fi next
617+ b <- final
618+ return (b, y)
619+
620+data WTB = WTBWorking (S.ByteString -> S.ByteString)
621+ | WTBDone Bool
622+wrapTillBound :: S.ByteString -- ^ bound
623+ -> Source
624+ -> Maybe Int64
625+ -> IO (IO S.ByteString, IO (Bool, Int64)) -- ^ Bool indicates if the bound was found
626+wrapTillBound bound src max' = do
627+ ref <- newIORef $ WTBWorking id
628+ sref <- newIORef (0 :: Int64)
629+ return (go ref sref, final ref sref)
318630 where
319−#if MIN_VERSION_conduit(1, 0, 0)
320− fix :: Sink S8.ByteString (ResourceT IO) y -> Pipe Void S8.ByteString Void Bool (ResourceT IO) y
321− fix (ConduitM p) = ignoreTerm >+> injectLeftovers p
322− ignoreTerm = await' >>= maybe (return ()) (\x -> yield' x >> ignoreTerm)
323− await' = NeedInput (return . Just) (const $ return Nothing)
324− yield' = HaveOutput (return ()) (return ())
325−
326− anyOutput p = p >+> dropInput
327− dropInput = NeedInput (const dropInput) return
328−#else
329− fix = sinkToPipe
330−#endif
331−
332−conduitTillBound :: Monad m
333− => S.ByteString -- bound
334−#if MIN_VERSION_conduit(1, 0, 0)
335− -> Pipe S.ByteString S.ByteString S.ByteString () m Bool
336−#else
337− -> Pipe S.ByteString S.ByteString S.ByteString u m Bool
338−#endif
339−conduitTillBound bound =
340−#if MIN_VERSION_conduit(1, 0, 0)
341− unConduitM $
342−#endif
343− go id
344− where
345− go front = await >>= maybe (close front) (push front)
346− close front = do
347− let bs = front S.empty
348− unless (S.null bs) $ yield bs
349− return False
350− push front bs' = do
351− let bs = front bs'
352− case findBound bound bs of
353− FoundBound before after -> do
354− let before' = killCRLF before
355− yield before'
356− leftover after
357− return True
358− NoBound -> do
359− -- don't emit newlines, in case it's part of a bound
360− let (toEmit, front') =
361− if not (S8.null bs) && S8.last bs `elem` "\r\n"
362− then let (x, y) = S.splitAt (S.length bs - 2) bs
363− in (x, S.append y)
364− else (bs, id)
365− yield toEmit
366− go front'
367− PartialBound -> go $ S.append bs
631+ final ref sref = do
632+ x <- readIORef ref
633+ case x of
634+ WTBWorking _ -> error "wrapTillBound did not finish"
635+ WTBDone y -> do
636+ siz <- readIORef sref
637+ return (y, siz)
638+
639+ go ref sref = do
640+ state <- readIORef ref
641+ case state of
642+ WTBDone _ -> return S.empty
643+ WTBWorking front -> do
644+ bs <- readSource src
645+ cur <- atomicModifyIORef' sref $ \ cur ->
646+ let new = cur + fromIntegral (S.length bs) in (new, new)
647+ case max' of
648+ Just max'' | cur > max'' ->
649+ E.throwIO $ ConnectionError (UnknownErrorCode 413) "Payload Too Large"
650+ _ -> return ()
651+ if S.null bs
652+ then do
653+ writeIORef ref $ WTBDone False
654+ return $ front bs
655+ else push $ front bs
656+ where
657+ push bs = do
658+ case findBound bound bs of
659+ FoundBound before after -> do
660+ let before' = killCRLF before
661+ leftover src after
662+ writeIORef ref $ WTBDone True
663+ return before'
664+ NoBound -> do
665+ -- don't emit newlines, in case it's part of a bound
666+ let (toEmit, front') =
667+ if not (S8.null bs) && S8.last bs `elem` ['\r','\n']
668+ then let (x, y) = S.splitAt (S.length bs - 2) bs
669+ in (x, S.append y)
670+ else (bs, id)
671+ writeIORef ref $ WTBWorking front'
672+ if S.null toEmit
673+ then go ref sref
674+ else return toEmit
675+ PartialBound -> do
676+ writeIORef ref $ WTBWorking $ S.append bs
677+ go ref sref
368678
369679sinkTillBound :: S.ByteString
370680 -> (x -> S.ByteString -> IO x)
371681 -> x
372−#if MIN_VERSION_conduit(1, 0, 0)
373− -> Consumer S.ByteString (ResourceT IO) (Bool, x)
374−#else
375− -> Pipe S.ByteString S.ByteString o u (ResourceT IO) (Bool, x)
376−#endif
377−sinkTillBound bound iter seed0 =
378−#if MIN_VERSION_conduit(1, 0, 0)
379− ConduitM $
380−#endif
381− (conduitTillBound bound >+> (withUpstream $ ij $ CL.foldM iter' seed0))
382− where
383− iter' a b = liftIO $ iter a b
384−#if MIN_VERSION_conduit(1, 0, 0)
385− ij (ConduitM p) = ignoreTerm >+> injectLeftovers p
386− ignoreTerm = await' >>= maybe (return ()) (\x -> yield' x >> ignoreTerm)
387− await' = NeedInput (return . Just) (const $ return Nothing)
388− yield' = HaveOutput (return ()) (return ())
389−#else
390− ij = id
391−#endif
682+ -> Source
683+ -> Maybe Int64
684+ -> IO ((Bool, Int64), x)
685+sinkTillBound bound iter seed0 src max' = do
686+ (next, final) <- wrapTillBound bound src max'
687+ let loop seed = do
688+ bs <- next
689+ if S.null bs
690+ then return seed
691+ else iter seed bs >>= loop
692+ seed <- loop seed0
693+ b <- final
694+ return (b, seed)
392695
393696parseAttrs :: S.ByteString -> [(S.ByteString, S.ByteString)]
394697parseAttrs = map go . S.split 59 -- semicolon