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

display any illegal character found in ssh comment

Browse source
This commit is contained in:
Joey Hess 2013-06-10 23:54:28 -04:00
parent c46b263fde
commit 768f7c87f2
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Assistant/Ssh.hs
View file

@ -82,9 +82,10 @@ validateSshPubKey pubkey = either error return $ check $ words pubkey
where where
(ssh, keytype) = separate (== '-') prefix (ssh, keytype) = separate (== '-') prefix
checkcomment comment checkcomment comment = case filter (not . safeincomment) comment of
| all (\c -> isAlphaNum c || c == '@' || c == '-' || c == '_' || c == '.') comment = ok [] -> ok
| otherwise = err "bad comment in ssh public key" badstuff -> err $ "bad comment in ssh public key (contains: \"" ++ badstuff ++ "\")"
safeincomment c = isAlphaNum c || c == '@' || c == '-' || c == '_' || c == '.'
addAuthorizedKeys :: Bool -> FilePath -> SshPubKey -> IO Bool addAuthorizedKeys :: Bool -> FilePath -> SshPubKey -> IO Bool
addAuthorizedKeys rsynconly dir pubkey = boolSystem "sh" addAuthorizedKeys rsynconly dir pubkey = boolSystem "sh"