X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/c0dfaf1c281d0697ce43131343d7a9f170a61ff9..7fb12a8ee0789e3eab2680ae6c3fde0f0f233d22:/ui-summary.c

diff --git a/ui-summary.c b/ui-summary.c
index ffad4f2..5598d08 100644
--- a/ui-summary.c
+++ b/ui-summary.c
@@ -1,7 +1,7 @@
 /* ui-summary.c: functions for generating repo summary page
  *
  * Copyright (C) 2006 Lars Hjemli
- * Copyright (C) 2010 Jason A. Donenfeld <Jason@zx2c4.com>
+ * Copyright (C) 2010-2013 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
@@ -13,6 +13,7 @@
 #include "ui-log.h"
 #include "ui-refs.h"
 #include "ui-blob.h"
+#include <libgen.h>
 
 static void print_url(char *base, char *suffix)
 {
@@ -95,70 +96,75 @@ void cgit_print_summary()
 	html("</table>");
 }
 
+/* The caller must free the return value. */
+static char* append_readme_path(const char *filename, const char *ref, const char *path)
+{
+	char *file, *base_dir, *full_path, *resolved_base = NULL, *resolved_full = NULL;
+	/* If a subpath is specified for the about page, make it relative
+	 * to the directory containing the configured readme. */
+
+	file = xstrdup(filename);
+	base_dir = dirname(file);
+	if (!strcmp(base_dir, ".") || !strcmp(base_dir, "..")) {
+		if (!ref) {
+			free(file);
+			return NULL;
+		}
+		full_path = xstrdup(path);
+	} else
+		full_path = fmtalloc("%s/%s", base_dir, path);
+	
+	if (!ref) {
+		resolved_base = realpath(base_dir, NULL);
+		resolved_full = realpath(full_path, NULL);
+		if (!resolved_base || !resolved_full || strncmp(resolved_base, resolved_full, strlen(resolved_base))) {
+			free(full_path);
+			full_path = NULL;
+		}
+	}
+
+	free(file);
+	free(resolved_base);
+	free(resolved_full);
+
+	return full_path;
+}
+
 void cgit_print_repo_readme(char *path)
 {
-	char *slash, *tmp, *colon, *ref;
+	char *filename, *ref;
 	int free_filename = 0;
 
-	if (!ctx.repo->readme || !(*ctx.repo->readme))
+	if (ctx.repo->readme.nr == 0)
 		return;
+	
+	filename = ctx.repo->readme.items[0].string;
+	ref = ctx.repo->readme.items[0].util;
 
-	ref = NULL;
-
-	/* Check if the readme is tracked in the git repo. */
-	colon = strchr(ctx.repo->readme, ':');
-	if (colon && strlen(colon) > 1) {
-		*colon = '\0';
-		/* If it starts with a colon, we want to use
-		 * the default branch */
-		if (colon == ctx.repo->readme && ctx.repo->defbranch)
-			ref = ctx.repo->defbranch;
-		else
-			ref = ctx.repo->readme;
-		ctx.repo->readme = colon + 1;
-		if (!(*ctx.repo->readme))
-			return;
-	}
-
-	/* Prepend repo path to relative readme path unless tracked. */
-	if (!ref && *ctx.repo->readme != '/')
-		ctx.repo->readme = fmtalloc("%s/%s", ctx.repo->path,
-						ctx.repo->readme);
-
-	/* If a subpath is specified for the about page, make it relative
-	 * to the directory containing the configured readme.
-	 */
 	if (path) {
-		slash = strrchr(ctx.repo->readme, '/');
-		if (!slash) {
-			if (!colon)
-				return;
-			slash = colon;
-		}
 		free_filename = 1;
-		tmp = xmalloc(slash - ctx.repo->readme + 1 + strlen(path) + 1);
-		strncpy(tmp, ctx.repo->readme, slash - ctx.repo->readme + 1);
-		strcpy(tmp + (slash - ctx.repo->readme + 1), path);
-	} else
-		tmp = ctx.repo->readme;
+		filename = append_readme_path(filename, ref, path);
+		if (!filename)
+			return;
+	}
 
 	/* Print the calculated readme, either from the git repo or from the
 	 * filesystem, while applying the about-filter.
 	 */
 	html("<div id='summary'>");
 	if (ctx.repo->about_filter) {
-		ctx.repo->about_filter->argv[1] = tmp;
+		ctx.repo->about_filter->argv[1] = filename;
 		cgit_open_filter(ctx.repo->about_filter);
 	}
 	if (ref)
-		cgit_print_file(tmp, ref);
+		cgit_print_file(filename, ref, 1);
 	else
-		html_include(tmp);
+		html_include(filename);
 	if (ctx.repo->about_filter) {
 		cgit_close_filter(ctx.repo->about_filter);
 		ctx.repo->about_filter->argv[1] = NULL;
 	}
 	html("</div>");
 	if (free_filename)
-		free(tmp);
+		free(filename);
 }