Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions libs/types-common/src/Data/Misc.hs
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ module Data.Misc
fromPlainTextPassword,
plainTextPassword8Unsafe,
plainTextPassword6Unsafe,
toPlainTextPassword8,

-- * Typesafe FUTUREWORKS
FutureWork (..),
Expand Down Expand Up @@ -531,6 +532,9 @@ plainTextPassword8Unsafe = PlainTextPassword' . unsafeRange
fromPlainTextPassword :: PlainTextPassword' t -> Text
fromPlainTextPassword = fromRange . fromPlainTextPassword'

toPlainTextPassword8 :: PlainTextPassword6 -> Maybe PlainTextPassword8
toPlainTextPassword8 = fmap PlainTextPassword' . checked . fromPlainTextPassword

newtype PlainTextPassword' (minLen :: Nat) = PlainTextPassword'
{fromPlainTextPassword' :: Range minLen (1024 :: Nat) Text}
deriving stock (Eq, Generic)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ module Wire.AuthenticationSubsystem.Interpreter
)
where

import Control.Lens
import Data.ByteString.Conversion
import Data.Code qualified as Code
import Data.Default
Expand Down Expand Up @@ -400,7 +401,10 @@ verifyUserPasswordImpl uid plaintext = do
password <-
UserStore.lookupHashedPassword uid
>>= maybe (throw AuthenticationSubsystemBadCredentials) pure
verifyPasswordWithStatus (RateLimitUser uid) plaintext password
verifiedPassword <- verifyPasswordWithStatus (RateLimitUser uid) plaintext password
case toPlainTextPassword8 plaintext of
Just {} -> pure $ verifiedPassword & _2 .~ PasswordStatusNeedsUpdate
Nothing -> pure verifiedPassword

verifyUserPasswordErrorImpl ::
( Member (Error AuthenticationSubsystemError) r,
Expand Down