2012-11-15 00:25:00 +00:00
|
|
|
{- WebDAV remotes.
|
|
|
|
-
|
2015-01-21 16:50:09 +00:00
|
|
|
- Copyright 2012-2014 Joey Hess <id@joeyh.name>
|
2012-11-15 00:25:00 +00:00
|
|
|
-
|
|
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
|
|
-}
|
|
|
|
|
2014-07-30 15:19:05 +00:00
|
|
|
{-# LANGUAGE ScopedTypeVariables #-}
|
2013-02-27 04:07:28 +00:00
|
|
|
|
2014-02-11 18:06:50 +00:00
|
|
|
module Remote.WebDAV (remote, davCreds, configUrl) where
|
2012-11-15 00:25:00 +00:00
|
|
|
|
|
|
|
import Network.Protocol.HTTP.DAV
|
|
|
|
import qualified Data.Map as M
|
2014-08-07 19:45:56 +00:00
|
|
|
import qualified Data.ByteString.Lazy as L
|
2012-11-15 17:46:16 +00:00
|
|
|
import qualified Data.ByteString.UTF8 as B8
|
2012-11-16 21:58:58 +00:00
|
|
|
import qualified Data.ByteString.Lazy.UTF8 as L8
|
2014-02-25 05:55:01 +00:00
|
|
|
import Network.HTTP.Client (HttpException(..))
|
2012-11-16 04:09:22 +00:00
|
|
|
import Network.HTTP.Types
|
2012-11-17 03:16:18 +00:00
|
|
|
import System.IO.Error
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
import Control.Monad.Catch
|
2012-11-15 00:25:00 +00:00
|
|
|
|
2014-02-25 20:09:50 +00:00
|
|
|
import Common.Annex
|
2012-11-15 00:25:00 +00:00
|
|
|
import Types.Remote
|
|
|
|
import qualified Git
|
|
|
|
import Config
|
2013-03-13 20:16:01 +00:00
|
|
|
import Config.Cost
|
2012-11-15 00:25:00 +00:00
|
|
|
import Remote.Helper.Special
|
2015-08-17 14:42:14 +00:00
|
|
|
import Remote.Helper.Messages
|
2014-08-07 23:32:23 +00:00
|
|
|
import Remote.Helper.Http
|
2014-07-24 18:49:22 +00:00
|
|
|
import qualified Remote.Helper.Chunked.Legacy as Legacy
|
2012-11-15 00:25:00 +00:00
|
|
|
import Creds
|
2013-03-28 21:03:04 +00:00
|
|
|
import Utility.Metered
|
2014-08-07 19:45:56 +00:00
|
|
|
import Utility.Url (URLString)
|
2013-09-07 22:38:00 +00:00
|
|
|
import Annex.UUID
|
2014-08-07 19:45:56 +00:00
|
|
|
import Remote.WebDAV.DavLocation
|
2012-11-15 00:25:00 +00:00
|
|
|
|
|
|
|
remote :: RemoteType
|
|
|
|
remote = RemoteType {
|
|
|
|
typename = "webdav",
|
2015-08-05 17:49:54 +00:00
|
|
|
enumerate = const (findSpecialRemotes "webdav"),
|
2012-11-15 00:25:00 +00:00
|
|
|
generate = gen,
|
|
|
|
setup = webdavSetup
|
|
|
|
}
|
|
|
|
|
2013-09-12 19:54:35 +00:00
|
|
|
gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote)
|
2013-01-01 17:52:47 +00:00
|
|
|
gen r u c gc = new <$> remoteCost gc expensiveRemoteCost
|
2012-11-30 04:55:59 +00:00
|
|
|
where
|
convert WebDAV to new special remote interface, adding new-style chunking support
Reusing http connection when operating on chunks is not done yet,
I had to submit some patches to DAV to support that. However, this is no
slower than old-style chunking was.
Note that it's a fileRetriever and a fileStorer, despite DAV using
bytestrings that would allow streaming. As a result, upload/download of
encrypted files is made a bit more expensive, since it spools them to temp
files. This was needed to get the progress meters to work.
There are probably ways to avoid that.. But it turns out that the current
DAV interface buffers the whole file content in memory, and I have
sent in a patch to DAV to improve its interfaces. Using the new interfaces,
it's certainly going to need to be a fileStorer, in order to read the file
size from the file (getting the size of a bytestring would destroy
laziness). It should be possible to use the new interface to make it be a
byteRetriever, so I'll change that when I get to it.
This commit was sponsored by Andreas Olsson.
2014-08-06 20:55:32 +00:00
|
|
|
new cst = Just $ specialRemote c
|
2014-08-07 22:32:07 +00:00
|
|
|
(prepareDAV this $ store chunkconfig)
|
|
|
|
(prepareDAV this $ retrieve chunkconfig)
|
|
|
|
(prepareDAV this $ remove)
|
|
|
|
(prepareDAV this $ checkKey this chunkconfig)
|
2012-11-15 00:25:00 +00:00
|
|
|
this
|
2012-11-30 04:55:59 +00:00
|
|
|
where
|
2014-12-16 19:26:13 +00:00
|
|
|
this = Remote
|
|
|
|
{ uuid = u
|
|
|
|
, cost = cst
|
|
|
|
, name = Git.repoDescribe r
|
|
|
|
, storeKey = storeKeyDummy
|
|
|
|
, retrieveKeyFile = retreiveKeyFileDummy
|
|
|
|
, retrieveKeyFileCheap = retrieveCheap
|
|
|
|
, removeKey = removeKeyDummy
|
2015-10-08 19:01:38 +00:00
|
|
|
, lockContent = Nothing
|
2014-12-16 19:26:13 +00:00
|
|
|
, checkPresent = checkPresentDummy
|
|
|
|
, checkPresentCheap = False
|
|
|
|
, whereisKey = Nothing
|
|
|
|
, remoteFsck = Nothing
|
|
|
|
, repairRepo = Nothing
|
|
|
|
, config = c
|
|
|
|
, repo = r
|
|
|
|
, gitconfig = gc
|
|
|
|
, localpath = Nothing
|
|
|
|
, readonly = False
|
|
|
|
, availability = GloballyAvailable
|
|
|
|
, remotetype = remote
|
|
|
|
, mkUnavailable = gen r u (M.insert "url" "http://!dne!/" c) gc
|
|
|
|
, getInfo = includeCredsInfo c (davCreds u) $
|
|
|
|
[("url", fromMaybe "unknown" (M.lookup "url" c))]
|
|
|
|
, claimUrl = Nothing
|
|
|
|
, checkUrl = Nothing
|
|
|
|
}
|
convert WebDAV to new special remote interface, adding new-style chunking support
Reusing http connection when operating on chunks is not done yet,
I had to submit some patches to DAV to support that. However, this is no
slower than old-style chunking was.
Note that it's a fileRetriever and a fileStorer, despite DAV using
bytestrings that would allow streaming. As a result, upload/download of
encrypted files is made a bit more expensive, since it spools them to temp
files. This was needed to get the progress meters to work.
There are probably ways to avoid that.. But it turns out that the current
DAV interface buffers the whole file content in memory, and I have
sent in a patch to DAV to improve its interfaces. Using the new interfaces,
it's certainly going to need to be a fileStorer, in order to read the file
size from the file (getting the size of a bytestring would destroy
laziness). It should be possible to use the new interface to make it be a
byteRetriever, so I'll change that when I get to it.
This commit was sponsored by Andreas Olsson.
2014-08-06 20:55:32 +00:00
|
|
|
chunkconfig = getChunkConfig c
|
2012-11-15 00:25:00 +00:00
|
|
|
|
2014-02-11 18:06:50 +00:00
|
|
|
webdavSetup :: Maybe UUID -> Maybe CredPair -> RemoteConfig -> Annex (RemoteConfig, UUID)
|
|
|
|
webdavSetup mu mcreds c = do
|
2013-09-07 22:38:00 +00:00
|
|
|
u <- maybe (liftIO genUUID) return mu
|
2014-08-08 18:19:08 +00:00
|
|
|
url <- case M.lookup "url" c of
|
|
|
|
Nothing -> error "Specify url="
|
|
|
|
Just url -> return url
|
glacier, S3: Fix bug that caused embedded creds to not be encypted using the remote's key.
encryptionSetup must be called before setRemoteCredPair. Otherwise,
the RemoteConfig doesn't have the cipher in it, and so no cipher is used to
encrypt the embedded creds.
This is a security fix for non-shared encryption methods!
For encryption=shared, there's no security problem, just an
inconsistentency in whether the embedded creds are encrypted.
This is very important to get right, so used some types to help ensure that
setRemoteCredPair is only run after encryptionSetup. Note that the external
special remote bypasses the type safety, since creds can be set after the
initial remote config, if the external special remote program requests it.
Also note that IA remotes never use encryption, so encryptionSetup is not
run for them at all, and again the type safety is bypassed.
This leaves two open questions:
1. What to do about S3 and glacier remotes that were set up
using encryption=pubkey/hybrid with embedcreds?
Such a git repo has a security hole embedded in it, and this needs to be
communicated to the user. Is the changelog enough?
2. enableremote won't work in such a repo, because git-annex will
try to decrypt the embedded creds, which are not encrypted, so fails.
This needs to be dealt with, especially for ecryption=shared repos,
which are not really broken, just inconsistently configured.
Noticing that problem for encryption=shared is what led to commit
fbdeeeed5fa276d94be587c8916d725eddcaf546, which tried to
fix the problem by not decrypting the embedded creds.
This commit was sponsored by Josh Taylor.
2014-09-18 21:07:17 +00:00
|
|
|
(c', encsetup) <- encryptionSetup c
|
2014-02-24 19:14:44 +00:00
|
|
|
creds <- maybe (getCreds c' u) (return . Just) mcreds
|
2012-11-15 00:25:00 +00:00
|
|
|
testDav url creds
|
|
|
|
gitConfigSpecialRemote u c' "webdav" "true"
|
glacier, S3: Fix bug that caused embedded creds to not be encypted using the remote's key.
encryptionSetup must be called before setRemoteCredPair. Otherwise,
the RemoteConfig doesn't have the cipher in it, and so no cipher is used to
encrypt the embedded creds.
This is a security fix for non-shared encryption methods!
For encryption=shared, there's no security problem, just an
inconsistentency in whether the embedded creds are encrypted.
This is very important to get right, so used some types to help ensure that
setRemoteCredPair is only run after encryptionSetup. Note that the external
special remote bypasses the type safety, since creds can be set after the
initial remote config, if the external special remote program requests it.
Also note that IA remotes never use encryption, so encryptionSetup is not
run for them at all, and again the type safety is bypassed.
This leaves two open questions:
1. What to do about S3 and glacier remotes that were set up
using encryption=pubkey/hybrid with embedcreds?
Such a git repo has a security hole embedded in it, and this needs to be
communicated to the user. Is the changelog enough?
2. enableremote won't work in such a repo, because git-annex will
try to decrypt the embedded creds, which are not encrypted, so fails.
This needs to be dealt with, especially for ecryption=shared repos,
which are not really broken, just inconsistently configured.
Noticing that problem for encryption=shared is what led to commit
fbdeeeed5fa276d94be587c8916d725eddcaf546, which tried to
fix the problem by not decrypting the embedded creds.
This commit was sponsored by Josh Taylor.
2014-09-18 21:07:17 +00:00
|
|
|
c'' <- setRemoteCredPair encsetup c' (davCreds u) creds
|
2013-09-07 22:38:00 +00:00
|
|
|
return (c'', u)
|
2012-11-15 00:25:00 +00:00
|
|
|
|
2014-08-07 22:32:07 +00:00
|
|
|
-- Opens a http connection to the DAV server, which will be reused
|
|
|
|
-- each time the helper is called.
|
|
|
|
prepareDAV :: Remote -> (Maybe DavHandle -> helper) -> Preparer helper
|
|
|
|
prepareDAV = resourcePrepare . const . withDAVHandle
|
|
|
|
|
|
|
|
store :: ChunkConfig -> Maybe DavHandle -> Storer
|
|
|
|
store _ Nothing = byteStorer $ \_k _b _p -> return False
|
2014-08-07 23:32:23 +00:00
|
|
|
store (LegacyChunks chunksize) (Just dav) = fileStorer $ \k f p -> liftIO $
|
|
|
|
withMeteredFile f p $ storeLegacyChunked chunksize k dav
|
|
|
|
store _ (Just dav) = httpStorer $ \k reqbody -> liftIO $ goDAV dav $ do
|
|
|
|
let tmp = keyTmpLocation k
|
2014-08-08 17:40:55 +00:00
|
|
|
let dest = keyLocation k
|
2014-08-07 23:32:23 +00:00
|
|
|
void $ mkColRecursive tmpDir
|
|
|
|
inLocation tmp $
|
|
|
|
putContentM' (contentType, reqbody)
|
|
|
|
finalizeStore (baseURL dav) tmp dest
|
|
|
|
return True
|
convert WebDAV to new special remote interface, adding new-style chunking support
Reusing http connection when operating on chunks is not done yet,
I had to submit some patches to DAV to support that. However, this is no
slower than old-style chunking was.
Note that it's a fileRetriever and a fileStorer, despite DAV using
bytestrings that would allow streaming. As a result, upload/download of
encrypted files is made a bit more expensive, since it spools them to temp
files. This was needed to get the progress meters to work.
There are probably ways to avoid that.. But it turns out that the current
DAV interface buffers the whole file content in memory, and I have
sent in a patch to DAV to improve its interfaces. Using the new interfaces,
it's certainly going to need to be a fileStorer, in order to read the file
size from the file (getting the size of a bytestring would destroy
laziness). It should be possible to use the new interface to make it be a
byteRetriever, so I'll change that when I get to it.
This commit was sponsored by Andreas Olsson.
2014-08-06 20:55:32 +00:00
|
|
|
|
2014-08-07 19:45:56 +00:00
|
|
|
finalizeStore :: URLString -> DavLocation -> DavLocation -> DAVT IO ()
|
|
|
|
finalizeStore baseurl tmp dest = do
|
|
|
|
inLocation dest $ void $ safely $ delContentM
|
|
|
|
maybe noop (void . mkColRecursive) (locationParent dest)
|
|
|
|
moveDAV baseurl tmp dest
|
2012-11-15 00:25:00 +00:00
|
|
|
|
2015-04-14 20:35:10 +00:00
|
|
|
retrieveCheap :: Key -> AssociatedFile -> FilePath -> Annex Bool
|
|
|
|
retrieveCheap _ _ _ = return False
|
2012-11-15 00:25:00 +00:00
|
|
|
|
2014-08-07 22:32:07 +00:00
|
|
|
retrieve :: ChunkConfig -> Maybe DavHandle -> Retriever
|
|
|
|
retrieve _ Nothing = error "unable to connect"
|
2014-08-08 17:17:24 +00:00
|
|
|
retrieve (LegacyChunks _) (Just dav) = retrieveLegacyChunked dav
|
|
|
|
retrieve _ (Just dav) = fileRetriever $ \d k p -> liftIO $
|
2014-08-08 17:40:55 +00:00
|
|
|
goDAV dav $
|
|
|
|
inLocation (keyLocation k) $
|
|
|
|
withContentM $
|
|
|
|
httpBodyRetriever d p
|
convert WebDAV to new special remote interface, adding new-style chunking support
Reusing http connection when operating on chunks is not done yet,
I had to submit some patches to DAV to support that. However, this is no
slower than old-style chunking was.
Note that it's a fileRetriever and a fileStorer, despite DAV using
bytestrings that would allow streaming. As a result, upload/download of
encrypted files is made a bit more expensive, since it spools them to temp
files. This was needed to get the progress meters to work.
There are probably ways to avoid that.. But it turns out that the current
DAV interface buffers the whole file content in memory, and I have
sent in a patch to DAV to improve its interfaces. Using the new interfaces,
it's certainly going to need to be a fileStorer, in order to read the file
size from the file (getting the size of a bytestring would destroy
laziness). It should be possible to use the new interface to make it be a
byteRetriever, so I'll change that when I get to it.
This commit was sponsored by Andreas Olsson.
2014-08-06 20:55:32 +00:00
|
|
|
|
2014-08-07 22:32:07 +00:00
|
|
|
remove :: Maybe DavHandle -> Remover
|
|
|
|
remove Nothing _ = return False
|
|
|
|
remove (Just dav) k = liftIO $ do
|
|
|
|
-- Delete the key's whole directory, including any
|
|
|
|
-- legacy chunked files, etc, in a single action.
|
2014-08-08 18:57:05 +00:00
|
|
|
let d = keyDir k
|
|
|
|
goDAV dav $ do
|
|
|
|
v <- safely $ inLocation d delContentM
|
|
|
|
case v of
|
|
|
|
Just _ -> return True
|
|
|
|
Nothing -> do
|
|
|
|
v' <- existsDAV d
|
|
|
|
case v' of
|
|
|
|
Right False -> return True
|
|
|
|
_ -> return False
|
2014-08-07 22:32:07 +00:00
|
|
|
|
|
|
|
checkKey :: Remote -> ChunkConfig -> Maybe DavHandle -> CheckPresent
|
|
|
|
checkKey r _ Nothing _ = error $ name r ++ " not configured"
|
2014-08-08 17:17:24 +00:00
|
|
|
checkKey r chunkconfig (Just dav) k = do
|
2015-08-17 14:42:14 +00:00
|
|
|
showChecking r
|
2014-08-08 17:17:24 +00:00
|
|
|
case chunkconfig of
|
|
|
|
LegacyChunks _ -> checkKeyLegacyChunked dav k
|
|
|
|
_ -> do
|
|
|
|
v <- liftIO $ goDAV dav $
|
2014-08-08 17:40:55 +00:00
|
|
|
existsDAV (keyLocation k)
|
2014-08-08 17:17:24 +00:00
|
|
|
either error return v
|
2012-11-17 03:16:18 +00:00
|
|
|
|
2014-08-07 19:45:56 +00:00
|
|
|
configUrl :: Remote -> Maybe URLString
|
2013-12-02 20:01:20 +00:00
|
|
|
configUrl r = fixup <$> M.lookup "url" (config r)
|
|
|
|
where
|
|
|
|
-- box.com DAV url changed
|
|
|
|
fixup = replace "https://www.box.com/dav/" "https://dav.box.com/dav/"
|
2013-04-27 19:16:06 +00:00
|
|
|
|
2014-08-07 22:32:07 +00:00
|
|
|
type DavUser = B8.ByteString
|
|
|
|
type DavPass = B8.ByteString
|
|
|
|
|
|
|
|
baseURL :: DavHandle -> URLString
|
|
|
|
baseURL (DavHandle _ _ _ u) = u
|
|
|
|
|
|
|
|
|
2012-11-15 17:46:16 +00:00
|
|
|
toDavUser :: String -> DavUser
|
|
|
|
toDavUser = B8.fromString
|
2012-11-15 00:25:00 +00:00
|
|
|
|
2012-11-15 17:46:16 +00:00
|
|
|
toDavPass :: String -> DavPass
|
|
|
|
toDavPass = B8.fromString
|
|
|
|
|
2012-11-15 00:25:00 +00:00
|
|
|
{- Test if a WebDAV store is usable, by writing to a test file, and then
|
2014-08-07 19:45:56 +00:00
|
|
|
- deleting the file.
|
|
|
|
-
|
|
|
|
- Also ensures that the path of the url exists, trying to create it if not.
|
|
|
|
-
|
|
|
|
- Throws an error if store is not usable.
|
|
|
|
-}
|
|
|
|
testDav :: URLString -> Maybe CredPair -> Annex ()
|
|
|
|
testDav url (Just (u, p)) = do
|
2015-10-11 17:29:44 +00:00
|
|
|
showAction "testing WebDAV server"
|
2014-08-07 22:32:07 +00:00
|
|
|
test $ liftIO $ evalDAVT url $ do
|
|
|
|
prepDAV user pass
|
2014-08-07 19:45:56 +00:00
|
|
|
makeParentDirs
|
2014-09-17 17:04:55 +00:00
|
|
|
void $ mkColRecursive tmpDir
|
2014-08-07 19:45:56 +00:00
|
|
|
inLocation (tmpLocation "git-annex-test") $ do
|
|
|
|
putContentM (Nothing, L.empty)
|
|
|
|
delContentM
|
2012-11-17 19:30:11 +00:00
|
|
|
where
|
2014-08-07 19:45:56 +00:00
|
|
|
test a = liftIO $
|
|
|
|
either (\e -> throwIO $ "WebDAV test failed: " ++ show e)
|
2012-12-01 18:32:50 +00:00
|
|
|
(const noop)
|
2014-02-24 22:21:51 +00:00
|
|
|
=<< tryNonAsync a
|
2012-11-17 19:30:11 +00:00
|
|
|
|
2012-11-16 04:09:22 +00:00
|
|
|
user = toDavUser u
|
|
|
|
pass = toDavPass p
|
2012-11-16 17:32:18 +00:00
|
|
|
testDav _ Nothing = error "Need to configure webdav username and password."
|
2012-11-15 00:25:00 +00:00
|
|
|
|
2014-08-07 19:45:56 +00:00
|
|
|
{- Tries to make all the parent directories in the WebDAV urls's path,
|
|
|
|
- right down to the root.
|
|
|
|
-
|
|
|
|
- Ignores any failures, which can occur for reasons including the WebDAV
|
|
|
|
- server only serving up WebDAV in a subdirectory. -}
|
|
|
|
makeParentDirs :: DAVT IO ()
|
|
|
|
makeParentDirs = go
|
|
|
|
where
|
|
|
|
go = do
|
|
|
|
l <- getDAVLocation
|
|
|
|
case locationParent l of
|
|
|
|
Nothing -> noop
|
|
|
|
Just p -> void $ safely $ inDAVLocation (const p) go
|
|
|
|
void $ safely mkCol
|
|
|
|
|
|
|
|
{- Checks if the directory exists. If not, tries to create its
|
|
|
|
- parent directories, all the way down to the root, and finally creates
|
|
|
|
- it. -}
|
|
|
|
mkColRecursive :: DavLocation -> DAVT IO Bool
|
|
|
|
mkColRecursive d = go =<< existsDAV d
|
|
|
|
where
|
|
|
|
go (Right True) = return True
|
|
|
|
go _ = ifM (inLocation d mkCol)
|
|
|
|
( return True
|
|
|
|
, do
|
|
|
|
case locationParent d of
|
|
|
|
Nothing -> makeParentDirs
|
|
|
|
Just parent -> void (mkColRecursive parent)
|
|
|
|
inLocation d mkCol
|
|
|
|
)
|
|
|
|
|
2012-11-15 00:25:00 +00:00
|
|
|
getCreds :: RemoteConfig -> UUID -> Annex (Maybe CredPair)
|
2012-11-28 17:31:49 +00:00
|
|
|
getCreds c u = getRemoteCredPairFor "webdav" c (davCreds u)
|
2012-11-15 00:25:00 +00:00
|
|
|
|
|
|
|
davCreds :: UUID -> CredPairStorage
|
|
|
|
davCreds u = CredPairStorage
|
2012-12-13 04:45:27 +00:00
|
|
|
{ credPairFile = fromUUID u
|
|
|
|
, credPairEnvironment = ("WEBDAV_USERNAME", "WEBDAV_PASSWORD")
|
|
|
|
, credPairRemoteKey = Just "davcreds"
|
|
|
|
}
|
2014-02-24 22:21:51 +00:00
|
|
|
|
|
|
|
{- Content-Type to use for files uploaded to WebDAV. -}
|
|
|
|
contentType :: Maybe B8.ByteString
|
|
|
|
contentType = Just $ B8.fromString "application/octet-stream"
|
|
|
|
|
|
|
|
throwIO :: String -> IO a
|
|
|
|
throwIO msg = ioError $ mkIOError userErrorType msg Nothing Nothing
|
|
|
|
|
2014-08-07 19:45:56 +00:00
|
|
|
moveDAV :: URLString -> DavLocation -> DavLocation -> DAVT IO ()
|
|
|
|
moveDAV baseurl src dest = inLocation src $ moveContentM newurl
|
2014-02-24 22:21:51 +00:00
|
|
|
where
|
2014-08-07 19:45:56 +00:00
|
|
|
newurl = B8.fromString (locationUrl baseurl dest)
|
2014-02-24 22:21:51 +00:00
|
|
|
|
2014-08-07 19:45:56 +00:00
|
|
|
existsDAV :: DavLocation -> DAVT IO (Either String Bool)
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
existsDAV l = inLocation l check `catchNonAsync` (\e -> return (Left $ show e))
|
2014-02-24 22:21:51 +00:00
|
|
|
where
|
2014-08-07 19:45:56 +00:00
|
|
|
check = do
|
2014-02-24 22:21:51 +00:00
|
|
|
setDepth Nothing
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
catchJust
|
2014-08-09 05:38:13 +00:00
|
|
|
(matchStatusCodeException (== notFound404))
|
2014-02-24 22:21:51 +00:00
|
|
|
(getPropsM >> ispresent True)
|
|
|
|
(const $ ispresent False)
|
2014-08-07 19:45:56 +00:00
|
|
|
ispresent = return . Right
|
2014-02-24 22:21:51 +00:00
|
|
|
|
2014-08-09 05:38:13 +00:00
|
|
|
matchStatusCodeException :: (Status -> Bool) -> HttpException -> Maybe HttpException
|
|
|
|
matchStatusCodeException want e@(StatusCodeException s _ _)
|
|
|
|
| want s = Just e
|
2014-02-24 22:21:51 +00:00
|
|
|
| otherwise = Nothing
|
|
|
|
matchStatusCodeException _ _ = Nothing
|
|
|
|
|
2014-08-07 19:45:56 +00:00
|
|
|
-- Ignores any exceptions when performing a DAV action.
|
|
|
|
safely :: DAVT IO a -> DAVT IO (Maybe a)
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
safely = eitherToMaybe <$$> tryNonAsync
|
2014-08-07 19:45:56 +00:00
|
|
|
|
2014-08-07 22:32:07 +00:00
|
|
|
choke :: IO (Either String a) -> IO a
|
|
|
|
choke f = do
|
|
|
|
x <- f
|
|
|
|
case x of
|
|
|
|
Left e -> error e
|
|
|
|
Right r -> return r
|
|
|
|
|
|
|
|
data DavHandle = DavHandle DAVContext DavUser DavPass URLString
|
|
|
|
|
|
|
|
withDAVHandle :: Remote -> (Maybe DavHandle -> Annex a) -> Annex a
|
|
|
|
withDAVHandle r a = do
|
|
|
|
mcreds <- getCreds (config r) (uuid r)
|
|
|
|
case (mcreds, configUrl r) of
|
|
|
|
(Just (user, pass), Just baseurl) ->
|
unify exception handling into Utility.Exception
Removed old extensible-exceptions, only needed for very old ghc.
Made webdav use Utility.Exception, to work after some changes in DAV's
exception handling.
Removed Annex.Exception. Mostly this was trivial, but note that
tryAnnex is replaced with tryNonAsync and catchAnnex replaced with
catchNonAsync. In theory that could be a behavior change, since the former
caught all exceptions, and the latter don't catch async exceptions.
However, in practice, nothing in the Annex monad uses async exceptions.
Grepping for throwTo and killThread only find stuff in the assistant,
which does not seem related.
Command.Add.undo is changed to accept a SomeException, and things
that use it for rollback now catch non-async exceptions, rather than
only IOExceptions.
2014-08-08 01:55:44 +00:00
|
|
|
withDAVContext baseurl $ \ctx ->
|
2014-08-07 22:32:07 +00:00
|
|
|
a (Just (DavHandle ctx (toDavUser user) (toDavPass pass) baseurl))
|
|
|
|
_ -> a Nothing
|
|
|
|
|
|
|
|
goDAV :: DavHandle -> DAVT IO a -> IO a
|
2014-08-09 05:38:13 +00:00
|
|
|
goDAV (DavHandle ctx user pass _) a = choke $ run $ prettifyExceptions $ do
|
2014-08-07 22:32:07 +00:00
|
|
|
prepDAV user pass
|
2014-02-24 22:21:51 +00:00
|
|
|
a
|
|
|
|
where
|
2014-08-07 22:32:07 +00:00
|
|
|
run = fst <$$> runDAVContext ctx
|
|
|
|
|
2014-08-09 05:38:13 +00:00
|
|
|
{- Catch StatusCodeException and trim it to only the statusMessage part,
|
|
|
|
- eliminating a lot of noise, which can include the whole request that
|
|
|
|
- failed. The rethrown exception is no longer a StatusCodeException. -}
|
|
|
|
prettifyExceptions :: DAVT IO a -> DAVT IO a
|
|
|
|
prettifyExceptions a = catchJust (matchStatusCodeException (const True)) a go
|
|
|
|
where
|
|
|
|
go (StatusCodeException status _ _) = error $ unwords
|
|
|
|
[ "DAV failure:"
|
|
|
|
, show (statusCode status)
|
|
|
|
, show (statusMessage status)
|
|
|
|
]
|
|
|
|
go e = throwM e
|
|
|
|
|
2014-08-07 22:32:07 +00:00
|
|
|
prepDAV :: DavUser -> DavPass -> DAVT IO ()
|
|
|
|
prepDAV user pass = do
|
|
|
|
setResponseTimeout Nothing -- disable default (5 second!) timeout
|
|
|
|
setCreds user pass
|
2014-08-08 17:17:24 +00:00
|
|
|
|
|
|
|
--
|
|
|
|
-- Legacy chunking code, to be removed eventually.
|
|
|
|
--
|
|
|
|
|
|
|
|
storeLegacyChunked :: ChunkSize -> Key -> DavHandle -> L.ByteString -> IO Bool
|
|
|
|
storeLegacyChunked chunksize k dav b =
|
|
|
|
Legacy.storeChunks k tmp dest storer recorder finalizer
|
|
|
|
where
|
|
|
|
storehttp l b' = void $ goDAV dav $ do
|
|
|
|
maybe noop (void . mkColRecursive) (locationParent l)
|
|
|
|
inLocation l $ putContentM (contentType, b')
|
|
|
|
storer locs = Legacy.storeChunked chunksize locs storehttp b
|
|
|
|
recorder l s = storehttp l (L8.fromString s)
|
|
|
|
finalizer tmp' dest' = goDAV dav $
|
|
|
|
finalizeStore (baseURL dav) tmp' (fromJust $ locationParent dest')
|
|
|
|
|
|
|
|
tmp = keyTmpLocation k
|
2014-08-08 17:40:55 +00:00
|
|
|
dest = keyLocation k
|
2014-08-08 17:17:24 +00:00
|
|
|
|
|
|
|
retrieveLegacyChunked :: DavHandle -> Retriever
|
|
|
|
retrieveLegacyChunked dav = fileRetriever $ \d k p -> liftIO $
|
|
|
|
withStoredFilesLegacyChunked k dav onerr $ \locs ->
|
2014-08-08 17:40:55 +00:00
|
|
|
Legacy.meteredWriteFileChunks p d locs $ \l ->
|
|
|
|
goDAV dav $
|
|
|
|
inLocation l $
|
|
|
|
snd <$> getContentM
|
2014-08-08 17:17:24 +00:00
|
|
|
where
|
|
|
|
onerr = error "download failed"
|
|
|
|
|
|
|
|
checkKeyLegacyChunked :: DavHandle -> CheckPresent
|
|
|
|
checkKeyLegacyChunked dav k = liftIO $
|
|
|
|
either error id <$> withStoredFilesLegacyChunked k dav onerr check
|
|
|
|
where
|
|
|
|
check [] = return $ Right True
|
|
|
|
check (l:ls) = do
|
|
|
|
v <- goDAV dav $ existsDAV l
|
|
|
|
if v == Right True
|
|
|
|
then check ls
|
|
|
|
else return v
|
|
|
|
|
|
|
|
{- Failed to read the chunkcount file; see if it's missing,
|
|
|
|
- or if there's a problem accessing it,
|
|
|
|
- or perhaps this was an intermittent error. -}
|
|
|
|
onerr f = do
|
|
|
|
v <- goDAV dav $ existsDAV f
|
|
|
|
return $ if v == Right True
|
|
|
|
then Left $ "failed to read " ++ f
|
|
|
|
else v
|
|
|
|
|
|
|
|
withStoredFilesLegacyChunked
|
|
|
|
:: Key
|
|
|
|
-> DavHandle
|
|
|
|
-> (DavLocation -> IO a)
|
|
|
|
-> ([DavLocation] -> IO a)
|
|
|
|
-> IO a
|
|
|
|
withStoredFilesLegacyChunked k dav onerr a = do
|
|
|
|
let chunkcount = keyloc ++ Legacy.chunkCount
|
|
|
|
v <- goDAV dav $ safely $
|
|
|
|
inLocation chunkcount $
|
|
|
|
snd <$> getContentM
|
|
|
|
case v of
|
|
|
|
Just s -> a $ Legacy.listChunks keyloc $ L8.toString s
|
|
|
|
Nothing -> do
|
|
|
|
chunks <- Legacy.probeChunks keyloc $ \f ->
|
|
|
|
(== Right True) <$> goDAV dav (existsDAV f)
|
|
|
|
if null chunks
|
|
|
|
then onerr chunkcount
|
|
|
|
else a chunks
|
|
|
|
where
|
2014-08-08 17:40:55 +00:00
|
|
|
keyloc = keyLocation k
|