X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/ed5bd30ebe6921dd22948a3f33a314283f043606..4fb49864db51affddf37ab2a563b0eb4b33e155d:/ui-blob.c

diff --git a/ui-blob.c b/ui-blob.c
index 8f6989f..d388489 100644
--- a/ui-blob.c
+++ b/ui-blob.c
@@ -1,7 +1,6 @@
 /* ui-blob.c: show blob content
  *
- * Copyright (C) 2008 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -13,25 +12,55 @@
 #include "ui-shared.h"
 
 struct walk_tree_context {
-	char *match_path;
+	const char *match_path;
 	unsigned char *matched_sha1;
-	int found_path;
+	unsigned int found_path:1;
+	unsigned int file_only:1;
 };
 
-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 (strncmp(base, walk_tree_ctx->match_path, baselen)
-		|| strcmp(walk_tree_ctx->match_path + baselen, pathname))
+	if (walk_tree_ctx->file_only && !S_ISREG(mode))
+		return READ_TREE_RECURSIVE;
+	if (strncmp(base->buf, walk_tree_ctx->match_path, base->len)
+		|| strcmp(walk_tree_ctx->match_path + base->len, pathname))
 		return READ_TREE_RECURSIVE;
 	memmove(walk_tree_ctx->matched_sha1, sha1, 20);
 	walk_tree_ctx->found_path = 1;
 	return 0;
 }
 
-int cgit_print_file(char *path, const char *head)
+int cgit_ref_path_exists(const char *path, const char *ref, int file_only)
+{
+	unsigned char sha1[20];
+	unsigned long size;
+	struct pathspec_item path_items = {
+		.match = path,
+		.len = strlen(path)
+	};
+	struct pathspec paths = {
+		.nr = 1,
+		.items = &path_items
+	};
+	struct walk_tree_context walk_tree_ctx = {
+		.match_path = path,
+		.matched_sha1 = sha1,
+		.found_path = 0,
+		.file_only = file_only
+	};
+
+	if (get_sha1(ref, sha1))
+		return 0;
+	if (sha1_object_info(sha1, &size) != OBJ_COMMIT)
+		return 0;
+	read_tree_recursive(lookup_commit_reference(sha1)->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
+	return walk_tree_ctx.found_path;
+}
+
+int cgit_print_file(char *path, const char *head, int file_only)
 {
 	unsigned char sha1[20];
 	enum object_type type;
@@ -49,13 +78,14 @@ int cgit_print_file(char *path, const char *head)
 	struct walk_tree_context walk_tree_ctx = {
 		.match_path = path,
 		.matched_sha1 = sha1,
-		.found_path = 0
+		.found_path = 0,
+		.file_only = file_only
 	};
 
 	if (get_sha1(head, sha1))
 		return -1;
 	type = sha1_object_info(sha1, &size);
-	if (type == OBJ_COMMIT && path) {
+	if (type == OBJ_COMMIT) {
 		commit = lookup_commit_reference(sha1);
 		read_tree_recursive(commit->tree, "", 0, 0, &paths, walk_tree, &walk_tree_ctx);
 		if (!walk_tree_ctx.found_path)
@@ -69,10 +99,11 @@ int cgit_print_file(char *path, const char *head)
 		return -1;
 	buf[size] = '\0';
 	html_raw(buf, size);
+	free(buf);
 	return 0;
 }
 
-void cgit_print_blob(const char *hex, char *path, const char *head)
+void cgit_print_blob(const char *hex, char *path, const char *head, int file_only)
 {
 	unsigned char sha1[20];
 	enum object_type type;
@@ -90,16 +121,20 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 	struct walk_tree_context walk_tree_ctx = {
 		.match_path = path,
 		.matched_sha1 = sha1,
+		.found_path = 0,
+		.file_only = file_only
 	};
 
 	if (hex) {
 		if (get_sha1_hex(hex, sha1)) {
-			cgit_print_error("Bad hex value: %s", hex);
+			cgit_print_error_page(400, "Bad request",
+					"Bad hex value: %s", hex);
 			return;
 		}
 	} else {
 		if (get_sha1(head, sha1)) {
-			cgit_print_error("Bad ref: %s", head);
+			cgit_print_error_page(404, "Not found",
+					"Bad ref: %s", head);
 			return;
 		}
 	}
@@ -113,25 +148,28 @@ void cgit_print_blob(const char *hex, char *path, const char *head)
 	}
 
 	if (type == OBJ_BAD) {
-		cgit_print_error("Bad object name: %s", hex);
+		cgit_print_error_page(404, "Not found",
+				"Bad object name: %s", hex);
 		return;
 	}
 
 	buf = read_sha1_file(sha1, &type, &size);
 	if (!buf) {
-		cgit_print_error("Error reading object %s", hex);
+		cgit_print_error_page(500, "Internal server error",
+				"Error reading object %s", hex);
 		return;
 	}
 
 	buf[size] = '\0';
-	ctx.page.mimetype = ctx.qry.mimetype;
-	if (!ctx.page.mimetype) {
-		if (buffer_is_binary(buf, size))
-			ctx.page.mimetype = "application/octet-stream";
-		else
-			ctx.page.mimetype = "text/plain";
-	}
+	if (buffer_is_binary(buf, size))
+		ctx.page.mimetype = "application/octet-stream";
+	else
+		ctx.page.mimetype = "text/plain";
 	ctx.page.filename = path;
-	cgit_print_http_headers(&ctx);
+
+	html("X-Content-Type-Options: nosniff\n");
+	html("Content-Security-Policy: default-src 'none'\n");
+	cgit_print_http_headers();
 	html_raw(buf, size);
+	free(buf);
 }