check if password is locked for idempotency sake

1 files changed, 8 insertions, 1 deletions

diff --git a/Property/User.hs b/Property/User.hs
index 47d6fb5b..3cd74964 100644
--- a/Property/User.hs
+++ b/Property/User.hs
@@ -7,6 +7,7 @@ import Data.Maybe
 import Property
 import Utility.SafeCommand
 import Utility.Exception
+import Utility.Process
 
 type UserName = String
 
@@ -25,10 +26,16 @@ nuked user = check (isJust <$> homedir user) $ cmdProperty "userdel"
 	]
 
 lockedPassword :: UserName -> Property
-lockedPassword user = cmdProperty "passwd"
+lockedPassword user = check (not <$> isLockedPassword user) $ cmdProperty "passwd"
 	[ Param "--lock"
 	, Param user
 	]
 
+isLockedPassword :: UserName -> IO Bool
+isLockedPassword user = parse . words <$> readProcess "passwd" ["-S", user]
+  where
+	parse (_:"L":_) = True
+	parse _ = False
+
 homedir :: UserName -> IO (Maybe FilePath)
 homedir user = catchMaybeIO $ homeDirectory <$> getUserEntryForName user