ui-ssdiff: resolve HTML5 validation errors

[cgit.git] / ui-clone.c

diff --git a/ui-clone.c b/ui-clone.c
index 50569d6075f6ef94a3c4ebbd465ff648fb5b7486..5dccb639761a57f8e3176c52029ab5a5e57194dc 100644 (file)
--- a/ui-clone.c
+++ b/ui-clone.c
@@ -11,20 +11,22 @@
 #include "ui-clone.h"
 #include "html.h"
 #include "ui-shared.h"
+#include "packfile.h"
+#include "object-store.h"
 
-static int print_ref_info(const char *refname, const unsigned char *sha1,
+static int print_ref_info(const char *refname, const struct object_id *oid,
                           int flags, void *cb_data)
 {
        struct object *obj;
 
-       if (!(obj = parse_object(sha1)))
+       if (!(obj = parse_object(the_repository, oid)))
                return 0;
 
-       htmlf("%s\t%s\n", sha1_to_hex(sha1), refname);
+       htmlf("%s\t%s\n", oid_to_hex(oid), refname);
        if (obj->type == OBJ_TAG) {
-               if (!(obj = deref_tag(obj, refname, 0)))
+               if (!(obj = deref_tag(the_repository, obj, refname, 0)))
                        return 0;
-               htmlf("%s\t%s^{}\n", sha1_to_hex(obj->sha1), refname);
+               htmlf("%s\t%s^{}\n", oid_to_hex(&obj->oid), refname);
        }
        return 0;
 }
@@ -32,39 +34,45 @@ static int print_ref_info(const char *refname, const unsigned char *sha1,
 static void print_pack_info(void)
 {
        struct packed_git *pack;
-       int ofs;
+       char *offset;
 
        ctx.page.mimetype = "text/plain";
        ctx.page.filename = "objects/info/packs";
        cgit_print_http_headers();
-       ofs = strlen(ctx.repo->path) + strlen("/objects/pack/");
-       prepare_packed_git();
-       for (pack = packed_git; pack; pack = pack->next)
-               if (pack->pack_local)
-                       htmlf("P %s\n", pack->pack_name + ofs);
+       reprepare_packed_git(the_repository);
+       for (pack = get_packed_git(the_repository); pack; pack = pack->next) {
+               if (pack->pack_local) {
+                       offset = strrchr(pack->pack_name, '/');
+                       if (offset && offset[1] != '\0')
+                               ++offset;
+                       else
+                               offset = pack->pack_name;
+                       htmlf("P %s\n", offset);
+               }
+       }
 }
 
-static void send_file(char *path)
+static void send_file(const char *path)
 {
        struct stat st;
 
        if (stat(path, &st)) {
                switch (errno) {
                case ENOENT:
-                       html_status(404, "Not found", 0);
+                       cgit_print_error_page(404, "Not found", "Not found");
                        break;
                case EACCES:
-                       html_status(403, "Forbidden", 0);
+                       cgit_print_error_page(403, "Forbidden", "Forbidden");
                        break;
                default:
-                       html_status(400, "Bad request", 0);
+                       cgit_print_error_page(400, "Bad request", "Bad request");
                }
                return;
        }
        ctx.page.mimetype = "application/octet-stream";
        ctx.page.filename = path;
-       if (!starts_with(ctx.repo->path, path))
-               ctx.page.filename += strlen(ctx.repo->path) + 1;
+       skip_prefix(path, ctx.repo->path, &ctx.page.filename);
+       skip_prefix(ctx.page.filename, "/", &ctx.page.filename);
        cgit_print_http_headers();
        html_include(path);
 }
@@ -72,7 +80,7 @@ static void send_file(char *path)
 void cgit_clone_info(void)
 {
        if (!ctx.qry.path || strcmp(ctx.qry.path, "refs")) {
-               html_status(400, "Bad request", 0);
+               cgit_print_error_page(400, "Bad request", "Bad request");
                return;
        }
 
@@ -84,17 +92,32 @@ void cgit_clone_info(void)
 
 void cgit_clone_objects(void)
 {
-       if (!ctx.qry.path) {
-               html_status(400, "Bad request", 0);
-               return;
-       }
+       char *p;
+
+       if (!ctx.qry.path)
+               goto err;
 
        if (!strcmp(ctx.qry.path, "info/packs")) {
                print_pack_info();
                return;
        }
 
+       /* Avoid directory traversal by forbidding "..", but also work around
+        * other funny business by just specifying a fairly strict format. For
+        * example, now we don't have to stress out about the Cygwin port.
+        */
+       for (p = ctx.qry.path; *p; ++p) {
+               if (*p == '.' && *(p + 1) == '.')
+                       goto err;
+               if (!isalnum(*p) && *p != '/' && *p != '.' && *p != '-')
+                       goto err;
+       }
+
        send_file(git_path("objects/%s", ctx.qry.path));
+       return;
+
+err:
+       cgit_print_error_page(400, "Bad request", "Bad request");
 }
 
 void cgit_clone_head(void)