Christian Couder <christian.couder@xxxxxxxxx> writes: > However, as noted in those commits we'd still create the file as 0600, > and would just re-chmod it depending on the setting of > core.sharedRepository. So without core.splitIndex a system with > e.g. the umask set to group writeability would work for the members of > the group, but not with core.splitIndex set, as members of the group > would not be able to access the shared index file. I am not sure what the above wants to say. If we are not making necessary call to adjust-shared-perm, then it is irrelevant that the lack of the call does not immediately cause an apparent problem for users who happens to have non-restrictive group perm bit in their umask. Another group member whose umask is tighter will eventually use the repository and end up creating a file unreadable to group members. Are you saying that we _lack_ necessary call when core.sharedRepository is set? If so, a commit that fixes such a bug would be the best place to have a paragraph like the above. If not, the above description simply misleads the readers. > Let's instead make the two consistent by using mks_tempfile_sm() and > passing 0666 in its `mode` argument. On the other hand, this is a relevant description; this patch kills an inconsistency that is very short lived (I am assuming that there is no bug in the current code before this patch and we make necessary calls to adjust-shared-perm when core.sharedrepository is set). > Note that we cannot use the create_tempfile() function itself that is > used to write the main ".git/index" file because we want the XXXXXX > part of the "sharedindex_XXXXXX" argument to be replaced by a pseudo > random value and create_tempfile() doesn't do that. Sure. Pseudo-random-ness is less important than the resulting filename being unique. "Because we are asking for a unique file to be created, we cannot use create_tempfile() interface that is designed to be used to create a file with known name." But is that really worth saying, I wonder. > Ideally we'd split up the adjust_shared_perm() function to one that > can give us the mode we want so we could just call open() instead of > open() followed by chmod(), but that's an unrelated cleanup. I would drop this paragraph, as I think this is totally incorrect. Imagine your umask is tighter than the target permission. You ask such a helper function and get "you want 0660". Doing open(0660) would not help you an iota---you'd need chmod() or fchmod() to adjust the result anyway, which already is done by adjust-shared-perm. > We already have that minor issue with the "index" file > #leftoverbits. The above "Ideally", which I suspect is totally bogus, would show up whey people look for that keyword in the list archive. This is one of the reasons why I try to write it after at least one person sanity checks that an idea floated is worth remembering. > Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> > Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx> > --- > > This is a simpler fix iterating from Ævar's RFC patch and the > following discussions: > > https://public-inbox.org/git/20181113153235.25402-1-avarab@xxxxxxxxx/ > > read-cache.c | 3 ++- > t/t1700-split-index.sh | 20 ++++++++++++++++++++ > 2 files changed, 22 insertions(+), 1 deletion(-) > > diff --git a/read-cache.c b/read-cache.c > index 8c924506dd..ea80600bff 100644 > --- a/read-cache.c > +++ b/read-cache.c > @@ -3165,7 +3165,8 @@ int write_locked_index(struct index_state *istate, struct lock_file *lock, > struct tempfile *temp; > int saved_errno; > > - temp = mks_tempfile(git_path("sharedindex_XXXXXX")); > + /* Same permissions as the main .git/index file */ > + temp = mks_tempfile_sm(git_path("sharedindex_XXXXXX"), 0, 0666); > if (!temp) { > oidclr(&si->base_oid); > ret = do_write_locked_index(istate, lock, flags); > diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh > index 2ac47aa0e4..fa1d3d468b 100755 > --- a/t/t1700-split-index.sh > +++ b/t/t1700-split-index.sh > @@ -381,6 +381,26 @@ test_expect_success 'check splitIndex.sharedIndexExpire set to "never" and "now" > test $(ls .git/sharedindex.* | wc -l) -le 2 > ' > > +test_expect_success POSIXPERM 'same mode for index & split index' ' > + git init same-mode && > + ( > + cd same-mode && > + test_commit A && > + test_modebits .git/index >index_mode && > + test_must_fail git config core.sharedRepository && > + git -c core.splitIndex=true status && > + shared=$(ls .git/sharedindex.*) && > + case "$shared" in > + *" "*) > + # we have more than one??? > + false ;; > + *) > + test_modebits "$shared" >split_index_mode && > + test_cmp index_mode split_index_mode ;; > + esac > + ) > +' > + > while read -r mode modebits > do > test_expect_success POSIXPERM "split index respects core.sharedrepository $mode" '
