diff options
| -rw-r--r-- | Assistant/Pairing.hs | 9 | ||||
| -rw-r--r-- | Assistant/Threads/PairListener.hs | 21 | ||||
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | doc/bugs/local_pair_fails_if_non-ascii_characters_present_on_annex_path.mdwn | 2 |
4 files changed, 18 insertions, 15 deletions
diff --git a/Assistant/Pairing.hs b/Assistant/Pairing.hs index 492b98592..b24e5fdb6 100644 --- a/Assistant/Pairing.hs +++ b/Assistant/Pairing.hs @@ -58,6 +58,15 @@ data PairData = PairData } deriving (Eq, Read, Show) +checkSane :: PairData -> Bool +checkSane p = all (not . any isControl) + [ fromMaybe "" (remoteHostName p) + , remoteUserName p + , remoteDirectory p + , remoteSshPubKey p + , fromUUID (pairUUID p) + ] + type UserName = String {- A pairing that is in progress has a secret, a thread that is diff --git a/Assistant/Threads/PairListener.hs b/Assistant/Threads/PairListener.hs index a02b8b91a..e4f87494c 100644 --- a/Assistant/Threads/PairListener.hs +++ b/Assistant/Threads/PairListener.hs @@ -16,13 +16,11 @@ import Assistant.WebApp.Types import Assistant.Alert import Assistant.DaemonStatus import Utility.ThreadScheduler -import Utility.Format import Git import Network.Multicast import Network.Socket import qualified Data.Text as T -import Data.Char pairListenerThread :: UrlRenderer -> NamedThread pairListenerThread urlrenderer = namedThread "PairListener" $ do @@ -39,16 +37,18 @@ pairListenerThread urlrenderer = namedThread "PairListener" $ do Nothing -> go reqs cache sock Just m -> do debug ["received", show msg] - sane <- checkSane msg (pip, verified) <- verificationCheck m =<< (pairingInProgress <$> getDaemonStatus) let wrongstage = maybe False (\p -> pairMsgStage m <= inProgressPairStage p) pip let fromus = maybe False (\p -> remoteSshPubKey (pairMsgData m) == remoteSshPubKey (inProgressPairData p)) pip - case (wrongstage, fromus, sane, pairMsgStage m) of + case (wrongstage, fromus, checkSane (pairMsgData m), pairMsgStage m) of (_, True, _, _) -> do debug ["ignoring message that looped back"] go reqs cache sock - (_, _, False, _) -> go reqs cache sock + (_, _, False, _) -> do + liftAnnex $ warning + "illegal control characters in pairing message; ignoring" + go reqs cache sock -- PairReq starts a pairing process, so a -- new one is always heeded, even if -- some other pairing is in process. @@ -83,19 +83,10 @@ pairListenerThread urlrenderer = namedThread "PairListener" $ do "detected possible pairing brute force attempt; disabled pairing" stopSending pip return (Nothing, False) - |otherwise = return (Just pip, verified && sameuuid) + | otherwise = return (Just pip, verified && sameuuid) where verified = verifiedPairMsg m pip sameuuid = pairUUID (inProgressPairData pip) == pairUUID (pairMsgData m) - - checkSane msg - {- Control characters could be used in a - - console poisoning attack. -} - | any isControl (filter (/= '\n') (decode_c msg)) = do - liftAnnex $ warning - "illegal control characters in pairing message; ignoring" - return False - | otherwise = return True {- PairReqs invalidate the cache of recently finished pairings. - This is so that, if a new pairing is started with the diff --git a/debian/changelog b/debian/changelog index 448475d7c..1fa7b8055 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,7 @@ git-annex (5.20150206) UNRELEASED; urgency=medium caused a symlink to be staged that contained backslashes. * webapp: Fix reversion in opening webapp when starting it manually inside a repository. + * assistant: Improve sanity check for control characters when pairing. -- Joey Hess <id@joeyh.name> Fri, 06 Feb 2015 13:57:08 -0400 diff --git a/doc/bugs/local_pair_fails_if_non-ascii_characters_present_on_annex_path.mdwn b/doc/bugs/local_pair_fails_if_non-ascii_characters_present_on_annex_path.mdwn index aa03c3054..b3a4daf3a 100644 --- a/doc/bugs/local_pair_fails_if_non-ascii_characters_present_on_annex_path.mdwn +++ b/doc/bugs/local_pair_fails_if_non-ascii_characters_present_on_annex_path.mdwn @@ -14,3 +14,5 @@ When the annex directory has a non-ascii character (like a tilde) on its path, l git-annex version: 5.20141016-g26b38fd on Arch Linux git-annex version: 5.20140717 on Ubuntu 14.10 + +> [[done]; see comment |