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

fix perms of manifest object

Browse source 
With the directory special remote, manifest objects uploaded by
git-remote-annex were mode 600. This prevented accessing them
from a httpalso special remote, for example.

The directory special remote just copies the file perms. Which is fine
except in this case the file perms were wrong.
This commit is contained in:
Joey Hess 2024-05-28 16:00:55 -04:00
parent cb7f15e733
commit e13678780c
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
CmdLine/GitRemoteAnnex.hs
View file

@ -53,6 +53,7 @@ import Utility.Tmp
import Utility.Tmp.Dir import Utility.Tmp.Dir
import Utility.Env import Utility.Env
import Utility.Metered import Utility.Metered
import Utility.FileMode
import Network.URI import Network.URI
import Data.Either import Data.Either
@ -718,17 +719,24 @@ uploadManifest rmt manifest = do
put mk = withTmpFile "GITMANIFEST" $ \tmp tmph -> do put mk = withTmpFile "GITMANIFEST" $ \tmp tmph -> do
liftIO $ B8.hPut tmph (formatManifest manifest) liftIO $ B8.hPut tmph (formatManifest manifest)
liftIO $ hClose tmph liftIO $ hClose tmph
-- storeKey needs the key to be in the annex objects -- Uploading needs the key to be in the annex objects
-- directory, so put the manifest file there temporarily. -- directory, so put the manifest file there temporarily.
-- Using linkOrCopy rather than moveAnnex to avoid updating -- Using linkOrCopy rather than moveAnnex to avoid updating
-- InodeCache database. Also, works even when the repository -- InodeCache database. Also, works even when the repository
-- is configured to require only cryptographically secure -- is configured to require only cryptographically secure
-- keys, which it is not. -- keys, which it is not.
objfile <- calcRepo (gitAnnexLocation mk) objfile <- calcRepo (gitAnnexLocation mk)
res <- modifyContentDir objfile $ modifyContentDir objfile $
linkOrCopy mk (toRawFilePath tmp) objfile Nothing linkOrCopy mk (toRawFilePath tmp) objfile Nothing >>= \case
unless (isJust res) -- Important to set the right perms even
uploadfailed -- though the object is only present
-- briefly, since sending objects may rely
-- on or even copy file perms.
Just _ -> do
liftIO $ R.setFileMode objfile
=<< defaultFileMode
freezeContent objfile
Nothing -> uploadfailed
ok <- (uploadGitObject rmt mk >> pure True) ok <- (uploadGitObject rmt mk >> pure True)
`catchNonAsync` (const (pure False)) `catchNonAsync` (const (pure False))
-- Don't leave the manifest key in the annex objects -- Don't leave the manifest key in the annex objects