diff options
| -rw-r--r-- | Annex/Perms.hs | 40 | ||||
| -rw-r--r-- | Command/Fsck.hs | 6 | ||||
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | doc/bugs/mode_changes_for_sharedRepository_lead_to_permissionDenied_in_fsck.mdwn | 2 |
4 files changed, 38 insertions, 13 deletions
diff --git a/Annex/Perms.hs b/Annex/Perms.hs index 4d525c127..644402587 100644 --- a/Annex/Perms.hs +++ b/Annex/Perms.hs @@ -12,6 +12,7 @@ module Annex.Perms ( createAnnexDirectory, noUmask, freezeContent, + isContentWritePermOk, thawContent, chmodContent, createContentDir, @@ -44,10 +45,10 @@ setAnnexPerm :: Bool -> FilePath -> Annex () setAnnexPerm isdir file = unlessM crippledFileSystem $ withShared $ liftIO . go where - go GroupShared = modifyFileMode file $ addModes $ + go GroupShared = void $ tryIO $ modifyFileMode file $ addModes $ groupSharedModes ++ if isdir then [ ownerExecuteMode, groupExecuteMode ] else [] - go AllShared = modifyFileMode file $ addModes $ + go AllShared = void $ tryIO $ modifyFileMode file $ addModes $ readModes ++ [ ownerWriteMode, groupWriteMode ] ++ if isdir then executeModes else [] @@ -85,28 +86,45 @@ createAnnexDirectory dir = walk dir [] =<< top - - When core.sharedRepository is set, the write bits are not removed from - the file, but instead the appropriate group write bits are set. This is - - necessary to let other users in the group lock the file. + - necessary to let other users in the group lock the file. But, in a + - shared repository, the current user may not be able to change a file + - owned by another user, so failure to set this mode is ignored. -} freezeContent :: FilePath -> Annex () freezeContent file = unlessM crippledFileSystem $ withShared go where - go GroupShared = liftIO $ modifyFileMode file $ + go GroupShared = liftIO $ void $ tryIO $ modifyFileMode file $ addModes [ownerReadMode, groupReadMode, ownerWriteMode, groupWriteMode] - go AllShared = liftIO $ modifyFileMode file $ + go AllShared = liftIO $ void $ tryIO $ modifyFileMode file $ addModes (readModes ++ writeModes) go _ = liftIO $ modifyFileMode file $ removeModes writeModes . addModes [ownerReadMode] +isContentWritePermOk :: FilePath -> Annex Bool +isContentWritePermOk file = ifM crippledFileSystem + ( return True + , withShared go + ) + where + go GroupShared = want [ownerWriteMode, groupWriteMode] + go AllShared = want writeModes + go _ = return True + want wantmode = do + mmode <- liftIO $ catchMaybeIO $ fileMode <$> getFileStatus file + return $ case mmode of + Nothing -> True + Just havemode -> havemode == combineModes (havemode:wantmode) + {- Adjusts read mode of annexed file per core.sharedRepository setting. -} chmodContent :: FilePath -> Annex () chmodContent file = unlessM crippledFileSystem $ withShared go where - go GroupShared = liftIO $ modifyFileMode file $ + go GroupShared = liftIO $ void $ tryIO $ modifyFileMode file $ addModes [ownerReadMode, groupReadMode] - go AllShared = liftIO $ modifyFileMode file $ + go AllShared = liftIO $ void $ tryIO $ modifyFileMode file $ addModes readModes go _ = liftIO $ modifyFileMode file $ addModes [ownerReadMode] @@ -116,8 +134,8 @@ chmodContent file = unlessM crippledFileSystem $ thawContent :: FilePath -> Annex () thawContent file = thawPerms $ withShared go where - go GroupShared = liftIO $ groupWriteRead file - go AllShared = liftIO $ groupWriteRead file + go GroupShared = liftIO $ void $ tryIO $ groupWriteRead file + go AllShared = liftIO $ void $ tryIO $ groupWriteRead file go _ = liftIO $ allowWrite file {- Runs an action that thaws a file's permissions. This will probably @@ -139,8 +157,8 @@ freezeContentDir file = unlessM crippledFileSystem $ withShared go where dir = parentDir file - go GroupShared = liftIO $ groupWriteRead dir - go AllShared = liftIO $ groupWriteRead dir + go GroupShared = liftIO $ void $ tryIO $ groupWriteRead dir + go AllShared = liftIO $ void $ tryIO $ groupWriteRead dir go _ = liftIO $ preventWrite dir thawContentDir :: FilePath -> Annex () diff --git a/Command/Fsck.hs b/Command/Fsck.hs index 81618600f..0136175c7 100644 --- a/Command/Fsck.hs +++ b/Command/Fsck.hs @@ -223,10 +223,12 @@ verifyLocationLog key keystatus desc = do {- Since we're checking that a key's object file is present, throw - in a permission fixup here too. -} - when (present && not direct) $ void $ tryIO $ - if isKeyUnlocked keystatus + when (present && not direct) $ do + void $ tryIO $ if isKeyUnlocked keystatus then thawContent obj else freezeContent obj + unlessM (isContentWritePermOk obj) $ + warning $ "** Unable to set correct write mode for " ++ obj ++ " ; perhaps you don't own that file" whenM (liftIO $ doesDirectoryExist $ parentDir obj) $ freezeContentDir obj diff --git a/debian/changelog b/debian/changelog index e899ab691..588c34542 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,9 @@ git-annex (6.20160413) UNRELEASED; urgency=medium as annexed. If you have such files, run git annex init --version=6 to update the cache after upgrading to this version of git-annex. * Preserve execute bits of unlocked files in v6 mode. + * fsck: Warn when core.sharedRepository is set and an annex object file's + write bit is not set and cannot be set due to the file being owned + by a different user. -- Joey Hess <id@joeyh.name> Wed, 13 Apr 2016 13:30:32 -0400 diff --git a/doc/bugs/mode_changes_for_sharedRepository_lead_to_permissionDenied_in_fsck.mdwn b/doc/bugs/mode_changes_for_sharedRepository_lead_to_permissionDenied_in_fsck.mdwn index c1e1d9e17..70034ac4d 100644 --- a/doc/bugs/mode_changes_for_sharedRepository_lead_to_permissionDenied_in_fsck.mdwn +++ b/doc/bugs/mode_changes_for_sharedRepository_lead_to_permissionDenied_in_fsck.mdwn @@ -13,3 +13,5 @@ The issue can be resolved for a repository by ### What version of git-annex are you using? On what operating system? This was observed on a git-annex remote pushed to via ssh on debian sid, with pushes from various git-annex versions over the past years. + +> [[fixed|done]] --[[Joey]] |