packed-backend: add "packed-refs" header consistency check

In "packed-backend.c::create_snapshot", if there is a header (the line
which starts with '#'), we will check whether the line starts with "#
pack-refs with: ". However, we need to consider other situations and
discuss whether we need to add checks.

1. If the header does not exist, we should not report an error to the
   user. This is because in older Git version, we never write header in
   the "packed-refs" file. Also, we do allow no header in "packed-refs"
   in runtime.
2. If the header content does not start with "# packed-ref with: ", we
   should report an error just like what "create_snapshot" does. So,
   create a new fsck message "badPackedRefHeader(ERROR)" for this.
3. If the header content is not the same as the constant string
   "PACKED_REFS_HEADER". This is expected because we make it extensible
   intentionally and runtime "create_snapshot" won't complain about
   unknown traits. In order to align with the runtime behavior. There is
   no need to report.

As we have analyzed, we only need to check the case 2 in the above. In
order to do this, use "open_nofollow" function to get the file
descriptor and then read the "packed-refs" file via "strbuf_read". Like
what "create_snapshot" and other functions do, we could split the line
by finding the next newline in the buffer. When we cannot find a
newline, we could report an error.

So, create a function "packed_fsck_ref_next_line" to find the next
newline and if there is no such newline, use
"packedRefEntryNotTerminated(ERROR)" to report an error to the user.

Then, parse the first line to apply the checks. Update the test to
exercise the code.

Mentored-by: Patrick Steinhardt <ps@pks.im>
Mentored-by: Karthik Nayak <karthik.188@gmail.com>
Signed-off-by: shejialuo <shejialuo@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
shejialuo
2025-02-28 00:06:49 +08:00
committed by Junio C Hamano
parent 515579756c
commit c92e7e156e
4 changed files with 135 additions and 0 deletions

View File

@@ -1749,12 +1749,76 @@ static struct ref_iterator *packed_reflog_iterator_begin(struct ref_store *ref_s
return empty_ref_iterator_begin();
}
static int packed_fsck_ref_next_line(struct fsck_options *o,
unsigned long line_number, const char *start,
const char *eof, const char **eol)
{
int ret = 0;
*eol = memchr(start, '\n', eof - start);
if (!*eol) {
struct strbuf packed_entry = STRBUF_INIT;
struct fsck_ref_report report = { 0 };
strbuf_addf(&packed_entry, "packed-refs line %lu", line_number);
report.path = packed_entry.buf;
ret = fsck_report_ref(o, &report,
FSCK_MSG_PACKED_REF_ENTRY_NOT_TERMINATED,
"'%.*s' is not terminated with a newline",
(int)(eof - start), start);
/*
* There is no newline but we still want to parse it to the end of
* the buffer.
*/
*eol = eof;
strbuf_release(&packed_entry);
}
return ret;
}
static int packed_fsck_ref_header(struct fsck_options *o,
const char *start, const char *eol)
{
if (!starts_with(start, "# pack-refs with: ")) {
struct fsck_ref_report report = { 0 };
report.path = "packed-refs.header";
return fsck_report_ref(o, &report,
FSCK_MSG_BAD_PACKED_REF_HEADER,
"'%.*s' does not start with '# pack-refs with: '",
(int)(eol - start), start);
}
return 0;
}
static int packed_fsck_ref_content(struct fsck_options *o,
const char *start, const char *eof)
{
unsigned long line_number = 1;
const char *eol;
int ret = 0;
ret |= packed_fsck_ref_next_line(o, line_number, start, eof, &eol);
if (*start == '#') {
ret |= packed_fsck_ref_header(o, start, eol);
start = eol + 1;
line_number++;
}
return ret;
}
static int packed_fsck(struct ref_store *ref_store,
struct fsck_options *o,
struct worktree *wt)
{
struct packed_ref_store *refs = packed_downcast(ref_store,
REF_STORE_READ, "fsck");
struct strbuf packed_ref_content = STRBUF_INIT;
struct stat st;
int ret = 0;
int fd = -1;
@@ -1797,9 +1861,18 @@ static int packed_fsck(struct ref_store *ref_store,
goto cleanup;
}
if (strbuf_read(&packed_ref_content, fd, 0) < 0) {
ret = error_errno(_("unable to read '%s'"), refs->path);
goto cleanup;
}
ret = packed_fsck_ref_content(o, packed_ref_content.buf,
packed_ref_content.buf + packed_ref_content.len);
cleanup:
if (fd >= 0)
close(fd);
strbuf_release(&packed_ref_content);
return ret;
}