about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Colberg <peter@colberg.org>2015-12-08 12:53:09 -0500
committerJason A. Donenfeld <Jason@zx2c4.com>2016-01-13 17:19:34 +0100
commit9abe4a26a92b91170cb9c5dab830b40fb1e0327f (patch)
treee4f2d5301f9bc4a3bc09ae30b6ff23dd210ed981
parentui-repolist: extract repo visibility criteria to separate function (diff)
downloadcgit-pink-9abe4a26a92b91170cb9c5dab830b40fb1e0327f.tar.gz
cgit-pink-9abe4a26a92b91170cb9c5dab830b40fb1e0327f.zip
ui-repolist: return HTTP 404 if no repositories found
Return HTTP status code 404 Not found when querying a non-existent
repository, which signals to search engines that a repository no
longer exists. Further, some webservers such as nginx permit
logging requests to different files depending on the HTTP code.

Signed-off-by: Peter Colberg <peter@colberg.org>
Diffstat (limited to '')
-rw-r--r--ui-repolist.c20
1 files changed, 17 insertions, 3 deletions
diff --git a/ui-repolist.c b/ui-repolist.c
index 4912fa5..6010a39 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -115,6 +115,17 @@ static int is_visible(struct cgit_repo *repo)
 	return 1;
 }
 
+static int any_repos_visible(void)
+{
+	int i;
+
+	for (i = 0; i < cgit_repolist.count; i++) {
+		if (is_visible(&cgit_repolist.repos[i]))
+			return 1;
+	}
+	return 0;
+}
+
 static void print_sort_header(const char *title, const char *sort)
 {
 	char *currenturl = cgit_currenturl();
@@ -266,6 +277,11 @@ void cgit_print_repolist(void)
 	char *section;
 	int sorted = 0;
 
+	if (!any_repos_visible()) {
+		cgit_print_error_page(404, "Not found", "No repositories found");
+		return;
+	}
+
 	if (ctx.cfg.enable_index_links)
 		++columns;
 	if (ctx.cfg.enable_index_owner)
@@ -347,9 +363,7 @@ void cgit_print_repolist(void)
 		html("</tr>\n");
 	}
 	html("</table>");
-	if (!hits)
-		cgit_print_error("No repositories found");
-	else if (hits > ctx.cfg.max_repo_count)
+	if (hits > ctx.cfg.max_repo_count)
 		print_pager(hits, ctx.cfg.max_repo_count, ctx.qry.search, ctx.qry.sort);
 	cgit_print_docend();
 }