Hi,
Here's the third re-roll of my series to teach upload-pack to allow only
certain kinds of object filters. The only thing that has changed since
last time is that we now *do* look for the error messages in t5616.
Normally these error messages may or may not show up (because of the
aforementioned SIGPIPE issue in 'git clone'), but since we are cloning
from a 'file://', we can guarantee that they will appear (and can thusly
be grepped for).
Taylor Blau (4):
list_objects_filter_options: introduce
'list_object_filter_config_name'
upload-pack.c: allow banning certain object filter(s)
upload-pack.c: pass 'struct list_objects_filter_options *'
upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth'
Documentation/config/uploadpack.txt | 18 +++++
list-objects-filter-options.c | 23 ++++++
list-objects-filter-options.h | 6 ++
t/t5616-partial-clone.sh | 33 +++++++++
upload-pack.c | 105 ++++++++++++++++++++++++++++
5 files changed, 185 insertions(+)
Range-diff against v2:
[...rebased on the tip of 'master']
1: 6a77af563e = 80: b1b3dd7de9 list_objects_filter_options: introduce 'list_object_filter_config_name'
2: 6dbf58441d ! 81: a0a0427757 upload-pack.c: allow banning certain object filter(s)
@@ t/t5616-partial-clone.sh: test_expect_success 'implicitly construct combine: fil
+test_expect_success 'upload-pack fails banned object filters' '
+ test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
-+ test_must_fail git clone --no-checkout --filter=blob:none \
++ test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
+ "file://$(pwd)/srv.bare" pc3 2>err &&
+ test_i18ngrep "filter '\''blob:none'\'' not supported" err
+'
@@ t/t5616-partial-clone.sh: test_expect_success 'implicitly construct combine: fil
+ test_config -C srv.bare uploadpackfilter.combine.allow true &&
+ test_config -C srv.bare uploadpackfilter.tree.allow true &&
+ test_config -C srv.bare uploadpackfilter.blob:none.allow false &&
-+ test_must_fail git clone --no-checkout --filter=tree:1 \
++ test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
+ --filter=blob:none "file://$(pwd)/srv.bare" pc3 2>err &&
+ test_i18ngrep "filter '\''blob:none'\'' not supported" err
+'
+
+test_expect_success 'upload-pack fails banned object filters with fallback' '
+ test_config -C srv.bare uploadpackfilter.allow false &&
-+ test_must_fail git clone --no-checkout --filter=blob:none \
++ test_must_fail ok=sigpipe git clone --no-checkout --filter=blob:none \
+ "file://$(pwd)/srv.bare" pc3 2>err &&
+ test_i18ngrep "filter '\''blob:none'\'' not supported" err
+'
@@ upload-pack.c: static int process_deepen_not(const char *line, struct string_lis
+{
+ struct list_objects_filter_options *banned = banned_filter(data,
+ &data->filter_options);
++ struct strbuf buf = STRBUF_INIT;
+ if (!banned)
+ return;
+
-+ die(_("git upload-pack: filter '%s' not supported"),
-+ list_object_filter_config_name(banned->choice));
++ strbuf_addf(&buf, "git upload-pack: filter '%s' not supported",
++ list_object_filter_config_name(banned->choice));
++
++ packet_writer_error(&data->writer, "%s\n", buf.buf);
++ die("%s", buf.buf);
+}
+
static void receive_needs(struct upload_pack_data *data,
3: bacdea47d9 = 82: ad3f0cce56 upload-pack.c: pass 'struct list_objects_filter_options *'
4: 79af94a41b ! 83: c9d71809f4 upload-pack.c: introduce 'uploadpackfilter.tree.maxDepth'
@@ t/t5616-partial-clone.sh: test_expect_success 'upload-pack fails banned object f
+ test_config -C srv.bare uploadpackfilter.tree.allow true &&
+ test_config -C srv.bare uploadpackfilter.tree.maxDepth 0 &&
+ test_must_fail ok=sigpipe git clone --no-checkout --filter=tree:1 \
-+ "file://$(pwd)/srv.bare" pc3
++ "file://$(pwd)/srv.bare" pc3 2>err &&
++ test_i18ngrep "filter '\''tree'\'' not supported (maximum depth: 0, but got: 1)" err
+'
+
test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
@@ upload-pack.c: static int allows_filter_choice(struct upload_pack_data *data,
}
@@ upload-pack.c: static void die_if_using_banned_filter(struct upload_pack_data *data)
- {
- struct list_objects_filter_options *banned = banned_filter(data,
- &data->filter_options);
-+ struct strbuf buf = STRBUF_INIT;
- if (!banned)
- return;
-- die(_("git upload-pack: filter '%s' not supported"),
-- list_object_filter_config_name(banned->choice));
-+ strbuf_addf(&buf, _("filter '%s' not supported"),
-+ list_object_filter_config_name(banned->choice));
+ strbuf_addf(&buf, "git upload-pack: filter '%s' not supported",
+ list_object_filter_config_name(banned->choice));
+ if (banned->choice == LOFC_TREE_DEPTH &&
+ data->tree_filter_max_depth != ULONG_MAX)
+ strbuf_addf(&buf, _(" (maximum depth: %lu, but got: %lu)"),
+ data->tree_filter_max_depth,
+ banned->tree_exclude_depth);
-+ die("%s", buf.buf);
- }
- static void receive_needs(struct upload_pack_data *data,
+ packet_writer_error(&data->writer, "%s\n", buf.buf);
+ die("%s", buf.buf);
@@ upload-pack.c: static int parse_object_filter_config(const char *var, const char *value,
if (!strcmp(key, "allow"))
string_list_insert(&data->allowed_filters, buf.buf)->util =
--
2.28.0.rc1.13.ge78abce653
