mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

webapp: Avoid crashing when ssh-keygen -F chokes on an invalid known_hosts file.

Browse source
This commit is contained in:
Joey Hess 2012-09-27 11:27:16 -04:00
parent 6d7c8338f9
commit 7f78bc92b6
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Assistant/Ssh.hs
View file

@ -223,6 +223,10 @@ knownHost :: Text -> IO Bool
knownHost hostname = do
sshdir <- sshDir
ifM (doesFileExist $ sshdir </> "known_hosts")
( not . null <$> readProcess "ssh-keygen" ["-F", T.unpack hostname]
( not . null <$> checkhost
, return False
)
where
{- ssh-keygen -F can crash on some old known_hosts file -}
checkhost = catchDefaultIO "" $
readProcess "ssh-keygen" ["-F", T.unpack hostname]