git: update to v2.25.0

[cgit.git] / ui-plain.c

diff --git a/ui-plain.c b/ui-plain.c
index 8ef4ec6ba525351a6ec6d906e5e3e5e795139c6b..b73c1cfed15fa0350d2004bf17107814f1165867 100644 (file)
--- a/ui-plain.c
+++ b/ui-plain.c
@@ -1,13 +1,13 @@
 /* ui-plain.c: functions for output of plain blobs by path
  *
 /* ui-plain.c: functions for output of plain blobs by path
  *

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

  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 

-#include <stdio.h>

 #include "cgit.h"
 #include "cgit.h"

+#include "ui-plain.h"

 #include "html.h"
 #include "ui-shared.h"
 
 #include "html.h"
 #include "ui-shared.h"
 


@@ -16,103 +16,64 @@ struct walk_tree_context {
        int match;
 };
 
        int match;
 };
 

-static char *get_mimetype_from_file(const char *filename, const char *ext)
-{
-       static const char *delimiters;
-       char *result;
-       FILE *fd;
-       char line[1024];
-       char *mimetype;
-       char *token;
-
-       if (!filename)
-               return NULL;
-
-       fd = fopen(filename, "r");
-       if (!fd)
-               return NULL;
-
-       delimiters = " \t\r\n";
-       result = NULL;
-
-       /* loop over all lines in the file */
-       while (!result && fgets(line, sizeof(line), fd)) {
-               mimetype = strtok(line, delimiters);
-
-               /* skip empty lines and comment lines */
-               if (!mimetype || (mimetype[0] == '#'))
-                       continue;
-
-               /* loop over all extensions of mimetype */
-               while ((token = strtok(NULL, delimiters))) {
-                       if (!strcasecmp(ext, token)) {
-                               result = xstrdup(mimetype);
-                               break;
-                       }
-               }
-       }
-       fclose(fd);
-
-       return result;
-}
-
-static int print_object(const unsigned char *sha1, const char *path)
+static int print_object(const struct object_id *oid, const char *path)

 {
        enum object_type type;
 {
        enum object_type type;

-       char *buf, *ext;
+       char *buf, *mimetype;

        unsigned long size;
        unsigned long size;

-       struct string_list_item *mime;
-       int freemime;

 
 

-       type = sha1_object_info(sha1, &size);
+       type = oid_object_info(the_repository, oid, &size);

        if (type == OBJ_BAD) {
        if (type == OBJ_BAD) {

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

                return 0;
        }
 
                return 0;
        }
 

-       buf = read_sha1_file(sha1, &type, &size);
+       buf = read_object_file(oid, &type, &size);

        if (!buf) {
        if (!buf) {

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

                return 0;
        }
                return 0;
        }

-       ctx.page.mimetype = NULL;
-       ext = strrchr(path, '.');
-       freemime = 0;
-       if (ext && *(++ext)) {
-               mime = string_list_lookup(&ctx.cfg.mimetypes, ext);
-               if (mime) {
-                       ctx.page.mimetype = (char *)mime->util;
-               } else {
-                       ctx.page.mimetype = get_mimetype_from_file(ctx.cfg.mimetype_file, ext);
-                       if (ctx.page.mimetype)
-                               freemime = 1;
+
+       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 (!ctx.page.mimetype) {

-               if (buffer_is_binary(buf, size))
+               if (buffer_is_binary(buf, size)) {

                        ctx.page.mimetype = "application/octet-stream";
                        ctx.page.mimetype = "application/octet-stream";

-               else
+                       ctx.page.charset = NULL;
+               } else {

                        ctx.page.mimetype = "text/plain";
                        ctx.page.mimetype = "text/plain";

+               }

        }
        }

-       ctx.page.filename = fmt("%s", path);
+       ctx.page.filename = path;

        ctx.page.size = size;
        ctx.page.size = size;

-       ctx.page.etag = sha1_to_hex(sha1);
-       cgit_print_http_headers(&ctx);
+       ctx.page.etag = oid_to_hex(oid);
+       cgit_print_http_headers();

        html_raw(buf, size);
        html_raw(buf, size);

-       if (freemime)
-               free(ctx.page.mimetype);
+       free(mimetype);
+       free(buf);

        return 1;
 }
 
 static char *buildpath(const char *base, int baselen, const char *path)
 {
        if (path[0])
        return 1;
 }
 
 static char *buildpath(const char *base, int baselen, const char *path)
 {
        if (path[0])

-               return fmt("%.*s%s/", baselen, base, path);
+               return fmtalloc("%.*s%s/", baselen, base, path);

        else
        else

-               return fmt("%.*s/", baselen, base);
+               return fmtalloc("%.*s/", baselen, base);

 }
 
 }
 

-static void print_dir(const unsigned char *sha1, const char *base,
+static void print_dir(const struct object_id *oid, const char *base,

                      int baselen, const char *path)
 {
        char *fullpath, *slash;
                      int baselen, const char *path)
 {
        char *fullpath, *slash;


@@ -120,8 +81,8 @@ static void print_dir(const unsigned char *sha1, const char *base,
 
        fullpath = buildpath(base, baselen, path);
        slash = (fullpath[0] == '/' ? "" : "/");
 
        fullpath = buildpath(base, baselen, path);
        slash = (fullpath[0] == '/' ? "" : "/");

-       ctx.page.etag = sha1_to_hex(sha1);
-       cgit_print_http_headers(&ctx);
+       ctx.page.etag = oid_to_hex(oid);
+       cgit_print_http_headers();

        htmlf("<html><head><title>%s", slash);
        html_txt(fullpath);
        htmlf("</title></head>\n<body>\n<h2>%s", slash);
        htmlf("<html><head><title>%s", slash);
        html_txt(fullpath);
        htmlf("</title></head>\n<body>\n<h2>%s", slash);


@@ -133,16 +94,19 @@ static void print_dir(const unsigned char *sha1, const char *base,
                slash = strrchr(fullpath, '/');
                if (slash)
                        *(slash + 1) = 0;
                slash = strrchr(fullpath, '/');
                if (slash)
                        *(slash + 1) = 0;

-               else
+               else {
+                       free(fullpath);

                        fullpath = NULL;
                        fullpath = NULL;

+               }

                html("<li>");
                cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                                fullpath);
                html("</li>\n");
        }
                html("<li>");
                cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                                fullpath);
                html("</li>\n");
        }

+       free(fullpath);

 }
 
 }
 

-static void print_dir_entry(const unsigned char *sha1, const char *base,
+static void print_dir_entry(const struct object_id *oid, const char *base,

                            int baselen, const char *path, unsigned mode)
 {
        char *fullpath;
                            int baselen, const char *path, unsigned mode)
 {
        char *fullpath;


@@ -152,11 +116,12 @@ static void print_dir_entry(const unsigned char *sha1, const char *base,
                fullpath[strlen(fullpath) - 1] = 0;
        html("  <li>");
        if (S_ISGITLINK(mode)) {
                fullpath[strlen(fullpath) - 1] = 0;
        html("  <li>");
        if (S_ISGITLINK(mode)) {

-               cgit_submodule_link(NULL, fullpath, sha1_to_hex(sha1));
+               cgit_submodule_link(NULL, fullpath, oid_to_hex(oid));

        } else
                cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                                fullpath);
        html("</li>\n");
        } else
                cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
                                fullpath);
        html("</li>\n");

+       free(fullpath);

 }
 
 static void print_dir_tail(void)
 }
 
 static void print_dir_tail(void)


@@ -164,23 +129,22 @@ static void print_dir_tail(void)
        html(" </ul>\n</body></html>\n");
 }
 
        html(" </ul>\n</body></html>\n");
 }
 

-static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
-                    const char *pathname, unsigned mode, int stage,
-                    void *cbdata)
+static int walk_tree(const struct object_id *oid, struct strbuf *base,
+               const char *pathname, unsigned mode, int stage, void *cbdata)

 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
 
 {
        struct walk_tree_context *walk_tree_ctx = cbdata;
 

-       if (baselen == walk_tree_ctx->match_baselen) {
-               if (S_ISREG(mode)) {
-                       if (print_object(sha1, pathname))
+       if (base->len == walk_tree_ctx->match_baselen) {
+               if (S_ISREG(mode) || S_ISLNK(mode)) {
+                       if (print_object(oid, pathname))

                                walk_tree_ctx->match = 1;
                } else if (S_ISDIR(mode)) {
                                walk_tree_ctx->match = 1;
                } else if (S_ISDIR(mode)) {

-                       print_dir(sha1, base, baselen, pathname);
+                       print_dir(oid, base->buf, base->len, pathname);

                        walk_tree_ctx->match = 2;
                        return READ_TREE_RECURSIVE;
                }
                        walk_tree_ctx->match = 2;
                        return READ_TREE_RECURSIVE;
                }

-       } else if (baselen > walk_tree_ctx->match_baselen) {
-               print_dir_entry(sha1, base, baselen, pathname, mode);
+       } else if (base->len < INT_MAX && (int)base->len > walk_tree_ctx->match_baselen) {
+               print_dir_entry(oid, base->buf, base->len, pathname, mode);

                walk_tree_ctx->match = 2;
        } else if (S_ISDIR(mode)) {
                return READ_TREE_RECURSIVE;
                walk_tree_ctx->match = 2;
        } else if (S_ISDIR(mode)) {
                return READ_TREE_RECURSIVE;


@@ -197,14 +161,14 @@ static int basedir_len(const char *path)
        return 0;
 }
 
        return 0;
 }
 

-void cgit_print_plain(struct cgit_context *ctx)
+void cgit_print_plain(void)

 {
 {

-       const char *rev = ctx->qry.sha1;
-       unsigned char sha1[20];
+       const char *rev = ctx.qry.sha1;
+       struct object_id oid;

        struct commit *commit;
        struct pathspec_item path_items = {
        struct commit *commit;
        struct pathspec_item path_items = {

-               .match = ctx->qry.path,
-               .len = ctx->qry.path ? strlen(ctx->qry.path) : 0
+               .match = ctx.qry.path,
+               .len = ctx.qry.path ? strlen(ctx.qry.path) : 0

        };
        struct pathspec paths = {
                .nr = 1,
        };
        struct pathspec paths = {
                .nr = 1,


@@ -215,28 +179,29 @@ void cgit_print_plain(struct cgit_context *ctx)
        };
 
        if (!rev)
        };
 
        if (!rev)

-               rev = ctx->qry.head;
+               rev = ctx.qry.head;

 
 

-       if (get_sha1(rev, sha1)) {
-               html_status(404, "Not found", 0);
+       if (get_oid(rev, &oid)) {
+               cgit_print_error_page(404, "Not found", "Not found");

                return;
        }
                return;
        }

-       commit = lookup_commit_reference(sha1);
+       commit = lookup_commit_reference(the_repository, &oid);

        if (!commit || parse_commit(commit)) {
        if (!commit || parse_commit(commit)) {

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

                return;
        }
        if (!path_items.match) {
                path_items.match = "";
                walk_tree_ctx.match_baselen = -1;
                return;
        }
        if (!path_items.match) {
                path_items.match = "";
                walk_tree_ctx.match_baselen = -1;

-               print_dir(commit->tree->object.sha1, "", 0, "");
+               print_dir(&commit->maybe_tree->object.oid, "", 0, "");

                walk_tree_ctx.match = 2;
        }
        else
                walk_tree_ctx.match_baselen = basedir_len(path_items.match);
                walk_tree_ctx.match = 2;
        }
        else
                walk_tree_ctx.match_baselen = basedir_len(path_items.match);

-       read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+       read_tree_recursive(the_repository, commit->maybe_tree,
+               "", 0, 0, &paths, walk_tree, &walk_tree_ctx);

        if (!walk_tree_ctx.match)
        if (!walk_tree_ctx.match)

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

        else if (walk_tree_ctx.match == 2)
                print_dir_tail();
 }
        else if (walk_tree_ctx.match == 2)
                print_dir_tail();
 }