jlamothe/passman
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

made validatePWPolicy return Bool

This commit is contained in:
Jonathan Lamothe 2018-12-13 11:15:26 -05:00
parent 3a92469554
commit 36e2ac9883
2 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/Password.hs
View File

@ -69,13 +69,10 @@ newPWPolicy = PWPolicy 16 0 0 0 (Just 0)
validatePWPolicy
:: PWPolicy
-- ^ the policy being validated
-> Maybe PWPolicy
-- ^ the policy if it is valid, or @"Nothing"@ if it is not
validatePWPolicy x = if needed <= x^.pwLength
then Just x
else Nothing
where
needed = x^.pwUpper + x^.pwLower + x^.pwDigits + special
special = fromMaybe 0 $ x^.pwSpecial
-> Bool
-- ^ indicates whether or not the policy is valid
validatePWPolicy x = needed <= x^.pwLength where
needed = x^.pwUpper + x^.pwLower + x^.pwDigits + special
special = fromMaybe 0 $ x^.pwSpecial
--jl

4
test/Spec/ValidatePWPolicy.hs
View File

@ -40,8 +40,8 @@ tests = TestLabel "validatePWPolicy" $ TestList $ map test'
, ( "short invalid", shortInvalid, False )
]
test' (label, f, valid) = TestLabel label $
validatePWPolicy x ~?= if valid then Just x else Nothing where
test' (label, f, expect) = TestLabel label $
validatePWPolicy x ~?= expect where
x = f newPWPolicy
validMins = setAll 1