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

sanitize filepaths provided by checkUrl

Browse source
This commit is contained in:
Joey Hess 2014-12-11 20:08:49 -04:00
parent b0ca0985ce
commit 67c05daf5e
5 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Command/AddUrl.hs
View file

@ -73,11 +73,11 @@ seek us = do
next $ next $ return False
Right (UrlContents sz mf) -> do
void $ commandAction $
startRemote r relaxed (fromMaybe deffile mf) u sz
startRemote r relaxed (maybe deffile fromSafeFilePath mf) u sz
Right (UrlMulti l) ->
forM_ l $ \(u', sz, f) ->
void $ commandAction $
startRemote r relaxed (deffile </> f) u' sz
startRemote r relaxed (deffile </> fromSafeFilePath f) u' sz
startRemote :: Remote -> Bool -> FilePath -> URLString -> Maybe Integer -> CommandStart
startRemote r relaxed file uri sz = do

2
Command/ImportFeed.hs
View file

@ -156,7 +156,7 @@ performDownload relaxed cache todownload = case location todownload of
downloadRemoteFile r relaxed url f sz
Right (UrlMulti l) -> do
kl <- forM l $ \(url', sz, subf) ->
downloadRemoteFile r relaxed url' (f </> subf) sz
downloadRemoteFile r relaxed url' (f </> fromSafeFilePath subf) sz
return $ if all isJust kl
then catMaybes kl
else []