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

disable hostname validation and canonicalization on android

Browse source
This commit is contained in:
Joey Hess 2013-05-04 14:25:30 -04:00
commit d994f35937
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Assistant/WebApp/Configurators/Ssh.hs
View file

@ -6,6 +6,7 @@
-} -}
{-# LANGUAGE TypeFamilies, QuasiQuotes, MultiParamTypeClasses, TemplateHaskell, OverloadedStrings, RankNTypes #-} {-# LANGUAGE TypeFamilies, QuasiQuotes, MultiParamTypeClasses, TemplateHaskell, OverloadedStrings, RankNTypes #-}
{-# LANGUAGE CPP #-}
module Assistant.WebApp.Configurators.Ssh where module Assistant.WebApp.Configurators.Ssh where
@ -66,7 +67,9 @@ sshInputAForm hostnamefield def = SshInput
where where
check_hostname = checkM (liftIO . checkdns) hostnamefield check_hostname = checkM (liftIO . checkdns) hostnamefield
checkdns t = do checkdns t = do
#ifndef __ANDROID__
let h = T.unpack t let h = T.unpack t
let canonname = Just $ defaultHints { addrFlags = [AI_CANONNAME] }
r <- catchMaybeIO $ getAddrInfo canonname (Just h) Nothing r <- catchMaybeIO $ getAddrInfo canonname (Just h) Nothing
return $ case catMaybes . map addrCanonName <$> r of return $ case catMaybes . map addrCanonName <$> r of
-- canonicalize input hostname if it had no dot -- canonicalize input hostname if it had no dot
@ -75,7 +78,10 @@ sshInputAForm hostnamefield def = SshInput
| otherwise -> Right $ T.pack fullname | otherwise -> Right $ T.pack fullname
Just [] -> Right t Just [] -> Right t
Nothing -> Left bad_hostname Nothing -> Left bad_hostname
canonname = Just $ defaultHints { addrFlags = [AI_CANONNAME] } #else
-- getAddrInfo currently broken on Android
return $ Right t
#endif
check_username = checkBool (all (`notElem` "/:@ \t") . T.unpack) check_username = checkBool (all (`notElem` "/:@ \t") . T.unpack)
bad_username textField bad_username textField