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

avoid cycles

Browse source
This commit is contained in:
Joey Hess 2025-04-11 12:49:32 -04:00
parent b81126ca48
commit f553cf411b
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 12 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Remote/Mask.hs
View file

@ -46,7 +46,7 @@ remote = specialRemoteType $ RemoteType
gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> RemoteStateHandle -> Annex (Maybe Remote) gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> RemoteStateHandle -> Annex (Maybe Remote)
gen r u rc gc rs = do gen r u rc gc rs = do
maskedremote <- mkMaskedRemote rc gc maskedremote <- mkMaskedRemote rc gc u
c <- parsedRemoteConfig remote rc c <- parsedRemoteConfig remote rc
cst <- remoteCost gc c $ encryptedRemoteCostAdj + semiExpensiveRemoteCost cst <- remoteCost gc c $ encryptedRemoteCostAdj + semiExpensiveRemoteCost
let this = Remote let this = Remote
@ -152,21 +152,19 @@ newtype MaskedRemote = MaskedRemote { getMaskedRemote :: Annex Remote }
-- findMaskedRemote won't work until the remote list has been populated, -- findMaskedRemote won't work until the remote list has been populated,
-- so has to be done on the fly rather than at generation time. -- so has to be done on the fly rather than at generation time.
-- This caches it for speed. -- This caches it for speed.
mkMaskedRemote :: RemoteConfig -> RemoteGitConfig -> Annex MaskedRemote mkMaskedRemote :: RemoteConfig -> RemoteGitConfig -> UUID -> Annex MaskedRemote
mkMaskedRemote c gc = do mkMaskedRemote c gc u = do
v <- liftIO $ newTMVarIO Nothing v <- liftIO $ newTMVarIO Nothing
return $ MaskedRemote $ return $ MaskedRemote $
liftIO (atomically (takeTMVar v)) >>= \case liftIO (atomically (takeTMVar v)) >>= \case
Just maskedremote -> return maskedremote Just maskedremote -> return maskedremote
Nothing -> do Nothing -> do
maskedremote <- findMaskedRemote c gc maskedremote <- findMaskedRemote c gc u
liftIO $ atomically $ putTMVar v (Just maskedremote) liftIO $ atomically $ putTMVar v (Just maskedremote)
return maskedremote return maskedremote
-- XXX prevent using self as masked remote, and prevent using mask special findMaskedRemote :: RemoteConfig -> RemoteGitConfig -> UUID -> Annex Remote
-- remote, to avoid cycles findMaskedRemote c gc myuuid = case remoteAnnexMask gc of
findMaskedRemote :: RemoteConfig -> RemoteGitConfig -> Annex Remote
findMaskedRemote c gc = case remoteAnnexMask gc of
-- This remote was autoenabled, so use any remote with the -- This remote was autoenabled, so use any remote with the
-- uuid of the masked remote, so that it can also be autoenabled. -- uuid of the masked remote, so that it can also be autoenabled.
Just "true" -> Just "true" ->
@ -183,7 +181,12 @@ findMaskedRemote c gc = case remoteAnnexMask gc of
selectremote u f = do selectremote u f = do
remotelist <- Annex.getState Annex.remotes remotelist <- Annex.getState Annex.remotes
case filter f remotelist of case filter f remotelist of
(r:_) -> return r (r:_)
| uuid r == myuuid -> giveup "Mask special remote is configured to mask itself. This is not a valid configuration."
-- Avoid cycles, and there is no benefit
-- to masking a mask special remote.
| remotetype r == remote -> giveup "Mask special remote is configured to mask another mask special remote. This is not supported."
| otherwise -> return r
[] -> missingMaskedRemote u [] -> missingMaskedRemote u
missingMaskedRemote :: UUID -> Annex a missingMaskedRemote :: UUID -> Annex a