ui-shared: use the same snapshot logic as ui-refs

[ps-cgit] / ui-snapshot.c

diff --git a/ui-snapshot.c b/ui-snapshot.c
index 7374d9d851ca70fb4d53e3d1fd22426d9c9f48e5..abf83995011075db6668810a8df3da993fc109d5 100644 (file)
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -1,26 +1,46 @@
 /* ui-snapshot.c: generate snapshot of a commit
  *
 /* ui-snapshot.c: generate snapshot of a commit
  *

- * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2012 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"

+#include "ui-snapshot.h"

 #include "html.h"
 #include "ui-shared.h"
 
 static int write_archive_type(const char *format, const char *hex, const char *prefix)
 {
        struct argv_array argv = ARGV_ARRAY_INIT;
 #include "html.h"
 #include "ui-shared.h"
 
 static int write_archive_type(const char *format, const char *hex, const char *prefix)
 {
        struct argv_array argv = ARGV_ARRAY_INIT;

+       const char **nargv;
+       int result;
+       argv_array_push(&argv, "snapshot");

        argv_array_push(&argv, format);
        if (prefix) {
        argv_array_push(&argv, format);
        if (prefix) {

+               struct strbuf buf = STRBUF_INIT;
+               strbuf_addstr(&buf, prefix);
+               strbuf_addch(&buf, '/');

                argv_array_push(&argv, "--prefix");
                argv_array_push(&argv, "--prefix");

-               argv_array_push(&argv, fmt("%s/", prefix));
+               argv_array_push(&argv, buf.buf);
+               strbuf_release(&buf);

        }
        argv_array_push(&argv, hex);
        }
        argv_array_push(&argv, hex);

-       return write_archive(argv.argc, argv.argv, NULL, 1, NULL, 0);
+       /*
+        * Now we need to copy the pointers to arguments into a new
+        * structure because write_archive will rearrange its arguments
+        * which may result in duplicated/missing entries causing leaks
+        * or double-frees in argv_array_clear.
+        */
+       nargv = xmalloc(sizeof(char *) * (argv.argc + 1));
+       /* argv_array guarantees a trailing NULL entry. */
+       memcpy(nargv, argv.argv, sizeof(char *) * (argv.argc + 1));
+
+       result = write_archive(argv.argc, nargv, NULL, NULL, 0);
+       argv_array_clear(&argv);
+       free(nargv);
+       return result;

 }
 
 static int write_tar_archive(const char *hex, const char *prefix)
 }
 
 static int write_tar_archive(const char *hex, const char *prefix)


@@ -38,13 +58,12 @@ static int write_compressed_tar_archive(const char *hex,
                                        char *filter_argv[])
 {
        int rv;
                                        char *filter_argv[])
 {
        int rv;

-       struct cgit_filter f;
+       struct cgit_exec_filter f;
+       cgit_exec_filter_init(&f, filter_argv[0], filter_argv);

 
 

-       f.cmd = filter_argv[0];
-       f.argv = filter_argv;
-       cgit_open_filter(&f);
+       cgit_open_filter(&f.base);

        rv = write_tar_archive(hex, prefix);
        rv = write_tar_archive(hex, prefix);

-       cgit_close_filter(&f);
+       cgit_close_filter(&f.base);

        return rv;
 }
 
        return rv;
 }
 


@@ -72,20 +91,15 @@ const struct cgit_snapshot_format cgit_snapshot_formats[] = {
        { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 },
        { ".tar", "application/x-tar", write_tar_archive, 0x08 },
        { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 },
        { ".tar.bz2", "application/x-bzip2", write_tar_bzip2_archive, 0x04 },
        { ".tar", "application/x-tar", write_tar_archive, 0x08 },
        { ".tar.xz", "application/x-xz", write_tar_xz_archive, 0x10 },

-       {}
+       { NULL }

 };
 
 static const struct cgit_snapshot_format *get_format(const char *filename)
 {
        const struct cgit_snapshot_format *fmt;
 };
 
 static const struct cgit_snapshot_format *get_format(const char *filename)
 {
        const struct cgit_snapshot_format *fmt;

-       int fl, sl;
-
-       fl = strlen(filename);
-       for(fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
-               sl = strlen(fmt->suffix);
-               if (sl >= fl)
-                       continue;
-               if (!strcmp(fmt->suffix, filename + fl - sl))
+
+       for (fmt = cgit_snapshot_formats; fmt->suffix; fmt++) {
+               if (ends_with(filename, fmt->suffix))

                        return fmt;
        }
        return NULL;
                        return fmt;
        }
        return NULL;


@@ -95,19 +109,22 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
                         const char *hex, const char *prefix,
                         const char *filename)
 {
                         const char *hex, const char *prefix,
                         const char *filename)
 {

-       unsigned char sha1[20];
+       struct object_id oid;

 
 

-       if (get_sha1(hex, sha1)) {
-               cgit_print_error(fmt("Bad object id: %s", hex));
+       if (get_oid(hex, &oid)) {
+               cgit_print_error_page(404, "Not found",
+                               "Bad object id: %s", hex);

                return 1;
        }
                return 1;
        }

-       if (!lookup_commit_reference(sha1)) {
-               cgit_print_error(fmt("Not a commit reference: %s", hex));
+       if (!lookup_commit_reference(&oid)) {
+               cgit_print_error_page(400, "Bad request",
+                               "Not a commit reference: %s", hex);

                return 1;
        }
                return 1;
        }

+       ctx.page.etag = oid_to_hex(&oid);

        ctx.page.mimetype = xstrdup(format->mimetype);
        ctx.page.filename = xstrdup(filename);
        ctx.page.mimetype = xstrdup(format->mimetype);
        ctx.page.filename = xstrdup(filename);

-       cgit_print_http_headers(&ctx);
+       cgit_print_http_headers();

        format->write_func(hex, prefix);
        return 0;
 }
        format->write_func(hex, prefix);
        return 0;
 }


@@ -119,71 +136,74 @@ static int make_snapshot(const struct cgit_snapshot_format *format,
  * repo_basename(), we strip the basename and any following '-' and '_'
  * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once
  * more. If this still isn't a valid commit object name, we check if pre-
  * repo_basename(), we strip the basename and any following '-' and '_'
  * characters ("cgit-0.7.2" -> "0.7.2") and check the resulting name once
  * more. If this still isn't a valid commit object name, we check if pre-

- * pending a 'v' to the remaining snapshot name ("0.7.2" -> "v0.7.2") gives
- * us something valid.
+ * pending a 'v' or a 'V' to the remaining snapshot name ("0.7.2" ->
+ * "v0.7.2") gives us something valid.

  */
  */

-static const char *get_ref_from_filename(const char *url, const char *filename,
+static const char *get_ref_from_filename(const struct cgit_repo *repo,
+                                        const char *filename,

                                         const struct cgit_snapshot_format *format)
 {
        const char *reponame;
                                         const struct cgit_snapshot_format *format)
 {
        const char *reponame;

-       unsigned char sha1[20];
-       char *snapshot;
-
-       snapshot = xstrdup(filename);
-       snapshot[strlen(snapshot) - strlen(format->suffix)] = '\0';
-
-       if (get_sha1(snapshot, sha1) == 0)
-               return snapshot;
-
-       reponame = cgit_repobasename(url);
-       if (prefixcmp(snapshot, reponame) == 0) {
-               snapshot += strlen(reponame);
-               while (snapshot && (*snapshot == '-' || *snapshot == '_'))
-                       snapshot++;
+       struct object_id oid;
+       struct strbuf snapshot = STRBUF_INIT;
+       int result = 1;
+
+       strbuf_addstr(&snapshot, filename);
+       strbuf_setlen(&snapshot, snapshot.len - strlen(format->suffix));
+
+       if (get_oid(snapshot.buf, &oid) == 0)
+               goto out;
+
+       reponame = cgit_snapshot_prefix(repo);
+       if (starts_with(snapshot.buf, reponame)) {
+               const char *new_start = snapshot.buf;
+               new_start += strlen(reponame);
+               while (new_start && (*new_start == '-' || *new_start == '_'))
+                       new_start++;
+               strbuf_splice(&snapshot, 0, new_start - snapshot.buf, "", 0);

        }
 
        }
 

-       if (get_sha1(snapshot, sha1) == 0)
-               return snapshot;
+       if (get_oid(snapshot.buf, &oid) == 0)
+               goto out;

 
 

-       snapshot = fmt("v%s", snapshot);
-       if (get_sha1(snapshot, sha1) == 0)
-               return snapshot;
+       strbuf_insert(&snapshot, 0, "v", 1);
+       if (get_oid(snapshot.buf, &oid) == 0)
+               goto out;

 
 

-       return NULL;
-}
+       strbuf_splice(&snapshot, 0, 1, "V", 1);
+       if (get_oid(snapshot.buf, &oid) == 0)
+               goto out;

 
 

-void show_error(char *msg)
-{
-       ctx.page.mimetype = "text/html";
-       cgit_print_http_headers(&ctx);
-       cgit_print_docstart(&ctx);
-       cgit_print_pageheader(&ctx);
-       cgit_print_error(msg);
-       cgit_print_docend();
+       result = 0;
+       strbuf_release(&snapshot);
+
+out:
+       return result ? strbuf_detach(&snapshot, NULL) : NULL;

 }
 
 void cgit_print_snapshot(const char *head, const char *hex,
 }
 
 void cgit_print_snapshot(const char *head, const char *hex,

-                        const char *filename, int snapshots, int dwim)
+                        const char *filename, int dwim)

 {
        const struct cgit_snapshot_format* f;
        char *prefix = NULL;
 
        if (!filename) {
 {
        const struct cgit_snapshot_format* f;
        char *prefix = NULL;
 
        if (!filename) {

-               show_error("No snapshot name specified");
+               cgit_print_error_page(400, "Bad request",
+                               "No snapshot name specified");

                return;
        }
 
        f = get_format(filename);
                return;
        }
 
        f = get_format(filename);

-       if (!f) {
-               show_error(xstrdup(fmt("Unsupported snapshot format: %s",
-                                      filename)));
+       if (!f || !(ctx.repo->snapshots & f->bit)) {
+               cgit_print_error_page(400, "Bad request",
+                               "Unsupported snapshot format: %s", filename);

                return;
        }
 
        if (!hex && dwim) {
                return;
        }
 
        if (!hex && dwim) {

-               hex = get_ref_from_filename(ctx.repo->url, filename, f);
+               hex = get_ref_from_filename(ctx.repo, filename, f);

                if (hex == NULL) {
                if (hex == NULL) {

-                       html_status(404, "Not found", 0);
+                       cgit_print_error_page(404, "Not found", "Not found");

                        return;
                }
                prefix = xstrdup(filename);
                        return;
                }
                prefix = xstrdup(filename);


@@ -194,7 +214,7 @@ void cgit_print_snapshot(const char *head, const char *hex,
                hex = head;
 
        if (!prefix)
                hex = head;
 
        if (!prefix)

-               prefix = xstrdup(cgit_repobasename(ctx.repo->url));
+               prefix = xstrdup(cgit_snapshot_prefix(ctx.repo));

 
        make_snapshot(f, hex, prefix, filename);
        free(prefix);
 
        make_snapshot(f, hex, prefix, filename);
        free(prefix);