From: Junio C Hamano <gitster@pobox.com>
To: mkoegler@auto.tuwien.ac.at (Martin Koegler)
Cc: git@vger.kernel.org,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: Re: input validation in receive-pack
Date: Tue, 01 Jan 2008 19:07:25 -0800 [thread overview]
Message-ID: <7vzlvp3oya.fsf@gitster.siamese.dyndns.org> (raw)
In-Reply-To: <20080101213451.GA26772@auto.tuwien.ac.at> (Martin Koegler's message of "Tue, 1 Jan 2008 22:34:51 +0100")
mkoegler@auto.tuwien.ac.at (Martin Koegler) writes:
> In the function "static const char *update(struct command *cmd)" in
> receive-pack.c:
>
> | if (deny_non_fast_forwards && !is_null_sha1(new_sha1) &&
> | !is_null_sha1(old_sha1) &&
> | !prefixcmp(name, "refs/heads/")) {
> | struct commit *old_commit, *new_commit;
> | struct commit_list *bases, *ent;
> |
> | old_commit = (struct commit *)parse_object(old_sha1);
> | new_commit = (struct commit *)parse_object(new_sha1);
> | bases = get_merge_bases(old_commit, new_commit, 1);
> | for (ent = bases; ent; ent = ent->next)
> | if (!hashcmp(old_sha1, ent->item->object.sha1))
> | break;
> | free_commit_list(bases);
> | if (!ent) {
> | error("denying non-fast forward %s"
> | " (you should pull first)", name);
> | return "non-fast forward";
> | }
> | }
>
> As far as I understand the code, it assumes, that sha1 values provided
> by the client really point to a commit. Shouldn't there be a check for
> the object type?
Yes, 11031d7e9f34f6a20ff4a4bd4fa3e5e3c0024a57 seems to have been
a bit sloppy. The codepath to delete a ref may need to be lax
(see 28391a80a94d2b59d1d21f8264fe5dab91d77249) but there is no
excuse not to be strict when updating.
> Some lines above:
> | if (!prefixcmp(name, "refs/") && check_ref_format(name + 5)) {
> | error("refusing to create funny ref '%s' remotely", name);
> | return "funny refname";
> | }
>
> Is this code really correct?
Interesting. Things have been this way forever, I think. I do
not offhand see any reason not to refuse refs outside refs/, so
you can try
if (prefixcmp(name, "refs/") || check_ref_format(name + 5))
and see what happens. Some people may however want to push to
HEAD (that is ".git/HEAD" which is outside ".git/refs"), though.
> In the update code path, the check is done in refs.c:
> | struct ref_lock *lock_any_ref_for_update(const char *ref, const unsigned char *old_sha1, int flags)
> | {
> | if (check_ref_format(ref) == -1)
> | return NULL;
> | return lock_ref_sha1_basic(ref, old_sha1, flags, NULL);
> | }
>
> check_ref_format may also return -2 (less than two name levels) and -3
> (* at the end), which are ignored. Is it really intended, that
> receive-pack can create such refs.
Misconversion in 8558fd9ece4c8250a037a6d5482a8040d600ef47 that
changed check_ref_format() without looking at what its callers
are checking, I think.
next prev parent reply other threads:[~2008-01-02 3:08 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-01-01 21:34 input validation in receive-pack Martin Koegler
2008-01-02 3:07 ` Junio C Hamano [this message]
2008-01-02 5:01 ` Daniel Barkalow
2008-01-02 5:46 ` Junio C Hamano
2008-01-02 15:53 ` Daniel Barkalow
2008-01-02 19:14 ` Junio C Hamano
2008-01-02 7:51 ` Martin Koegler
2008-01-02 8:01 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vzlvp3oya.fsf@gitster.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=mkoegler@auto.tuwien.ac.at \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).