kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

transport: refactor protocol whitelist code 

The current callers only want to die when their transport is
prohibited. But future callers want to query the mechanism
without dying.

Let's break out a few query functions, and also save the
results in a static list so we don't have to re-parse for
each query.

Based-on-a-patch-by: Blake Burkhart <bburky@bburky.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Jeff King 2015-09-22 18:03:49 -04:00 committed by Junio C Hamano
parent 33cfccbbf3
commit 5088d3b387
2 changed files with 44 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
transport.c
View File

@ -909,18 +909,40 @@ static int external_specification_len(const char *url)
return strchr(url, ':') - url; return strchr(url, ':') - url;
} }


static const struct string_list *protocol_whitelist(void)
{
static int enabled = -1;
static struct string_list allowed = STRING_LIST_INIT_DUP;

if (enabled < 0) {
const char *v = getenv("GIT_ALLOW_PROTOCOL");
if (v) {
string_list_split(&allowed, v, ':', -1);
string_list_sort(&allowed);
enabled = 1;
} else {
enabled = 0;
}
}

return enabled ? &allowed : NULL;
}

int is_transport_allowed(const char *type)
{
const struct string_list *allowed = protocol_whitelist();
return !allowed || string_list_has_string(allowed, type);
}

void transport_check_allowed(const char *type) void transport_check_allowed(const char *type)
{ {
struct string_list allowed = STRING_LIST_INIT_DUP; if (!is_transport_allowed(type))
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); die("transport '%s' not allowed", type);
string_list_clear(&allowed, 0); }

int transport_restrict_protocols(void)
{
return !!protocol_whitelist();
} }


struct transport *transport_get(struct remote *remote, const char *url) struct transport *transport_get(struct remote *remote, const char *url)

15
transport.h
View File

@ -132,13 +132,24 @@ struct transport {
/* Returns a transport suitable for the url */ /* Returns a transport suitable for the url */
struct transport *transport_get(struct remote *, const char *); struct transport *transport_get(struct remote *, const char *);


/*
* Check whether a transport is allowed by the environment. Type should
* generally be the URL scheme, as described in Documentation/git.txt
*/
int is_transport_allowed(const char *type);

/* /*
* Check whether a transport is allowed by the environment, * Check whether a transport is allowed by the environment,
* and die otherwise. type should generally be the URL scheme, * and die otherwise.
* as described in Documentation/git.txt
*/ */
void transport_check_allowed(const char *type); void transport_check_allowed(const char *type);


/*
* Returns true if the user has attempted to turn on protocol
* restrictions at all.
*/
int transport_restrict_protocols(void);

/* Transport options which apply to git:// and scp-style URLs */ /* Transport options which apply to git:// and scp-style URLs */


/* The program to use on the remote side to send a pack */ /* The program to use on the remote side to send a pack */