Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LTS 14.2 (GHC 8.6.5) #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

LTS 14.2 (GHC 8.6.5) #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
484eb08
Bump upper boundaries, replace ServantErr with ServerError
swamp-agr Nov 5, 2019
712033d
Add FromHttpApiData instance for EncryptedSession
swamp-agr Nov 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions servant-auth-cookie.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,19 +47,20 @@ library

build-depends: base >= 4.7 && < 5.0
, base64-bytestring
, blaze-builder >= 0.4 && < 0.4.1
, blaze-builder >= 0.4 && < 0.6
, bytestring
, cereal >= 0.5 && < 0.6
, cereal-time >= 0.1 && < 0.2
, cookie >= 0.4.1 && < 0.5
, cryptonite >= 0.14 && < 0.25
, cryptonite >= 0.14 && < 0.26
, data-default
, exceptions >= 0.8 && < 0.9
, http-types >= 0.9 && < 0.12
, http-api-data >=0.3.0 && < 0.5
, exceptions >= 0.8 && < 0.11
, http-types >= 0.9 && < 0.13
, memory >= 0.11 && < 0.15
, mtl >= 2.0 && < 3.0
, servant >= 0.5 && < 0.13
, servant-server >= 0.5 && < 0.13
, servant >= 0.5 && < 0.17
, servant-server >= 0.5 && < 0.17
, tagged == 0.8.*
, text
, time >= 1.6 && < 1.8.1
Expand All @@ -76,12 +77,12 @@ library
if flag(servant9)
build-depends:
servant >= 0.9,
http-api-data == 0.3.*
http-api-data < 0.5
else
if flag(servant91)
build-depends:
servant >= 0.9,
http-api-data == 0.3.*
http-api-data < 0.5
else
build-depends:
servant < 0.9,
Expand Down
137 changes: 72 additions & 65 deletions src/Servant/Server/Experimental/Auth/Cookie.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@
paper \"A Secure Cookie Protocol\" by Alex Liu et al.
-}

{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE TypeFamilies #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE CPP #-}
{-# LANGUAGE DataKinds #-}
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE FlexibleContexts #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GADTs #-}
{-# LANGUAGE KindSignatures #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE RecordWildCards #-}
{-# LANGUAGE ScopedTypeVariables #-}
{-# LANGUAGE TupleSections #-}
{-# LANGUAGE TypeFamilies #-}


module Servant.Server.Experimental.Auth.Cookie
Expand Down Expand Up @@ -108,67 +108,71 @@ module Servant.Server.Experimental.Auth.Cookie
, applyCipherAlgorithm
) where

import Blaze.ByteString.Builder (toByteString)
import Control.Arrow ((&&&), first)
import Control.Monad
import Control.Monad.Catch (MonadThrow (..), Exception)
import Control.Monad.Except
import Crypto.Cipher.AES (AES256)
import Crypto.Cipher.Types
import Crypto.Error
import Crypto.Hash (HashAlgorithm(..))
import Crypto.Hash.Algorithms (SHA256)
import Crypto.MAC.HMAC (HMAC)
import Crypto.Random (DRG(..), drgNew)
import Data.ByteString (ByteString)
import Data.Default
import Data.IORef
import Data.List (partition)
import Data.Maybe (listToMaybe)
import Data.Monoid ((<>))
import Data.Proxy
import Data.Serialize (Serialize(..))
import Data.Tagged (Tagged (..), retag)
import Data.Time
import Data.Time.Clock.Serialize ()
import Data.Typeable
import GHC.Generics (Generic)
import GHC.TypeLits (Symbol)
import Network.HTTP.Types (hCookie, HeaderName, RequestHeaders, ResponseHeaders)
import Network.Wai (Request, requestHeaders)
import Servant (addHeader, ServantErr (..))
import Servant.API.Experimental.Auth (AuthProtect)
import Servant.API.ResponseHeaders (AddHeader)
import Servant.Server (err403)
import Servant.Server.Experimental.Auth
import Web.Cookie
import qualified Crypto.MAC.HMAC as H
import qualified Data.ByteArray as BA
import qualified Data.ByteString as BS
import qualified Data.ByteString.Base64 as Base64
import qualified Data.ByteString.Char8 as BSC8
import qualified Data.Serialize as Serialize (encode, decode)
import qualified Network.HTTP.Types as N(Header)
import Blaze.ByteString.Builder (toByteString)
import Control.Arrow (first, (&&&))
import Control.Monad
import Control.Monad.Catch (Exception, MonadThrow (..))
import Control.Monad.Except
import Crypto.Cipher.AES (AES256)
import Crypto.Cipher.Types
import Crypto.Error
import Crypto.Hash (HashAlgorithm (..))
import Crypto.Hash.Algorithms (SHA256)
import Crypto.MAC.HMAC (HMAC)
import qualified Crypto.MAC.HMAC as H
import Crypto.Random (DRG (..), drgNew)
import qualified Data.ByteArray as BA
import Data.ByteString (ByteString)
import qualified Data.ByteString as BS
import qualified Data.ByteString.Base64 as Base64
import qualified Data.ByteString.Char8 as BSC8
import Data.Coerce (coerce)
import Data.Default
import Data.IORef
import Data.List (partition)
import Data.Maybe (listToMaybe)
import Data.Monoid ((<>))
import Data.Proxy
import Data.Serialize (Serialize (..))
import qualified Data.Serialize as Serialize (decode, encode)
import Data.Tagged (Tagged (..), retag)
import Data.Time
import Data.Time.Clock.Serialize ()
import Data.Typeable
import GHC.Generics (Generic)
import GHC.TypeLits (Symbol)
import Network.HTTP.Types (HeaderName, RequestHeaders,
ResponseHeaders, hCookie)
import qualified Network.HTTP.Types as N (Header)
import Network.Wai (Request, requestHeaders)
import Servant (addHeader)
import Servant.API.Experimental.Auth (AuthProtect)
import Servant.API.ResponseHeaders (AddHeader)
import Servant.Server (ServerError (..), err403)
import Servant.Server.Experimental.Auth
import Web.Cookie
import Web.HttpApiData

#if !MIN_VERSION_base(4,8,0)
import Control.Applicative
import Control.Applicative
#endif

#if MIN_VERSION_servant(0,9,0)
import Servant (ToHttpApiData (..))
import Data.Text (Text)
import Data.Text (Text)
import Data.Text.Encoding (encodeUtf8)
import Servant (ToHttpApiData (..))
#else
import Data.ByteString.Conversion (ToByteString (..))
import Data.ByteString.Conversion (ToByteString (..))
#endif

#if MIN_VERSION_servant(0,9,1)
import Servant (noHeader)
import Servant.API.ResponseHeaders (Headers)
import qualified Servant.API.Header as S(Header)
import Servant (noHeader)
import qualified Servant.API.Header as S (Header)
import Servant.API.ResponseHeaders (Headers)
#endif

#if MIN_VERSION_http_types(0,10,0)
import Network.HTTP.Types.Header (hSetCookie)
import Network.HTTP.Types.Header (hSetCookie)
#endif

#if MIN_VERSION_http_types(0,10,0)
Expand Down Expand Up @@ -251,6 +255,9 @@ instance Serialize Cookie where
newtype EncryptedSession = EncryptedSession ByteString
deriving (Eq, Show, Typeable)

instance FromHttpApiData EncryptedSession where
parseUrlPiece = pure . coerce . encodeUtf8

-- | An empty 'EncryptedSession'
emptyEncryptedSession :: EncryptedSession
emptyEncryptedSession = EncryptedSession ""
Expand Down Expand Up @@ -622,14 +629,14 @@ removeSession acs response =

-- | Add cookie session to error allowing to set cookie even if response is
-- not 200.
addSessionToErr :: AddSession ServantErr ServantErr
addSessionToErr :: AddSession ServerError ServerError
addSessionToErr acs rs sk pwSettings pwSession err = do
header <- renderSession acs rs sk pwSettings pwSession ()
return err { errHeaders = (hSetCookie, header) : errHeaders err }

-- | "Remove" a session by invalidating the cookie.
-- Cookie expiry date is set at 0 and content is wiped
removeSessionFromErr :: RemoveSession ServantErr ServantErr
removeSessionFromErr :: RemoveSession ServerError ServerError
removeSessionFromErr acs err =
return $ err { errHeaders = (hSetCookie, renderExpiredSession acs) : errHeaders err }

Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-8.9
resolver: lts-14.2
packages:
- '.'
extra-deps:
Expand Down