/* 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)
*/
-#include <stdio.h>
#include "cgit.h"
+#include "ui-plain.h"
#include "html.h"
#include "ui-shared.h"
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)
{
enum object_type type;
- char *buf, *ext;
+ char *buf, *mimetype;
unsigned long size;
- struct string_list_item *mime;
- int freemime;
type = sha1_object_info(sha1, &size);
if (type == OBJ_BAD) {
- html_status(404, "Not found", 0);
+ cgit_print_error_page(404, "Not found", "Not found");
return 0;
}
buf = read_sha1_file(sha1, &type, &size);
if (!buf) {
- html_status(404, "Not found", 0);
+ cgit_print_error_page(404, "Not found", "Not found");
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 (buffer_is_binary(buf, size))
+ if (buffer_is_binary(buf, size)) {
ctx.page.mimetype = "application/octet-stream";
- else
+ ctx.page.charset = NULL;
+ } else {
ctx.page.mimetype = "text/plain";
+ }
}
- ctx.page.filename = fmt("%s", path);
+ ctx.page.filename = path;
ctx.page.size = size;
ctx.page.etag = sha1_to_hex(sha1);
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
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 fmt("%.*s%s/", baselen, base, path);
+ return fmtalloc("%.*s%s/", baselen, base, path);
else
- return fmt("%.*s/", baselen, base);
+ return fmtalloc("%.*s/", baselen, base);
}
static void print_dir(const unsigned char *sha1, const char *base,
fullpath = buildpath(base, baselen, path);
slash = (fullpath[0] == '/' ? "" : "/");
ctx.page.etag = sha1_to_hex(sha1);
- cgit_print_http_headers(&ctx);
+ cgit_print_http_headers();
htmlf("<html><head><title>%s", slash);
html_txt(fullpath);
htmlf("</title></head>\n<body>\n<h2>%s", slash);
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);
html("</li>\n");
}
+ free(fullpath);
}
static void print_dir_entry(const unsigned char *sha1, const char *base,
cgit_plain_link(path, NULL, NULL, ctx.qry.head, ctx.qry.sha1,
fullpath);
html("</li>\n");
+ free(fullpath);
}
static void print_dir_tail(void)
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 unsigned char *sha1, struct strbuf *base,
+ const char *pathname, unsigned mode, int stage, void *cbdata)
{
struct walk_tree_context *walk_tree_ctx = cbdata;
- if (baselen == walk_tree_ctx->match_baselen) {
- if (S_ISREG(mode)) {
+ if (base->len == walk_tree_ctx->match_baselen) {
+ if (S_ISREG(mode) || S_ISLNK(mode)) {
if (print_object(sha1, pathname))
walk_tree_ctx->match = 1;
} else if (S_ISDIR(mode)) {
- print_dir(sha1, base, baselen, pathname);
+ print_dir(sha1, base->buf, base->len, pathname);
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(sha1, base->buf, base->len, pathname, mode);
walk_tree_ctx->match = 2;
} else if (S_ISDIR(mode)) {
return READ_TREE_RECURSIVE;
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 = {
- .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,
};
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;
}
- commit = lookup_commit_reference(sha1);
+ commit = lookup_commit_reference(&oid);
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;
- print_dir(commit->tree->object.sha1, "", 0, "");
+ print_dir(commit->tree->object.oid.hash, "", 0, "");
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);
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();
}
git.ckatri.com / cgit.git / blobdiff