mirror of
https://github.com/git/git.git
synced 2024-11-23 09:56:28 +08:00
d8faf50c36
In `write_head_info()` we announce references to the remote client. We
need to honor "transfer.hideRefs" here so that we do not announce any
references that the client shouldn't be able to learn about. This is
done via two separate mechanisms:
- We hand over exclude patterns to the reference backend. We can only
honor "plain" exclude patterns here that do not have prefixes with
special meaning such as "^" or "!". Filtering down the references is
handled by `hidden_refs_to_excludes()`.
- In `show_ref_cb()` we perform a second check against hidden refs.
For one this is done such that we can handle those special prefixes.
And second, handling exclude patterns in ref backends is optional,
so we also have to handle "normal" patterns.
The special-meaning "^" prefix alters whether a hidden ref applies to
the namespace-stripped reference name or the full name. So while we
would usually call `refs_for_each_namespaced_ref()` to only get those
references in the current namespace, we can't because we'd get the
already-rewritten reference names. Instead, we are forced to use
`refs_for_each_fullref_in()` and then manually strip away the namespace
prefix such that we have access to both names.
But this also means that we do not get namespace handling for exclude
patterns, which `refs_for_each_namespaced_ref()` brings for free. This
results in a bug because we potentially end up hiding away references
based on their namespaced name and not on the stripped name as we really
should be doing.
Fix this by manually rewriting the exclude patterns to their namespaced
variants.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
180 lines
6.3 KiB
Bash
Executable File
180 lines
6.3 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
test_description='fetch/push involving ref namespaces'
|
|
GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
|
|
export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
|
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
git config --global protocol.ext.allow user &&
|
|
test_tick &&
|
|
git init original &&
|
|
(
|
|
cd original &&
|
|
echo 0 >count &&
|
|
git add count &&
|
|
test_commit 0 &&
|
|
echo 1 >count &&
|
|
git add count &&
|
|
test_commit 1 &&
|
|
git remote add pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
|
|
git remote add pushee-unnamespaced ../pushee
|
|
) &&
|
|
commit0=$(cd original && git rev-parse HEAD^) &&
|
|
commit1=$(cd original && git rev-parse HEAD) &&
|
|
git init --bare pushee &&
|
|
git init puller
|
|
'
|
|
|
|
test_expect_success 'pushing into a repository using a ref namespace' '
|
|
(
|
|
cd original &&
|
|
git push pushee-namespaced main &&
|
|
git ls-remote pushee-namespaced >actual &&
|
|
printf "$commit1\trefs/heads/main\n" >expected &&
|
|
test_cmp expected actual &&
|
|
git push pushee-namespaced --tags &&
|
|
git ls-remote pushee-namespaced >actual &&
|
|
printf "$commit0\trefs/tags/0\n" >>expected &&
|
|
printf "$commit1\trefs/tags/1\n" >>expected &&
|
|
test_cmp expected actual &&
|
|
# Verify that the GIT_NAMESPACE environment variable works as well
|
|
GIT_NAMESPACE=namespace git ls-remote "ext::git %s ../pushee" >actual &&
|
|
test_cmp expected actual &&
|
|
# Verify that --namespace overrides GIT_NAMESPACE
|
|
GIT_NAMESPACE=garbage git ls-remote pushee-namespaced >actual &&
|
|
test_cmp expected actual &&
|
|
# Try a namespace with no content
|
|
git ls-remote "ext::git --namespace=garbage %s ../pushee" >actual &&
|
|
test_must_be_empty actual &&
|
|
git ls-remote pushee-unnamespaced >actual &&
|
|
sed -e "s|refs/|refs/namespaces/namespace/refs/|" expected >expected.unnamespaced &&
|
|
test_cmp expected.unnamespaced actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'pulling from a repository using a ref namespace' '
|
|
(
|
|
cd puller &&
|
|
git remote add -f pushee-namespaced "ext::git --namespace=namespace %s ../pushee" &&
|
|
git for-each-ref refs/ >actual &&
|
|
printf "$commit1 commit\trefs/remotes/pushee-namespaced/main\n" >expected &&
|
|
printf "$commit0 commit\trefs/tags/0\n" >>expected &&
|
|
printf "$commit1 commit\trefs/tags/1\n" >>expected &&
|
|
test_cmp expected actual
|
|
)
|
|
'
|
|
|
|
# This test with clone --mirror checks for possible regressions in clone
|
|
# or the machinery underneath it. It ensures that no future change
|
|
# causes clone to ignore refs in refs/namespaces/*. In particular, it
|
|
# protects against a regression caused by any future change to the refs
|
|
# machinery that might cause it to ignore refs outside of refs/heads/*
|
|
# or refs/tags/*. More generally, this test also checks the high-level
|
|
# functionality of using clone --mirror to back up a set of repos hosted
|
|
# in the namespaces of a single repo.
|
|
test_expect_success 'mirroring a repository using a ref namespace' '
|
|
git clone --mirror pushee mirror &&
|
|
(
|
|
cd mirror &&
|
|
git for-each-ref refs/ >actual &&
|
|
printf "$commit1 commit\trefs/namespaces/namespace/refs/heads/main\n" >expected &&
|
|
printf "$commit0 commit\trefs/namespaces/namespace/refs/tags/0\n" >>expected &&
|
|
printf "$commit1 commit\trefs/namespaces/namespace/refs/tags/1\n" >>expected &&
|
|
test_cmp expected actual
|
|
)
|
|
'
|
|
|
|
test_expect_success 'hide namespaced refs with transfer.hideRefs' '
|
|
GIT_NAMESPACE=namespace \
|
|
git -C pushee -c transfer.hideRefs=refs/tags \
|
|
ls-remote "ext::git %s ." >actual &&
|
|
printf "$commit1\trefs/heads/main\n" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'check that transfer.hideRefs does not match unstripped refs' '
|
|
git -C pushee pack-refs --all &&
|
|
GIT_NAMESPACE=namespace \
|
|
git -C pushee -c transfer.hideRefs=refs/namespaces/namespace/refs/tags \
|
|
ls-remote "ext::git %s ." >actual &&
|
|
printf "$commit1\trefs/heads/main\n" >expected &&
|
|
printf "$commit0\trefs/tags/0\n" >>expected &&
|
|
printf "$commit1\trefs/tags/1\n" >>expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'hide full refs with transfer.hideRefs' '
|
|
GIT_NAMESPACE=namespace \
|
|
git -C pushee -c transfer.hideRefs="^refs/namespaces/namespace/refs/tags" \
|
|
ls-remote "ext::git %s ." >actual &&
|
|
printf "$commit1\trefs/heads/main\n" >expected &&
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'try to update a hidden ref' '
|
|
test_config -C pushee transfer.hideRefs refs/heads/main &&
|
|
test_must_fail git -C original push pushee-namespaced main
|
|
'
|
|
|
|
test_expect_success 'try to update a ref that is not hidden' '
|
|
test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/main &&
|
|
git -C original push pushee-namespaced main
|
|
'
|
|
|
|
test_expect_success 'git-receive-pack(1) with transfer.hideRefs does not match unstripped refs during advertisement' '
|
|
git -C pushee update-ref refs/namespaces/namespace/refs/heads/foo/1 refs/namespaces/namespace/refs/heads/main &&
|
|
git -C pushee pack-refs --all &&
|
|
test_config -C pushee transfer.hideRefs refs/namespaces/namespace/refs/heads/foo &&
|
|
GIT_TRACE_PACKET="$(pwd)/trace" git -C original push pushee-namespaced main &&
|
|
test_grep refs/heads/foo/1 trace
|
|
'
|
|
|
|
test_expect_success 'try to update a hidden full ref' '
|
|
test_config -C pushee transfer.hideRefs "^refs/namespaces/namespace/refs/heads/main" &&
|
|
test_must_fail git -C original push pushee-namespaced main
|
|
'
|
|
|
|
test_expect_success 'set up ambiguous HEAD' '
|
|
git init ambiguous &&
|
|
(
|
|
cd ambiguous &&
|
|
git commit --allow-empty -m foo &&
|
|
git update-ref refs/namespaces/ns/refs/heads/one HEAD &&
|
|
git update-ref refs/namespaces/ns/refs/heads/two HEAD &&
|
|
git symbolic-ref refs/namespaces/ns/HEAD \
|
|
refs/namespaces/ns/refs/heads/two
|
|
)
|
|
'
|
|
|
|
test_expect_success 'clone chooses correct HEAD (v0)' '
|
|
GIT_NAMESPACE=ns git -c protocol.version=0 \
|
|
clone ambiguous ambiguous-v0 &&
|
|
echo refs/heads/two >expect &&
|
|
git -C ambiguous-v0 symbolic-ref HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'clone chooses correct HEAD (v2)' '
|
|
GIT_NAMESPACE=ns git -c protocol.version=2 \
|
|
clone ambiguous ambiguous-v2 &&
|
|
echo refs/heads/two >expect &&
|
|
git -C ambiguous-v2 symbolic-ref HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_expect_success 'denyCurrentBranch and unborn branch with ref namespace' '
|
|
(
|
|
cd original &&
|
|
git init unborn &&
|
|
git remote add unborn-namespaced "ext::git --namespace=namespace %s unborn" &&
|
|
test_must_fail git push unborn-namespaced HEAD:main &&
|
|
git -C unborn config receive.denyCurrentBranch updateInstead &&
|
|
git push unborn-namespaced HEAD:main
|
|
)
|
|
'
|
|
|
|
test_done
|