[PATCH 2/4] upload-pack.c: allow banning certain object filter(s)
Git clients may ask the server for a partial set of objects, where the set of objects being requested is refined by one or more object filters. Server administrators can configure 'git upload-pack' to allow or ban these filters by setting the 'uploadpack.allowFilter' variable to 'true' or 'false', respectively.
However, administrators using bitmaps may wish to allow certain kinds of object filters, but ban others. Specifically, they may wish to allow object filters that can be optimized by the use of bitmaps, while rejecting other object filters which aren't and represent a perceived performance degradation (as well as an increased load factor on the server).
Allow configuring 'git upload-pack' to support object filters on a case-by-case basis by introducing two new configuration variables:
- 'uploadpack.filter.allow'
- 'uploadpack.filter.<kind>.allow'
where '<kind>' may be one of 'blobNone', 'blobLimit', 'tree', and so on.
Setting the second configuration variable for any valid value of '<kind>' explicitly allows or disallows restricting that kind of object filter.
If a client requests the object filter <kind> and the respective configuration value is not set, 'git upload-pack' will default to the value of 'uploadpack.filter.allow', which itself defaults to 'true' to maintain backwards compatibility. Note that this differs from 'uploadpack.allowfilter', which controls whether or not the 'filter' capability is advertised.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
---
Documentation/config/uploadpack.txt | 16 ++++++
t/t5616-partial-clone.sh | 26 ++++++++++
upload-pack.c | 78 +++++++++++++++++++++++++++++
3 files changed, 120 insertions(+)
Show changes to 3 files +120 −0
Documentation/config/uploadpack.txt, t/t5616-partial-clone.sh, upload-pack.c
diff --git a/Documentation/config/uploadpack.txt b/Documentation/config/uploadpack.txt
index ed1c835695..fd4970306c 100644
--- a/Documentation/config/uploadpack.txt
+++ b/Documentation/config/uploadpack.txt
@@ -57,6 +57,22 @@ uploadpack.allowFilter::
If this option is set, `upload-pack` will support partial
clone and partial fetch object filtering.
+uploadpack.filter.allow::
+ Provides a default value for unspecified object filters (see: the
+ below configuration variable).
+ Defaults to `true`.
+
+uploadpack.filter.<filter>.allow::
+ Explicitly allow or ban the object filter corresponding to
+ `<filter>`, where `<filter>` may be one of: `blob:none`,
+ `blob:limit`, `tree`, `sparse:oid`, or `combine`. If using
+ combined filters, both `combine` and all of the nested filter
+ kinds must be allowed. Defaults to `uploadpack.filter.allow`.
++
+Note that the dot between 'filter' and '<filter>' is both non-standard
+and intentional. This is done to avoid a parsing ambiguity when
+specifying this configuration as an argument to Git's top-level `-c`.
+
uploadpack.allowRefInWant::
If this option is set, `upload-pack` will support the `ref-in-want`
feature of the protocol version 2 `fetch` command. This feature
diff --git a/t/t5616-partial-clone.sh b/t/t5616-partial-clone.sh
index 8a27452a51..5dcd0b5656 100755
--- a/t/t5616-partial-clone.sh
+++ b/t/t5616-partial-clone.sh
@@ -235,6 +235,32 @@ test_expect_success 'implicitly construct combine: filter with repeated flags' '
test_cmp unique_types.expected unique_types.actual
'
+test_expect_success 'upload-pack fails banned object filters' '
+ # Test case-insensitivity by intentional use of "blob:None" rather than
+ # "blob:none".
+ test_config -C srv.bare uploadpack.filter.blob:None.allow false &&
+ test_must_fail git clone --no-checkout --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 combine object filters' '
+ test_config -C srv.bare uploadpack.filter.allow false &&
+ test_config -C srv.bare uploadpack.filter.combine.allow true &&
+ test_config -C srv.bare uploadpack.filter.tree.allow true &&
+ test_config -C srv.bare uploadpack.filter.blob:none.allow false &&
+ test_must_fail 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 uploadpack.filter.allow false &&
+ test_must_fail git clone --no-checkout --filter=blob:none \
+ "file://$(pwd)/srv.bare" pc3 2>err &&
+ test_i18ngrep "filter '\''blob:none'\'' not supported" err
+'
+
test_expect_success 'partial clone fetches blobs pointed to by refs even if normally filtered out' '
rm -rf src dst &&
git init src &&
diff --git a/upload-pack.c b/upload-pack.c
index 39d0cf00be..a5f56d73cc 100644
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -88,6 +88,7 @@ struct upload_pack_data {
enum allow_uor allow_uor;
struct list_objects_filter_options filter_options;
+ struct string_list allowed_filters;
struct packet_writer writer;
@@ -103,6 +104,7 @@ struct upload_pack_data {
unsigned no_progress : 1;
unsigned use_include_tag : 1;
unsigned allow_filter : 1;
+ unsigned allow_filter_fallback : 1;
unsigned done : 1; /* v2 only */
unsigned allow_ref_in_want : 1; /* v2 only */
@@ -120,6 +122,7 @@ static void upload_pack_data_init(struct upload_pack_data *data)
struct string_list deepen_not = STRING_LIST_INIT_DUP;
struct string_list uri_protocols = STRING_LIST_INIT_DUP;
struct object_array extra_edge_obj = OBJECT_ARRAY_INIT;
+ struct string_list allowed_filters = STRING_LIST_INIT_DUP;
memset(data, 0, sizeof(*data));
data->symref = symref;
@@ -131,6 +134,8 @@ static void upload_pack_data_init(struct upload_pack_data *data)
data->deepen_not = deepen_not;
data->uri_protocols = uri_protocols;
data->extra_edge_obj = extra_edge_obj;
+ data->allowed_filters = allowed_filters;
+ data->allow_filter_fallback = 1;
packet_writer_init(&data->writer, 1);
data->keepalive = 5;
@@ -147,6 +152,7 @@ static void upload_pack_data_clear(struct upload_pack_data *data)
string_list_clear(&data->deepen_not, 0);
object_array_clear(&data->extra_edge_obj);
list_objects_filter_release(&data->filter_options);
+ string_list_clear(&data->allowed_filters, 1);
free((char *)data->pack_objects_hook);
}
@@ -983,6 +989,47 @@ static int process_deepen_not(const char *line, struct string_list *deepen_not,
return 0;
}
+static int allows_filter_choice(struct upload_pack_data *data,
+ enum list_objects_filter_choice c)
+{
+ const char *key = list_object_filter_config_name(c);
+ struct string_list_item *item = string_list_lookup(&data->allowed_filters,
+ key);
+ if (item)
+ return (intptr_t) item->util;
+ return data->allow_filter_fallback;
+}
+
+static struct list_objects_filter_options *banned_filter(
+ struct upload_pack_data *data,
+ struct list_objects_filter_options *opts)
+{
+ size_t i;
+
+ if (!allows_filter_choice(data, opts->choice))
+ return opts;
+
+ if (opts->choice == LOFC_COMBINE)
+ for (i = 0; i < opts->sub_nr; i++) {
+ struct list_objects_filter_options *sub = &opts->sub[i];
+ if (banned_filter(data, sub))
+ return sub;
+ }
+ return NULL;
+}
+
+static void die_if_using_banned_filter(struct upload_pack_data *data)
+{
+ struct list_objects_filter_options *banned = banned_filter(data,
+ &data->filter_options);
+ if (!banned)
+ return;
+
+ packet_writer_error(&data->writer, _("filter '%s' not supported\n"),
+ list_object_filter_config_name(banned->choice));
+ die(_("git upload-pack: banned object filter requested"));
+}
+
static void receive_needs(struct upload_pack_data *data,
struct packet_reader *reader)
{
@@ -1013,6 +1060,7 @@ static void receive_needs(struct upload_pack_data *data,
die("git upload-pack: filtering capability not negotiated");
list_objects_filter_die_if_populated(&data->filter_options);
parse_list_objects_filter(&data->filter_options, arg);
+ die_if_using_banned_filter(data);
continue;
}
@@ -1169,6 +1217,33 @@ static int find_symref(const char *refname, const struct object_id *oid,
return 0;
}
+static void parse_object_filter_config(const char *var, const char *value,
+ struct upload_pack_data *data)
+{
+ struct strbuf spec = STRBUF_INIT;
+ const char *sub, *key;
+ size_t sub_len;
+
+ if (parse_config_key(var, "uploadpack", &sub, &sub_len, &key))
+ return;
+ if (!sub || !skip_prefix(sub, "filter.", &sub))
+ return;
+
+ if (sub != key)
+ strbuf_add(&spec, sub, key - sub - 1);
+ strbuf_tolower(&spec);
+
+ if (!strcmp(key, "allow")) {
+ if (spec.len)
+ string_list_insert(&data->allowed_filters, spec.buf)->util =
+ (void *)(intptr_t)git_config_bool(var, value);
+ else
+ data->allow_filter_fallback = git_config_bool(var, value);
+ }
+
+ strbuf_release(&spec);
+}
+
static int upload_pack_config(const char *var, const char *value, void *cb_data)
{
struct upload_pack_data *data = cb_data;
@@ -1208,6 +1283,8 @@ static int upload_pack_config(const char *var, const char *value, void *cb_data)
return git_config_string(&data->pack_objects_hook, var, value);
}
+ parse_object_filter_config(var, value, data);
+
return parse_hide_refs_config(var, value, "uploadpack");
}
@@ -1388,6 +1465,7 @@ static void process_args(struct packet_reader *request,
if (data->allow_filter && skip_prefix(arg, "filter ", &p)) {
list_objects_filter_die_if_populated(&data->filter_options);
parse_list_objects_filter(&data->filter_options, p);
+ die_if_using_banned_filter(data);
continue;
}
--
2.27.0.225.g9fa765a71d
Taylor Blau
