twin/xmonad-contrib
1
0
Fork 0
mirror of https://github.com/xmonad/xmonad-contrib.git synced 2025-08-06 06:51:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pipe password to xdotool via undocumented --file to prevent snatch

Browse Source 
from `ps`, and also some backwards compatibility.
This commit is contained in:
Nick Hu
2017-06-30 14:53:15 +01:00
parent cee5aa2a58
commit 8daa84375b
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
XMonad/Prompt/Pass.hs
View File

@@ -74,7 +74,7 @@ import XMonad.Util.Run (runProcessWithInput)
type Predicate = String -> String -> Bool type Predicate = String -> String -> Bool
getPassCompl :: [String] -> Predicate -> String -> IO [String] getPassCompl :: [String] -> Predicate -> String -> IO [String]
getPassCompl compls p s = pure $ filter (p s) compls getPassCompl compls p s = return $ filter (p s) compls
type PromptLabel = String type PromptLabel = String
@@ -97,8 +97,8 @@ passwordStoreFolderDefault home = combine home ".password-store"
passwordStoreFolder :: IO String passwordStoreFolder :: IO String
passwordStoreFolder = passwordStoreFolder =
getEnv "PASSWORD_STORE_DIR" >>= computePasswordStoreDir getEnv "PASSWORD_STORE_DIR" >>= computePasswordStoreDir
where computePasswordStoreDir Nothing = passwordStoreFolderDefault <$> getHomeDirectory where computePasswordStoreDir Nothing = fmap passwordStoreFolderDefault getHomeDirectory
computePasswordStoreDir (Just storeDir) = pure storeDir computePasswordStoreDir (Just storeDir) = return storeDir
-- | A pass prompt factory -- | A pass prompt factory
-- --
@@ -150,13 +150,14 @@ removePassword passLabel = spawn $ "pass rm --force \"" ++ escapeQuote passLabel
-- | Type a password stored for a given entry using xdotool. -- | Type a password stored for a given entry using xdotool.
-- --
typePassword :: String -> X () typePassword :: String -> X ()
typePassword passLabel = spawn $ "xdotool type --clearmodifiers $(pass \"" ++ escapeQuote passLabel ++ "\"|head -n1)" typePassword passLabel = spawn $ "pass \"" ++ escapeQuote passLabel
++ "\"|head -n1|tr -d '\n'|xdotool type --clearmodifiers --file -"
escapeQuote :: String -> String escapeQuote :: String -> String
escapeQuote = concatMap escape escapeQuote = concatMap escape
where escape :: Char -> String where escape :: Char -> String
escape '"' = ['\\', '\"'] escape '"' = ['\\', '\"']
escape x = pure x escape x = return x
-- | Retrieve the list of passwords from the password store 'passwordStoreDir -- | Retrieve the list of passwords from the password store 'passwordStoreDir
getPasswords :: FilePath -> IO [String] getPasswords :: FilePath -> IO [String]
@@ -166,7 +167,7 @@ getPasswords passwordStoreDir = do
"-type", "f", "-type", "f",
"-name", "*.gpg", "-name", "*.gpg",
"-printf", "%P\n"] [] "-printf", "%P\n"] []
pure . map removeGpgExtension $ lines files return . map removeGpgExtension $ lines files
removeGpgExtension :: String -> String removeGpgExtension :: String -> String
removeGpgExtension file | takeExtension file == ".gpg" = dropExtension file removeGpgExtension file | takeExtension file == ".gpg" = dropExtension file