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

fix concurrency bug causing EXPORT to be sent to the wrong external

Browse source 
Fix bug that caused broken protocol to be used with external remotes that
use exporttree=yes. In some cases this could result in the wrong content
being exported to, or retrieved from the remote.

Sponsored-by: Nicholas Golder-Manning on Patreon
This commit is contained in:
Joey Hess 2023-03-28 15:21:10 -04:00
parent 390ed554e8
commit 02662f5292
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
2 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
CHANGELOG
View file

@ -10,6 +10,9 @@ git-annex (10.20230322) UNRELEASED; urgency=medium
* Windows: Support urls like "file:///c:/path" * Windows: Support urls like "file:///c:/path"
* addurl, importfeed: Fix failure when annex.securehashesonly is set. * addurl, importfeed: Fix failure when annex.securehashesonly is set.
* Copy with a reflink when exporting a tree to a directory special remote. * Copy with a reflink when exporting a tree to a directory special remote.
* Fix bug that caused broken protocol to be used with external remotes
that use exporttree=yes. In some cases this could result in the wrong
content being exported to, or retrieved from the remote.
-- Joey Hess <id@joeyh.name> Thu, 23 Mar 2023 15:04:41 -0400 -- Joey Hess <id@joeyh.name> Thu, 23 Mar 2023 15:04:41 -0400

16
Remote/External.hs
View file

@ -377,19 +377,27 @@ handleRequest external req mp responsehandler =
handleRequest' st external req mp responsehandler handleRequest' st external req mp responsehandler
handleRequestKey :: External -> (SafeKey -> Request) -> Key -> Maybe MeterUpdate -> ResponseHandler a -> Annex a handleRequestKey :: External -> (SafeKey -> Request) -> Key -> Maybe MeterUpdate -> ResponseHandler a -> Annex a
handleRequestKey external mkreq k mp responsehandler = case mkSafeKey k of handleRequestKey external mkreq k mp responsehandler =
Right sk -> handleRequest external (mkreq sk) mp responsehandler withSafeKey k $ \sk -> handleRequest external (mkreq sk) mp responsehandler
withSafeKey :: Key -> (SafeKey -> Annex a) -> Annex a
withSafeKey k a = case mkSafeKey k of
Right sk -> a sk
Left e -> giveup e Left e -> giveup e
{- Export location is first sent in an EXPORT message before {- Export location is first sent in an EXPORT message before
- the main request. This is done because the ExportLocation can - the main request. This is done because the ExportLocation can
- contain spaces etc. -} - contain spaces etc. -}
handleRequestExport :: External -> ExportLocation -> (SafeKey -> Request) -> Key -> Maybe MeterUpdate -> ResponseHandler a -> Annex a handleRequestExport :: External -> ExportLocation -> (SafeKey -> Request) -> Key -> Maybe MeterUpdate -> ResponseHandler a -> Annex a
handleRequestExport external loc mkreq k mp responsehandler = do handleRequestExport external loc mkreq k mp responsehandler =
withSafeKey k $ \sk ->
-- Both the EXPORT and subsequent request must be sent to the
-- same external process, so run both with the same external
-- state.
withExternalState external $ \st -> do withExternalState external $ \st -> do
checkPrepared st external checkPrepared st external
sendMessage st (EXPORT loc) sendMessage st (EXPORT loc)
handleRequestKey external mkreq k mp responsehandler handleRequest' st external (mkreq sk) mp responsehandler
handleRequest' :: ExternalState -> External -> Request -> Maybe MeterUpdate -> ResponseHandler a -> Annex a handleRequest' :: ExternalState -> External -> Request -> Maybe MeterUpdate -> ResponseHandler a -> Annex a
handleRequest' st external req mp responsehandler handleRequest' st external req mp responsehandler