summaryrefslogtreecommitdiff
path: root/transport.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-09-28 21:33:27 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-09-28 21:33:27 (GMT)
commitdf37727a65c87cf9bba35befca1255031649553f (patch)
tree1b94b1eff66ebbc258722f59b60ca64eac0c6de3 /transport.c
parentecad27cf98c391d5cfdc26ce0e442e02347baad0 (diff)
parent33cfccbbf35a56e190b79bdec5c85457c952a021 (diff)
downloadgit-df37727a65c87cf9bba35befca1255031649553f.zip
git-df37727a65c87cf9bba35befca1255031649553f.tar.gz
git-df37727a65c87cf9bba35befca1255031649553f.tar.bz2
Merge branch 'jk/transfer-limit-protocol' into maint-2.3
Diffstat (limited to 'transport.c')
-rw-r--r--transport.c21
1 files changed, 20 insertions, 1 deletions
diff --git a/transport.c b/transport.c
index 88bde1d..94fe865 100644
--- a/transport.c
+++ b/transport.c
@@ -909,6 +909,20 @@ static int external_specification_len(const char *url)
return strchr(url, ':') - url;
}
+void transport_check_allowed(const char *type)
+{
+ struct string_list allowed = STRING_LIST_INIT_DUP;
+ const char *v = getenv("GIT_ALLOW_PROTOCOL");
+
+ if (!v)
+ return;
+
+ string_list_split(&allowed, v, ':', -1);
+ if (!unsorted_string_list_has_string(&allowed, type))
+ die("transport '%s' not allowed", type);
+ string_list_clear(&allowed, 0);
+}
+
struct transport *transport_get(struct remote *remote, const char *url)
{
const char *helper;
@@ -940,12 +954,14 @@ struct transport *transport_get(struct remote *remote, const char *url)
if (helper) {
transport_helper_init(ret, helper);
} else if (starts_with(url, "rsync:")) {
+ transport_check_allowed("rsync");
ret->get_refs_list = get_refs_via_rsync;
ret->fetch = fetch_objs_via_rsync;
ret->push = rsync_transport_push;
ret->smart_options = NULL;
} else if (url_is_local_not_ssh(url) && is_file(url) && is_bundle(url, 1)) {
struct bundle_transport_data *data = xcalloc(1, sizeof(*data));
+ transport_check_allowed("file");
ret->data = data;
ret->get_refs_list = get_refs_from_bundle;
ret->fetch = fetch_refs_from_bundle;
@@ -957,7 +973,10 @@ struct transport *transport_get(struct remote *remote, const char *url)
|| starts_with(url, "ssh://")
|| starts_with(url, "git+ssh://")
|| starts_with(url, "ssh+git://")) {
- /* These are builtin smart transports. */
+ /*
+ * These are builtin smart transports; "allowed" transports
+ * will be checked individually in git_connect.
+ */
struct git_transport_data *data = xcalloc(1, sizeof(*data));
ret->data = data;
ret->set_option = NULL;