Renamed repo-specific configuration for enable-html-serving in cgitrc.5.txt

[ps-cgit] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index e4beb997c371a6608e425519fff61c8ef19a3f87..97cf6394e7021f6a2935b1d98a632eb1da8f81ba 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";
@@ -133,7 +143,7 @@ static int walk_tree(const unsigned char *sha1, struct strbuf *base,
                        walk_tree_ctx->match = 2;
                        return READ_TREE_RECURSIVE;
                }
-       } else if (base->len > walk_tree_ctx->match_baselen) {
+       } else if (base->len < INT_MAX && (int)base->len > walk_tree_ctx->match_baselen) {
                print_dir_entry(sha1, base->buf, base->len, pathname, mode);
                walk_tree_ctx->match = 2;
        } else if (S_ISDIR(mode)) {
@@ -183,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