Diffstat (limited to 'ui-plain.c')
| -rw-r--r-- | ui-plain.c | 215 |
1 files changed, 76 insertions, 139 deletions
@@ -1,129 +1,82 @@ /* 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 "cgit.h" -#include "ui-plain.h" #include "html.h" #include "ui-shared.h" -struct walk_tree_context { - int match_baselen; - int match; -}; +int match_baselen; +int match; -static int print_object(const struct object_id *oid, const char *path) +static void 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; - 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"); - return 0; + html_status(404, "Not found", 0); + return; } - 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"); - return 0; + html_status(404, "Not found", 0); + return; } - - 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, '.'); + if (ext && *(++ext)) { + mime = string_list_lookup(&ctx.cfg.mimetypes, ext); + if (mime) + ctx.page.mimetype = (char *)mime->util; } - 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); - return 1; + match = 1; } -static char *buildpath(const char *base, int baselen, const char *path) +static void print_dir(const unsigned char *sha1, const char *path, + const char *base) { - if (path[0]) - return fmtalloc("%.*s%s/", baselen, base, path); + char *fullpath; + if (path[0] || base[0]) + fullpath = fmt("/%s%s/", base, path); else - return fmtalloc("%.*s/", baselen, base); -} - -static void print_dir(const struct object_id *oid, const char *base, - int baselen, const char *path) -{ - char *fullpath, *slash; - size_t len; - - fullpath = buildpath(base, baselen, path); - slash = (fullpath[0] == '/' ? "" : "/"); - 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); - html_txt(fullpath); - html("</h2>\n<ul>\n"); - len = strlen(fullpath); - if (len > 1) { - fullpath[len - 1] = 0; - slash = strrchr(fullpath, '/'); - if (slash) - *(slash + 1) = 0; - else { - free(fullpath); - fullpath = NULL; - } - html("<li>"); - cgit_plain_link("../", NULL, NULL, ctx.qry.head, ctx.qry.oid, - fullpath); - html("</li>\n"); - } - free(fullpath); + fullpath = "/"; + ctx.page.etag = sha1_to_hex(sha1); + cgit_print_http_headers(&ctx); + htmlf("<html><head><title>%s</title></head>\n<body>\n" + " <h2>%s</h2>\n <ul>\n", fullpath, fullpath); + if (path[0] || base[0]) + html(" <li><a href=\"../\">../</a></li>\n"); + match = 2; } -static void print_dir_entry(const struct object_id *oid, const char *base, - int baselen, const char *path, unsigned mode) +static void print_dir_entry(const unsigned char *sha1, const char *path, + unsigned mode) { - char *fullpath; - - fullpath = buildpath(base, baselen, path); - if (!S_ISDIR(mode) && !S_ISGITLINK(mode)) - fullpath[strlen(fullpath) - 1] = 0; - html(" <li>"); - if (S_ISGITLINK(mode)) { - cgit_submodule_link(NULL, fullpath, oid_to_hex(oid)); - } else - cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.oid, - fullpath); - html("</li>\n"); - free(fullpath); + const char *sep = ""; + if (S_ISDIR(mode)) + sep = "/"; + htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep); + match = 2; } static void print_dir_tail(void) @@ -131,79 +84,63 @@ 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)) - walk_tree_ctx->match = 1; - } else if (S_ISDIR(mode)) { - print_dir(oid, base->buf, base->len, pathname); - walk_tree_ctx->match = 2; + if (baselen == match_baselen) { + if (S_ISREG(mode)) + print_object(sha1, pathname); + else if (S_ISDIR(mode)) { + print_dir(sha1, pathname, base); 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); - walk_tree_ctx->match = 2; - } else if (S_ISDIR(mode)) { - return READ_TREE_RECURSIVE; } + else if (baselen > match_baselen) + print_dir_entry(sha1, pathname, mode); + else if (S_ISDIR(mode)) + return READ_TREE_RECURSIVE; return 0; } 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 - }; - struct pathspec paths = { - .nr = 1, - .items = &path_items - }; - struct walk_tree_context walk_tree_ctx = { - .match = 0 - }; + const char *paths[] = {ctx->qry.path, NULL}; 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, ""); - walk_tree_ctx.match = 2; + if (!paths[0]) { + paths[0] = ""; + match_baselen = -1; + print_dir(commit->tree->object.sha1, "", ""); } 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); - if (!walk_tree_ctx.match) - cgit_print_error_page(404, "Not found", "Not found"); - else if (walk_tree_ctx.match == 2) + match_baselen = basedir_len(paths[0]); + read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); + if (!match) + html_status(404, "Not found", 0); + else if (match == 2) print_dir_tail(); } |