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

reject annex:: url that omits a uuid

Browse source 
Such as annex::?type=foo&...

I accidentially left out the uuid when creating one,
and the result is it appears to clone an empty repository.
So let's guard against that mistake.
This commit is contained in:
Joey Hess 2024-05-10 13:59:35 -04:00
parent ef5e9aa082
commit 1250bb26a0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 7 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CmdLine/GitRemoteAnnex.hs
View file

@ -283,7 +283,6 @@ guardPush st a = catchNonAsync a $ \ex -> do
incrementalPush :: State -> Remote -> M.Map Ref Sha -> M.Map Ref Sha -> Annex (Bool, State) incrementalPush :: State -> Remote -> M.Map Ref Sha -> M.Map Ref Sha -> Annex (Bool, State)
incrementalPush st rmt oldtrackingrefs newtrackingrefs = guardPush st $ do incrementalPush st rmt oldtrackingrefs newtrackingrefs = guardPush st $ do
bs <- calc [] (M.toList newtrackingrefs) bs <- calc [] (M.toList newtrackingrefs)
liftIO $ hPutStrLn stderr (show bs)
oldmanifest <- maybe (downloadManifest rmt) pure (manifestCache st) oldmanifest <- maybe (downloadManifest rmt) pure (manifestCache st)
bundlekey <- generateAndUploadGitBundle rmt bs oldmanifest bundlekey <- generateAndUploadGitBundle rmt bs oldmanifest
uploadManifest rmt (Manifest [bundlekey]) uploadManifest rmt (Manifest [bundlekey])
@ -430,11 +429,13 @@ parseSpecialRemoteUrl url remotename = case parseURI url of
Just u -> case uriScheme u of Just u -> case uriScheme u of
"annex:" -> case uriPath u of "annex:" -> case uriPath u of
"" -> Left "annex: URL did not include a UUID" "" -> Left "annex: URL did not include a UUID"
(':':p) -> Right $ SpecialRemoteConfig (':':p)
{ specialRemoteUUID = toUUID p | null p -> Left "annex: URL did not include a UUID"
, specialRemoteConfig = parsequery u | otherwise -> Right $ SpecialRemoteConfig
, specialRemoteName = remotename { specialRemoteUUID = toUUID p
, specialRemoteUrl = url , specialRemoteConfig = parsequery u
, specialRemoteName = remotename
, specialRemoteUrl = url
} }
_ -> Left "annex: URL malformed" _ -> Left "annex: URL malformed"
_ -> Left "Not an annex: URL" _ -> Left "Not an annex: URL"