syntax-highlighting: always use utf-8 to avoid ascii codec issues

[cgit.git] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 0dd1a8b9129b2ffcdc983d300f83e2ab066e6432..ff85113718464ddbcf68af205a2fae1b6e3e86d1 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -37,6 +37,16 @@ static int print_object(const unsigned char *sha1, const char *path)
        mimetype = get_mimetype_for_filename(path);
        ctx.page.mimetype = mimetype;
 
+       if (!ctx.repo->enable_html_serving) {
+               html("X-Content-Type-Options: nosniff\n");
+               html("Content-Security-Policy: default-src 'none'\n");
+               if (mimetype) {
+                       /* Built-in white list allows PDF and everything that isn't text/ and application/ */
+                       if ((!strncmp(mimetype, "text/", 5) || !strncmp(mimetype, "application/", 12)) && strcmp(mimetype, "application/pdf"))
+                               ctx.page.mimetype = NULL;
+               }
+       }
+
        if (!ctx.page.mimetype) {
                if (buffer_is_binary(buf, size)) {
                        ctx.page.mimetype = "application/octet-stream";
@@ -51,6 +61,7 @@ static int print_object(const unsigned char *sha1, const char *path)
        cgit_print_http_headers();
        html_raw(buf, size);
        free(mimetype);
+       free(buf);
        return 1;
 }
 
@@ -83,8 +94,10 @@ static void print_dir(const unsigned char *sha1, const char *base,
                slash = strrchr(fullpath, '/');
                if (slash)
                        *(slash + 1) = 0;
-               else
+               else {
+                       free(fullpath);
                        fullpath = NULL;
+               }
                html("<li>");
                cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                                fullpath);
@@ -180,7 +193,7 @@ void cgit_print_plain(void)
        if (!path_items.match) {
                path_items.match = "";
                walk_tree_ctx.match_baselen = -1;
-               print_dir(commit->tree->object.sha1, "", 0, "");
+               print_dir(commit->tree->object.oid.hash, "", 0, "");
                walk_tree_ctx.match = 2;
        }
        else