From: "Carlos Martín Nieto" <cmn@elego.de>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, Albert Astals Cid <aacid@kde.org>
Subject: [PATCH] archive: re-allow HEAD:Documentation on a remote invocation
Date: Wed, 11 Jan 2012 13:12:38 +0100 [thread overview]
Message-ID: <1326283958-30271-1-git-send-email-cmn@elego.de> (raw)
In-Reply-To: <20120110232132.GA29245@sigill.intra.peff.net>
The tightening done in (ee27ca4a: archive: don't let remote clients
get unreachable commits, 2011-11-17) went too far and disallowed
HEAD:Documentation as it would try to find "HEAD:Documentation" as a
ref.
Only DWIM the "HEAD" part to see if it exists as a ref. Once we're
sure that we've been given a valid ref, we follow the normal code
path. This still disallows attempts to access commits which are not
branch tips.
Signed-off-by: Carlos Martín Nieto <cmn@elego.de>
---
AFAICT this should still be safe. Using HEAD^:Documentation or
<sha1>:Documentation still complains that HEAD^ and <sha1> aren't
refs.
archive.c | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/archive.c b/archive.c
index 164bbd0..4735bfb 100644
--- a/archive.c
+++ b/archive.c
@@ -260,14 +260,21 @@ static void parse_treeish_arg(const char **argv,
/* Remotes are only allowed to fetch actual refs */
if (remote) {
char *ref = NULL;
- if (!dwim_ref(name, strlen(name), sha1, &ref))
- die("no such ref: %s", name);
+ const char *refname, *colon = NULL;
+
+ colon = strchr(name, ':');
+ if (colon)
+ refname = xstrndup(name, colon - name);
+ else
+ refname = name;
+
+ if (!dwim_ref(refname, strlen(refname), sha1, &ref))
+ die("no such ref: %s", refname);
free(ref);
}
- else {
- if (get_sha1(name, sha1))
- die("Not a valid object name");
- }
+
+ if (get_sha1(name, sha1))
+ die("Not a valid object name");
commit = lookup_commit_reference_gently(sha1, 1);
if (commit) {
--
1.7.8.352.g876a6f
next prev parent reply other threads:[~2012-01-11 12:12 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-10 21:18 [BUG] git archive broken in 1.7.8.1 Albert Astals Cid
2012-01-10 21:33 ` Carlos Martín Nieto
2012-01-10 22:05 ` Albert Astals Cid
2012-01-10 22:50 ` Carlos Martín Nieto
2012-01-10 23:21 ` Jeff King
2012-01-11 12:12 ` Carlos Martín Nieto [this message]
2012-01-11 19:39 ` [PATCH] archive: re-allow HEAD:Documentation on a remote invocation Jeff King
2012-01-11 19:42 ` [PATCH 1/2] get_sha1_with_context: report features used in resolution Jeff King
2012-01-12 2:36 ` Junio C Hamano
2012-01-12 2:51 ` Jeff King
2012-01-11 19:42 ` [PATCH 2/2] archive: loosen restrictions on remote object lookup Jeff King
2013-05-29 12:05 ` Ian Harvey
2013-06-05 16:38 ` Jeff King
2013-06-05 22:35 ` [RFC/PATCH 0/4] real reachability checks for upload-archive Jeff King
2013-06-05 22:37 ` [PATCH 1/4] clear parsed flag when we free tree buffers Jeff King
2013-06-06 17:55 ` Junio C Hamano
2013-06-05 22:39 ` [PATCH 2/4] upload-archive: restrict remote objects with reachability check Jeff King
2013-06-05 22:40 ` [PATCH 3/4] list-objects: optimize "revs->blob_objects = 0" case Jeff King
2013-06-05 22:40 ` [PATCH 4/4] archive: ignore blob objects when checking reachability Jeff King
2013-06-06 7:57 ` Michael Haggerty
2013-06-07 0:50 ` Eric Sunshine
2013-06-06 17:27 ` [RFC/PATCH 0/4] real reachability checks for upload-archive Junio C Hamano
2012-01-12 2:46 ` [PATCH] archive: re-allow HEAD:Documentation on a remote invocation Junio C Hamano
2012-01-12 2:54 ` Jeff King
2012-01-12 2:59 ` Jeff King
2012-01-12 3:03 ` Junio C Hamano
2012-01-12 3:10 ` Jeff King
2012-01-12 3:20 ` Junio C Hamano
2012-01-10 23:01 ` [BUG] git archive broken in 1.7.8.1 Allan Wind
2012-01-11 12:51 ` Carlos Martín Nieto
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1326283958-30271-1-git-send-email-cmn@elego.de \
--to=cmn@elego.de \
--cc=aacid@kde.org \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).