mirror of
https://github.com/git/git.git
synced 2024-12-12 03:14:11 +08:00
e7da938570
Use of the `the_repository` variable is deprecated nowadays, and we slowly but steadily convert the codebase to not use it anymore. Instead, callers should be passing down the repository to work on via parameters. It is hard though to prove that a given code unit does not use this variable anymore. The most trivial case, merely demonstrating that there is no direct use of `the_repository`, is already a bit of a pain during code reviews as the reviewer needs to manually verify claims made by the patch author. The bigger problem though is that we have many interfaces that implicitly rely on `the_repository`. Introduce a new `USE_THE_REPOSITORY_VARIABLE` macro that allows code units to opt into usage of `the_repository`. The intent of this macro is to demonstrate that a certain code unit does not use this variable anymore, and to keep it from new dependencies on it in future changes, be it explicit or implicit For now, the macro only guards `the_repository` itself as well as `the_hash_algo`. There are many more known interfaces where we have an implicit dependency on `the_repository`, but those are not guarded at the current point in time. Over time though, we should start to add guards as required (or even better, just remove them). Define the macro as required in our code units. As expected, most of our code still relies on the global variable. Nearly all of our builtins rely on the variable as there is no way yet to pass `the_repository` to their entry point. For now, declare the macro in "biultin.h" to keep the required changes at least a little bit more contained. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
245 lines
5.8 KiB
C
245 lines
5.8 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "git-compat-util.h"
|
|
#include "environment.h"
|
|
#include "tag.h"
|
|
#include "object-name.h"
|
|
#include "object-store-ll.h"
|
|
#include "commit.h"
|
|
#include "tree.h"
|
|
#include "blob.h"
|
|
#include "alloc.h"
|
|
#include "gpg-interface.h"
|
|
#include "hex.h"
|
|
#include "packfile.h"
|
|
|
|
const char *tag_type = "tag";
|
|
|
|
static int run_gpg_verify(const char *buf, unsigned long size, unsigned flags)
|
|
{
|
|
struct signature_check sigc;
|
|
struct strbuf payload = STRBUF_INIT;
|
|
struct strbuf signature = STRBUF_INIT;
|
|
int ret;
|
|
|
|
memset(&sigc, 0, sizeof(sigc));
|
|
|
|
if (!parse_signature(buf, size, &payload, &signature)) {
|
|
if (flags & GPG_VERIFY_VERBOSE)
|
|
write_in_full(1, buf, size);
|
|
return error("no signature found");
|
|
}
|
|
|
|
sigc.payload_type = SIGNATURE_PAYLOAD_TAG;
|
|
sigc.payload = strbuf_detach(&payload, &sigc.payload_len);
|
|
ret = check_signature(&sigc, signature.buf, signature.len);
|
|
|
|
if (!(flags & GPG_VERIFY_OMIT_STATUS))
|
|
print_signature_buffer(&sigc, flags);
|
|
|
|
signature_check_clear(&sigc);
|
|
strbuf_release(&payload);
|
|
strbuf_release(&signature);
|
|
return ret;
|
|
}
|
|
|
|
int gpg_verify_tag(const struct object_id *oid, const char *name_to_report,
|
|
unsigned flags)
|
|
{
|
|
enum object_type type;
|
|
char *buf;
|
|
unsigned long size;
|
|
int ret;
|
|
|
|
type = oid_object_info(the_repository, oid, NULL);
|
|
if (type != OBJ_TAG)
|
|
return error("%s: cannot verify a non-tag object of type %s.",
|
|
name_to_report ?
|
|
name_to_report :
|
|
repo_find_unique_abbrev(the_repository, oid, DEFAULT_ABBREV),
|
|
type_name(type));
|
|
|
|
buf = repo_read_object_file(the_repository, oid, &type, &size);
|
|
if (!buf)
|
|
return error("%s: unable to read file.",
|
|
name_to_report ?
|
|
name_to_report :
|
|
repo_find_unique_abbrev(the_repository, oid, DEFAULT_ABBREV));
|
|
|
|
ret = run_gpg_verify(buf, size, flags);
|
|
|
|
free(buf);
|
|
return ret;
|
|
}
|
|
|
|
struct object *deref_tag(struct repository *r, struct object *o, const char *warn, int warnlen)
|
|
{
|
|
struct object_id *last_oid = NULL;
|
|
while (o && o->type == OBJ_TAG)
|
|
if (((struct tag *)o)->tagged) {
|
|
last_oid = &((struct tag *)o)->tagged->oid;
|
|
o = parse_object(r, last_oid);
|
|
} else {
|
|
last_oid = NULL;
|
|
o = NULL;
|
|
}
|
|
if (!o && warn) {
|
|
if (last_oid && is_promisor_object(last_oid))
|
|
return NULL;
|
|
if (!warnlen)
|
|
warnlen = strlen(warn);
|
|
error("missing object referenced by '%.*s'", warnlen, warn);
|
|
}
|
|
return o;
|
|
}
|
|
|
|
struct object *deref_tag_noverify(struct repository *r, struct object *o)
|
|
{
|
|
while (o && o->type == OBJ_TAG) {
|
|
o = parse_object(r, &o->oid);
|
|
if (o && o->type == OBJ_TAG && ((struct tag *)o)->tagged)
|
|
o = ((struct tag *)o)->tagged;
|
|
else
|
|
o = NULL;
|
|
}
|
|
return o;
|
|
}
|
|
|
|
struct tag *lookup_tag(struct repository *r, const struct object_id *oid)
|
|
{
|
|
struct object *obj = lookup_object(r, oid);
|
|
if (!obj)
|
|
return create_object(r, oid, alloc_tag_node(r));
|
|
return object_as_type(obj, OBJ_TAG, 0);
|
|
}
|
|
|
|
static timestamp_t parse_tag_date(const char *buf, const char *tail)
|
|
{
|
|
const char *dateptr;
|
|
|
|
while (buf < tail && *buf++ != '>')
|
|
/* nada */;
|
|
if (buf >= tail)
|
|
return 0;
|
|
dateptr = buf;
|
|
while (buf < tail && *buf++ != '\n')
|
|
/* nada */;
|
|
if (buf >= tail)
|
|
return 0;
|
|
/* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
|
|
return parse_timestamp(dateptr, NULL, 10);
|
|
}
|
|
|
|
void release_tag_memory(struct tag *t)
|
|
{
|
|
free(t->tag);
|
|
t->tagged = NULL;
|
|
t->object.parsed = 0;
|
|
t->date = 0;
|
|
}
|
|
|
|
int parse_tag_buffer(struct repository *r, struct tag *item, const void *data, unsigned long size)
|
|
{
|
|
struct object_id oid;
|
|
char type[20];
|
|
const char *bufptr = data;
|
|
const char *tail = bufptr + size;
|
|
const char *nl;
|
|
|
|
if (item->object.parsed)
|
|
return 0;
|
|
|
|
if (item->tag) {
|
|
/*
|
|
* Presumably left over from a previous failed parse;
|
|
* clear it out in preparation for re-parsing (we'll probably
|
|
* hit the same error, which lets us tell our current caller
|
|
* about the problem).
|
|
*/
|
|
FREE_AND_NULL(item->tag);
|
|
}
|
|
|
|
if (size < the_hash_algo->hexsz + 24)
|
|
return -1;
|
|
if (memcmp("object ", bufptr, 7) || parse_oid_hex(bufptr + 7, &oid, &bufptr) || *bufptr++ != '\n')
|
|
return -1;
|
|
|
|
if (!starts_with(bufptr, "type "))
|
|
return -1;
|
|
bufptr += 5;
|
|
nl = memchr(bufptr, '\n', tail - bufptr);
|
|
if (!nl || sizeof(type) <= (nl - bufptr))
|
|
return -1;
|
|
memcpy(type, bufptr, nl - bufptr);
|
|
type[nl - bufptr] = '\0';
|
|
bufptr = nl + 1;
|
|
|
|
if (!strcmp(type, blob_type)) {
|
|
item->tagged = (struct object *)lookup_blob(r, &oid);
|
|
} else if (!strcmp(type, tree_type)) {
|
|
item->tagged = (struct object *)lookup_tree(r, &oid);
|
|
} else if (!strcmp(type, commit_type)) {
|
|
item->tagged = (struct object *)lookup_commit(r, &oid);
|
|
} else if (!strcmp(type, tag_type)) {
|
|
item->tagged = (struct object *)lookup_tag(r, &oid);
|
|
} else {
|
|
return error("unknown tag type '%s' in %s",
|
|
type, oid_to_hex(&item->object.oid));
|
|
}
|
|
|
|
if (!item->tagged)
|
|
return error("bad tag pointer to %s in %s",
|
|
oid_to_hex(&oid),
|
|
oid_to_hex(&item->object.oid));
|
|
|
|
if (bufptr + 4 < tail && starts_with(bufptr, "tag "))
|
|
; /* good */
|
|
else
|
|
return -1;
|
|
bufptr += 4;
|
|
nl = memchr(bufptr, '\n', tail - bufptr);
|
|
if (!nl)
|
|
return -1;
|
|
item->tag = xmemdupz(bufptr, nl - bufptr);
|
|
bufptr = nl + 1;
|
|
|
|
if (bufptr + 7 < tail && starts_with(bufptr, "tagger "))
|
|
item->date = parse_tag_date(bufptr, tail);
|
|
else
|
|
item->date = 0;
|
|
|
|
item->object.parsed = 1;
|
|
return 0;
|
|
}
|
|
|
|
int parse_tag(struct tag *item)
|
|
{
|
|
enum object_type type;
|
|
void *data;
|
|
unsigned long size;
|
|
int ret;
|
|
|
|
if (item->object.parsed)
|
|
return 0;
|
|
data = repo_read_object_file(the_repository, &item->object.oid, &type,
|
|
&size);
|
|
if (!data)
|
|
return error("Could not read %s",
|
|
oid_to_hex(&item->object.oid));
|
|
if (type != OBJ_TAG) {
|
|
free(data);
|
|
return error("Object %s not a tag",
|
|
oid_to_hex(&item->object.oid));
|
|
}
|
|
ret = parse_tag_buffer(the_repository, item, data, size);
|
|
free(data);
|
|
return ret;
|
|
}
|
|
|
|
struct object_id *get_tagged_oid(struct tag *tag)
|
|
{
|
|
if (!tag->tagged)
|
|
die("bad tag");
|
|
return &tag->tagged->oid;
|
|
}
|