Rene Scharfe <rene.scharfe@xxxxxxxxxxxxxx> writes:
> Documentation/config.txt | 5 +++++
> builtin-upload-archive.c | 39 +++++++++++++++++++++++++++++++++++++++
> daemon.c | 2 ++
> 3 files changed, 46 insertions(+)
>
> diff --git a/Documentation/config.txt b/Documentation/config.txt
> index ce722a2..5c3c6c7 100644
> --- a/Documentation/config.txt
> +++ b/Documentation/config.txt
> @@ -236,6 +236,11 @@ tar.umask::
> the same permissions as gitlink:git-checkout[1] would use. The default
> value remains 0, which means world read-write.
>
> +uploadarchive.daemonformats::
> + A comma-separated list of the git-archive formats allowed for upload
> + via git-daemon. If this parameter is missing all formats are allowed
> + for upload.
> +
Fine -- do we have any other "list-ish" configuration variable,
by the way? I am just wondering if we earlier established a
convention to use some delimiter to list out things and if we do
have such a convention if delimiter is a comma or not.
> diff --git a/builtin-upload-archive.c b/builtin-upload-archive.c
> index 96f96bd..6a5245a 100644
> --- a/builtin-upload-archive.c
> +++ b/builtin-upload-archive.c
> @@ -16,6 +16,37 @@ static const char upload_archive_usage[]
> static const char deadchild[] =
> "git-upload-archive: archiver died with error";
>
> +static char *daemon_formats;
> +
> +static int upload_format_config(const char *var, const char *value)
> +{
> + if (!strcmp(var, "uploadarchive.daemonformats"))
> + daemon_formats = xstrdup(value);
> + return 0;
> +}
This let's the repository owner to decide what can be used.
> +static int upload_format_allowed(const char *fmt)
> +{
> + if (getenv("GIT_DAEMON"))
> + return daemon_formats ? is_in(fmt, daemon_formats, " \t,") : 1;
> + return 1;
> +}
And limits the allowed format when the environment set to the
value the repository owner decided.
> static int run_upload_archive(int argc, const char **argv, const char *prefix)
> {
> @@ -67,6 +100,12 @@ static int run_upload_archive(int argc,
> /* parse all options sent by the client */
> treeish_idx = parse_archive_args(sent_argc, sent_argv, &ar);
>
> + if (!upload_format_allowed(ar.name)) {
> + free(daemon_formats);
> + die("upload of %s format forbidden\n", ar.name);
> + }
> + free(daemon_formats);
> +
So we could enhance "--remote --list" to show what are supported
(both codewise and policywise) on the remote end, with a bit of
code restructuring?
> diff --git a/daemon.c b/daemon.c
> index a2954a0..2d58abe 100644
> --- a/daemon.c
> +++ b/daemon.c
> @@ -304,6 +304,8 @@ static int run_service(char *dir, struct
> return -1;
> }
>
> + setenv("GIT_DAEMON", "I am your father.", 1);
I suspect "upload_format_allowed()" can be taught to see what is
in this environment variable and sometimes take that as
daemon_format without letting the repository to override it, so
that the site administrator can limit the formats that can be
used further, just like daemon service mechanism lets them be in
control.
-
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html