f8836306fa
This fixes fsck of a remote that uses chunking displaying (checking remotename) (checking remotename)" for every chunk. Also, some remotes displayed the message, and others did not, with no consistency. It was originally displayed only when accessing remotes that were expensive or might involve a password prompt, I think, but nothing in the API said when to do it so it became an inconsistent mess. Originally I thought fsck should always display it. But it only displays in fsck --from remote, so the user knows the remote is being accessed, so there is no reason to tell them it's accessing it over and over. It was also possible for git-annex move to sometimes display it twice, due to checking if content is present twice. But, the user of move specifies --from/--to, so it does not need to display when it's accessing the remote, as the user expects it to access the remote. git-annex get might display it, but only if the remote also supports hasKeyCheap, which is really only local git remotes, which didn't display it always; and in any case nothing displayed it before hasKeyCheap, which is checked first, so I don't think this needs to display it ever. mirror is like move. And that's all the main places it would have been displayed. This commit was sponsored by Jochen Bartl on Patreon.
226 lines
7.3 KiB
Haskell
226 lines
7.3 KiB
Haskell
{- HttpAlso remote (readonly).
|
|
-
|
|
- Copyright 2020 Joey Hess <id@joeyh.name>
|
|
-
|
|
- Licensed under the GNU AGPL version 3 or higher.
|
|
-}
|
|
|
|
module Remote.HttpAlso (remote) where
|
|
|
|
import Annex.Common
|
|
import Types.Remote
|
|
import Types.ProposedAccepted
|
|
import Types.Export
|
|
import Remote.Helper.ExportImport
|
|
import Remote.Helper.Special
|
|
import qualified Git
|
|
import Config.Cost
|
|
import Config
|
|
import Logs.Web
|
|
import Creds
|
|
import Messages.Progress
|
|
import Utility.Metered
|
|
import qualified Annex.Url as Url
|
|
import Annex.SpecialRemote.Config
|
|
|
|
import Data.Either
|
|
import qualified Data.Map as M
|
|
import System.FilePath.Posix as P
|
|
import Control.Concurrent.STM
|
|
|
|
remote :: RemoteType
|
|
remote = RemoteType
|
|
{ typename = "httpalso"
|
|
, enumerate = const (findSpecialRemotes "httpalso")
|
|
, generate = gen
|
|
, configParser = mkRemoteConfigParser
|
|
[ optionalStringParser urlField
|
|
(FieldDesc "(required) url to the remote content")
|
|
]
|
|
, setup = httpAlsoSetup
|
|
, exportSupported = exportIsSupported
|
|
, importSupported = importUnsupported
|
|
, thirdPartyPopulated = False
|
|
}
|
|
|
|
urlField :: RemoteConfigField
|
|
urlField = Accepted "url"
|
|
|
|
gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> RemoteStateHandle -> Annex (Maybe Remote)
|
|
gen r u rc gc rs = do
|
|
c <- parsedRemoteConfig remote rc
|
|
cst <- remoteCost gc expensiveRemoteCost
|
|
let url = getRemoteConfigValue urlField c
|
|
ll <- liftIO newLearnedLayout
|
|
return $ Just $ this url ll c cst
|
|
where
|
|
this url ll c cst = Remote
|
|
{ uuid = u
|
|
, cost = cst
|
|
, name = Git.repoDescribe r
|
|
, storeKey = cannotModify
|
|
, retrieveKeyFile = downloadKey url ll
|
|
, retrieveKeyFileCheap = Nothing
|
|
-- HttpManagerRestricted is used here, so this is
|
|
-- secure.
|
|
, retrievalSecurityPolicy = RetrievalAllKeysSecure
|
|
, removeKey = cannotModify
|
|
, lockContent = Nothing
|
|
, checkPresent = checkKey url ll
|
|
, checkPresentCheap = False
|
|
, exportActions = ExportActions
|
|
{ storeExport = cannotModify
|
|
, retrieveExport = retriveExportHttpAlso url
|
|
, removeExport = cannotModify
|
|
, versionedExport = False
|
|
, checkPresentExport = checkPresentExportHttpAlso url
|
|
, removeExportDirectory = Nothing
|
|
, renameExport = cannotModify
|
|
}
|
|
, importActions = importUnsupported
|
|
, whereisKey = Nothing
|
|
, remoteFsck = Nothing
|
|
, repairRepo = Nothing
|
|
, config = c
|
|
, gitconfig = gc
|
|
, localpath = Nothing
|
|
, getRepo = return r
|
|
, readonly = True
|
|
, appendonly = False
|
|
, untrustworthy = False
|
|
, availability = GloballyAvailable
|
|
, remotetype = remote
|
|
, mkUnavailable = return Nothing
|
|
, getInfo = return []
|
|
, claimUrl = Nothing
|
|
, checkUrl = Nothing
|
|
, remoteStateHandle = rs
|
|
}
|
|
|
|
cannotModify :: a
|
|
cannotModify = giveup "httpalso special remote is read only"
|
|
|
|
httpAlsoSetup :: SetupStage -> Maybe UUID -> Maybe CredPair -> RemoteConfig -> RemoteGitConfig -> Annex (RemoteConfig, UUID)
|
|
httpAlsoSetup _ Nothing _ _ _ =
|
|
error "Must use --sameas when initializing a httpalso remote."
|
|
httpAlsoSetup _ (Just u) _ c gc = do
|
|
_url <- maybe (giveup "Specify url=")
|
|
(return . fromProposedAccepted)
|
|
(M.lookup urlField c)
|
|
c' <- if isJust (M.lookup encryptionField c)
|
|
then fst <$> encryptionSetup c gc
|
|
else pure c
|
|
gitConfigSpecialRemote u c' [("httpalso", "true")]
|
|
return (c', u)
|
|
|
|
downloadKey :: Maybe URLString -> LearnedLayout -> Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Verification
|
|
downloadKey baseurl ll key _af dest p = do
|
|
downloadAction dest p key (keyUrlAction baseurl ll key)
|
|
return UnVerified
|
|
|
|
retriveExportHttpAlso :: Maybe URLString -> Key -> ExportLocation -> FilePath -> MeterUpdate -> Annex ()
|
|
retriveExportHttpAlso baseurl key loc dest p =
|
|
downloadAction dest p key (exportLocationUrlAction baseurl loc)
|
|
|
|
downloadAction :: FilePath -> MeterUpdate -> Key -> ((URLString -> Annex (Either String ())) -> Annex (Either String ())) -> Annex ()
|
|
downloadAction dest p key run =
|
|
Url.withUrlOptions $ \uo ->
|
|
meteredFile dest (Just p) key $
|
|
run (\url -> Url.download' p url dest uo)
|
|
>>= either giveup (const (return ()))
|
|
|
|
checkKey :: Maybe URLString -> LearnedLayout -> Key -> Annex Bool
|
|
checkKey baseurl ll key =
|
|
isRight <$> keyUrlAction baseurl ll key (checkKey' key)
|
|
|
|
checkKey' :: Key -> URLString -> Annex (Either String ())
|
|
checkKey' key url = ifM (Url.withUrlOptions $ Url.checkBoth url (fromKey keySize key))
|
|
( return (Right ())
|
|
, return (Left "content not found")
|
|
)
|
|
|
|
checkPresentExportHttpAlso :: Maybe URLString -> Key -> ExportLocation -> Annex Bool
|
|
checkPresentExportHttpAlso baseurl key loc =
|
|
isRight <$> exportLocationUrlAction baseurl loc (checkKey' key)
|
|
|
|
type LearnedLayout = TVar (Maybe [Key -> URLString])
|
|
|
|
newLearnedLayout :: IO LearnedLayout
|
|
newLearnedLayout = newTVarIO Nothing
|
|
|
|
-- Learns which layout the special remote uses, so the once any
|
|
-- action on an url succeeds, subsequent calls will continue to use that
|
|
-- layout (or related layouts).
|
|
keyUrlAction
|
|
:: Maybe URLString
|
|
-> LearnedLayout
|
|
-> Key
|
|
-> (URLString -> Annex (Either String ()))
|
|
-> Annex (Either String ())
|
|
keyUrlAction (Just baseurl) ll key downloader =
|
|
liftIO (readTVarIO ll) >>= \case
|
|
Just learned -> go Nothing False [learned]
|
|
Nothing -> go Nothing True (supportedLayouts baseurl)
|
|
where
|
|
go err learn [] = go' err learn [] []
|
|
go err learn (layouts:rest) = go' err learn layouts [] >>= \case
|
|
Right () -> return (Right ())
|
|
Left err' -> go (Just err') learn rest
|
|
|
|
go' (Just err) _ [] _ = pure (Left err)
|
|
go' Nothing _ [] _ = error "internal"
|
|
go' _err learn (layout:rest) prevs =
|
|
downloader (layout key) >>= \case
|
|
Right () -> do
|
|
when learn $ do
|
|
let learned = layout:prevs++rest
|
|
liftIO $ atomically $
|
|
writeTVar ll (Just learned)
|
|
return (Right ())
|
|
Left err -> go' (Just err) learn rest (layout:prevs)
|
|
keyUrlAction Nothing _ _ _ = noBaseUrlError
|
|
|
|
exportLocationUrlAction
|
|
:: Maybe URLString
|
|
-> ExportLocation
|
|
-> (URLString -> Annex (Either String ()))
|
|
-> Annex (Either String ())
|
|
exportLocationUrlAction (Just baseurl) loc a =
|
|
a (baseurl P.</> fromRawFilePath (fromExportLocation loc))
|
|
exportLocationUrlAction Nothing _ _ = noBaseUrlError
|
|
|
|
-- cannot normally happen
|
|
noBaseUrlError :: Annex a
|
|
noBaseUrlError = giveup "no url configured for httpalso special remote"
|
|
|
|
-- Different ways that keys can be laid out in the special remote,
|
|
-- with the more common first.
|
|
--
|
|
-- This is a nested list, because a single remote may use more than one
|
|
-- layout. In particular, old versions of git-annex used hashDirMixed
|
|
-- for some special remotes, before switching to hashDirLower for new data.
|
|
-- So, when learning the layout, both need to be tried.
|
|
supportedLayouts :: URLString -> [[Key -> URLString]]
|
|
supportedLayouts baseurl =
|
|
-- Layout used for bare git-annex repos, and for many
|
|
-- special remotes like directory.
|
|
[ [ \k -> mkurl k (hashDirLower (HashLevels 2)) P.</> kf k
|
|
-- Layout used for non-bare git-annex repos, and for some old
|
|
-- special remotes.
|
|
, \k -> mkurl k (hashDirMixed (HashLevels 2)) P.</> kf k
|
|
]
|
|
-- Special remotes that do not need hash directories.
|
|
, [ \k -> baseurl P.</> kf k ]
|
|
-- Layouts without a key directory, used by some special remotes.
|
|
, [ \k -> mkurl k (hashDirLower def)
|
|
, \k -> mkurl k (hashDirMixed def)
|
|
]
|
|
-- Layouts with only 1 level of hash directory,
|
|
-- rather than the default 2.
|
|
, [ \k -> mkurl k (hashDirLower (HashLevels 1))
|
|
, \k -> mkurl k (hashDirMixed (HashLevels 1))
|
|
]
|
|
]
|
|
where
|
|
mkurl k hasher = baseurl P.</> fromRawFilePath (hasher k) P.</> kf k
|
|
kf k = fromRawFilePath (keyFile k)
|