Diffstat (limited to 'ui-plain.c')
| -rw-r--r-- | ui-plain.c | 171 |
1 files changed, 102 insertions, 69 deletions
@@ -1,15 +1,13 @@ /* ui-plain.c: functions for output of plain blobs by path * - * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com> + * Copyright (C) 2008 Lars Hjemli * * Licensed under GNU General Public License v2 * (see COPYING for full license text) */ -#define USE_THE_REPOSITORY_VARIABLE - +#include <stdio.h> #include "cgit.h" -#include "ui-plain.h" #include "html.h" #include "ui-shared.h" @@ -18,64 +16,103 @@ struct walk_tree_context { int match; }; -static int print_object(const struct object_id *oid, const char *path) +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) { enum object_type type; - char *buf, *mimetype; + char *buf, *ext; unsigned long size; + struct string_list_item *mime; + int freemime; - type = odb_read_object_info(the_repository->objects, oid, &size); + type = sha1_object_info(sha1, &size); if (type == OBJ_BAD) { - cgit_print_error_page(404, "Not found", "Not found"); + html_status(404, "Not found", 0); return 0; } - buf = odb_read_object(the_repository->objects, oid, &type, &size); + buf = read_sha1_file(sha1, &type, &size); if (!buf) { - cgit_print_error_page(404, "Not found", "Not found"); + html_status(404, "Not found", 0); return 0; } - - 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; + 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; } } - if (!ctx.page.mimetype) { - if (buffer_is_binary(buf, size)) { + if (buffer_is_binary(buf, size)) ctx.page.mimetype = "application/octet-stream"; - ctx.page.charset = NULL; - } else { + else ctx.page.mimetype = "text/plain"; - } } - ctx.page.filename = path; + ctx.page.filename = fmt("%s", path); ctx.page.size = size; - ctx.page.etag = oid_to_hex(oid); - cgit_print_http_headers(); + ctx.page.etag = sha1_to_hex(sha1); + cgit_print_http_headers(&ctx); html_raw(buf, size); - free(mimetype); - free(buf); + if (freemime) + free(ctx.page.mimetype); return 1; } static char *buildpath(const char *base, int baselen, const char *path) { if (path[0]) - return fmtalloc("%.*s%s/", baselen, base, path); + return fmt("%.*s%s/", baselen, base, path); else - return fmtalloc("%.*s/", baselen, base); + return fmt("%.*s/", baselen, base); } -static void print_dir(const struct object_id *oid, const char *base, +static void print_dir(const unsigned char *sha1, const char *base, int baselen, const char *path) { char *fullpath, *slash; @@ -83,8 +120,8 @@ static void print_dir(const struct object_id *oid, const char *base, fullpath = buildpath(base, baselen, path); slash = (fullpath[0] == '/' ? "" : "/"); - ctx.page.etag = oid_to_hex(oid); - cgit_print_http_headers(); + ctx.page.etag = sha1_to_hex(sha1); + cgit_print_http_headers(&ctx); htmlf("<html><head><title>%s", slash); html_txt(fullpath); htmlf("</title></head>\n<body>\n<h2>%s", slash); @@ -96,19 +133,16 @@ static void print_dir(const struct object_id *oid, const char *base, slash = strrchr(fullpath, '/'); if (slash) *(slash + 1) = 0; - else { - free(fullpath); + else fullpath = NULL; - } html("<li>"); - cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.oid, + cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.sha1, fullpath); html("</li>\n"); } - free(fullpath); } -static void print_dir_entry(const struct object_id *oid, const char *base, +static void print_dir_entry(const unsigned char *sha1, const char *base, int baselen, const char *path, unsigned mode) { char *fullpath; @@ -118,12 +152,11 @@ static void print_dir_entry(const struct object_id *oid, const char *base, fullpath[strlen(fullpath) - 1] = 0; html(" <li>"); if (S_ISGITLINK(mode)) { - cgit_submodule_link(NULL, fullpath, oid_to_hex(oid)); + cgit_submodule_link(NULL, fullpath, sha1_to_hex(sha1)); } else - cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.oid, + cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1, fullpath); html("</li>\n"); - free(fullpath); } static void print_dir_tail(void) @@ -131,22 +164,23 @@ static void print_dir_tail(void) html(" </ul>\n</body></html>\n"); } -static int walk_tree(const struct object_id *oid, struct strbuf *base, - const char *pathname, unsigned mode, void *cbdata) +static int walk_tree(const unsigned char *sha1, const char *base, int baselen, + const char *pathname, unsigned mode, int stage, + void *cbdata) { struct walk_tree_context *walk_tree_ctx = cbdata; - if (base->len == walk_tree_ctx->match_baselen) { - if (S_ISREG(mode) || S_ISLNK(mode)) { - if (print_object(oid, pathname)) + if (baselen == walk_tree_ctx->match_baselen) { + if (S_ISREG(mode)) { + if (print_object(sha1, pathname)) walk_tree_ctx->match = 1; } else if (S_ISDIR(mode)) { - print_dir(oid, base->buf, base->len, pathname); + print_dir(sha1, base, baselen, pathname); walk_tree_ctx->match = 2; return READ_TREE_RECURSIVE; } - } else if (base->len < INT_MAX && (int)base->len > walk_tree_ctx->match_baselen) { - print_dir_entry(oid, base->buf, base->len, pathname, mode); + } else if (baselen > walk_tree_ctx->match_baselen) { + print_dir_entry(sha1, base, baselen, pathname, mode); walk_tree_ctx->match = 2; } else if (S_ISDIR(mode)) { return READ_TREE_RECURSIVE; @@ -157,20 +191,20 @@ static int walk_tree(const struct object_id *oid, struct strbuf *base, static int basedir_len(const char *path) { - const char *p = strrchr(path, '/'); + char *p = strrchr(path, '/'); if (p) return p - path + 1; return 0; } -void cgit_print_plain(void) +void cgit_print_plain(struct cgit_context *ctx) { - const char *rev = ctx.qry.oid; - struct object_id oid; + const char *rev = ctx->qry.sha1; + unsigned char sha1[20]; 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, @@ -181,29 +215,28 @@ void cgit_print_plain(void) }; if (!rev) - rev = ctx.qry.head; + rev = ctx->qry.head; - if (repo_get_oid(the_repository, rev, &oid)) { - cgit_print_error_page(404, "Not found", "Not found"); + if (get_sha1(rev, sha1)) { + html_status(404, "Not found", 0); return; } - commit = lookup_commit_reference(the_repository, &oid); - if (!commit || repo_parse_commit(the_repository, commit)) { - cgit_print_error_page(404, "Not found", "Not found"); + commit = lookup_commit_reference(sha1); + if (!commit || parse_commit(commit)) { + html_status(404, "Not found", 0); return; } if (!path_items.match) { path_items.match = ""; walk_tree_ctx.match_baselen = -1; - print_dir(get_commit_tree_oid(commit), "", 0, ""); + print_dir(commit->tree->object.sha1, "", 0, ""); walk_tree_ctx.match = 2; } else walk_tree_ctx.match_baselen = basedir_len(path_items.match); - read_tree(the_repository, repo_get_commit_tree(the_repository, commit), - &paths, walk_tree, &walk_tree_ctx); + read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx); if (!walk_tree_ctx.match) - cgit_print_error_page(404, "Not found", "Not found"); + html_status(404, "Not found", 0); else if (walk_tree_ctx.match == 2) print_dir_tail(); } |