Junio C Hamano schrieb:
> * The 'master' branch has these since v1.6.2 in addition to the above.
>
> Carlos Manuel Duclos Vergara (1):
> git-archive: add --output=<file> to send output to a file
It just hit me that this is option can be used for a DoS attack (or
perhaps worse) when used in connection with --remote. We need to apply
it on the client side instead of sending it to the remote end. And
git-upload-archive needs to filter it out. Ugh.
Here's a quick and dirty patch to do the latter.
---
archive.c | 14 +++++++++-----
archive.h | 2 +-
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/archive.c b/archive.c
index c6aea83..c7534d7 100644
--- a/archive.c
+++ b/archive.c
@@ -260,7 +260,8 @@ static void create_output_file(const char *output_file)
PARSE_OPT_NOARG | PARSE_OPT_NONEG | PARSE_OPT_HIDDEN, NULL, (p) }
static int parse_archive_args(int argc, const char **argv,
- const struct archiver **ar, struct archiver_args *args)
+ const struct archiver **ar,
+ struct archiver_args *args, int local)
{
const char *format = "tar";
const char *base = NULL;
@@ -310,8 +311,11 @@ static int parse_archive_args(int argc, const char **argv,
if (!base)
base = "";
- if (output)
+ if (output) {
+ if (!local)
+ die("Unexpected option --output");
create_output_file(output);
+ }
if (list) {
for (i = 0; i < ARRAY_SIZE(archivers); i++)
@@ -343,13 +347,13 @@ static int parse_archive_args(int argc, const char **argv,
}
int write_archive(int argc, const char **argv, const char *prefix,
- int setup_prefix)
+ int local)
{
const struct archiver *ar = NULL;
struct archiver_args args;
- argc = parse_archive_args(argc, argv, &ar, &args);
- if (setup_prefix && prefix == NULL)
+ argc = parse_archive_args(argc, argv, &ar, &args, local);
+ if (local && prefix == NULL)
prefix = setup_git_directory();
parse_treeish_arg(argv, &args, prefix);
diff --git a/archive.h b/archive.h
index 0b15b35..f6c3c89 100644
--- a/archive.h
+++ b/archive.h
@@ -24,6 +24,6 @@ extern int write_tar_archive(struct archiver_args *);
extern int write_zip_archive(struct archiver_args *);
extern int write_archive_entries(struct archiver_args *args, write_archive_entry_fn_t write_entry);
-extern int write_archive(int argc, const char **argv, const char *prefix, int setup_prefix);
+extern int write_archive(int argc, const char **argv, const char *prefix, int local);
#endif /* ARCHIVE_H */
--
1.6.2
--
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
