ui-shared: prevent malicious filename from injecting headers

author: Jason A. Donenfeld 2016-01-14 14:28:37 +0100
committer: Jason A. Donenfeld 2016-01-14 14:28:37 +0100
commit: 513b3863d999f91b47d7e9f26710390db55f9463 (patch)
tree: f704af1ea3f8da9b3b2904fbe8ed8233278314c6
parent: ui-shared: Avoid new line injection into redirect header (diff)
download: cgit-513b3863d999f91b47d7e9f26710390db55f9463.tar.gz
cgit-513b3863d999f91b47d7e9f26710390db55f9463.zip
3 files changed, 32 insertions, 3 deletions
diff --git a/html.c b/html.c
index 959148c..d89df3a 100644
--- a/html.c
+++ b/html.c

@@ -239,6 +239,32 @@ void html_url_arg(const char *txt)
                html(txt);
 }
+void html_header_arg_in_quotes(const char *txt)
+{
+        const char *t = txt;
+        while (t && *t) {
+                unsigned char c = *t;
+                const char *e = NULL;
+                if (c == '\\')
+                        e = "\\\\";
+                else if (c == '\r')
+                        e = "\\r";
+                else if (c == '\n')
+                        e = "\\n";
+                else if (c == '"')
+                        e = "\\\"";
+                if (e) {
+                        html_raw(txt, t - txt);
+                        html(e);
+                        txt = t + 1;
+                }
+                t++;
+        }
+        if (t != txt)
+                html(txt);
+}
 void html_hidden(const char *name, const char *value)
 {
        html("<input type='hidden' name='");
diff --git a/html.h b/html.h
index c554763..c72e845 100644
--- a/html.h
+++ b/html.h

@@ -23,6 +23,7 @@ extern void html_ntxt(int len, const char *txt);
 extern void html_attr(const char *txt);
 extern void html_url_path(const char *txt);
 extern void html_url_arg(const char *txt);
+extern void html_header_arg_in_quotes(const char *txt);
 extern void html_hidden(const char *name, const char *value);
 extern void html_option(const char *value, const char *text, const char *selected_value);
 extern void html_intoption(int value, const char *text, int selected_value);
diff --git a/ui-shared.c b/ui-shared.c
index 21f581f..54bbde7 100644
--- a/ui-shared.c
+++ b/ui-shared.c

@@ -692,9 +692,11 @@ void cgit_print_http_headers(void)
                htmlf("Content-Type: %s\n", ctx.page.mimetype);
        if (ctx.page.size)
                htmlf("Content-Length: %zd\n", ctx.page.size);
-        if (ctx.page.filename)
+        if (ctx.page.filename) {
-                htmlf("Content-Disposition: inline; filename=\"%s\"\n",
+                html("Content-Disposition: inline; filename=\"");
-                      ctx.page.filename);
+                html_header_arg_in_quotes(ctx.page.filename);
+                html("\"\n");
+        }
        if (!ctx.env.authenticated)
                html("Cache-Control: no-cache, no-store\n");
        htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));
author	Jason A. Donenfeld	2016-01-14 14:28:37 +0100
committer	Jason A. Donenfeld	2016-01-14 14:28:37 +0100
commit	513b3863d999f91b47d7e9f26710390db55f9463 (patch)
tree	f704af1ea3f8da9b3b2904fbe8ed8233278314c6
parent	ui-shared: Avoid new line injection into redirect header (diff)
download	cgit-513b3863d999f91b47d7e9f26710390db55f9463.tar.gz cgit-513b3863d999f91b47d7e9f26710390db55f9463.zip

diff --git a/html.c b/html.c index 959148c..d89df3a 100644 --- a/html.c +++ b/html.c
@@ -239,6 +239,32 @@ void html_url_arg(const char *txt)
239	html(txt);	239	html(txt);
240	}	240	}
241		241
		242	void html_header_arg_in_quotes(const char *txt)
		243	{
		244	const char *t = txt;
		245	while (t && *t) {
		246	unsigned char c = *t;
		247	const char *e = NULL;
		248	if (c == '\\')
		249	e = "\\\\";
		250	else if (c == '\r')
		251	e = "\\r";
		252	else if (c == '\n')
		253	e = "\\n";
		254	else if (c == '"')
		255	e = "\\\"";
		256	if (e) {
		257	html_raw(txt, t - txt);
		258	html(e);
		259	txt = t + 1;
		260	}
		261	t++;
		262	}
		263	if (t != txt)
		264	html(txt);
		265
		266	}
		267
242	void html_hidden(const char name, const char value)	268	void html_hidden(const char name, const char value)
243	{	269	{
244	html("<input type='hidden' name='");	270	html("<input type='hidden' name='");


diff --git a/html.h b/html.h index c554763..c72e845 100644 --- a/html.h +++ b/html.h
@@ -23,6 +23,7 @@ extern void html_ntxt(int len, const char *txt);
23	extern void html_attr(const char *txt);	23	extern void html_attr(const char *txt);
24	extern void html_url_path(const char *txt);	24	extern void html_url_path(const char *txt);
25	extern void html_url_arg(const char *txt);	25	extern void html_url_arg(const char *txt);
		26	extern void html_header_arg_in_quotes(const char *txt);
26	extern void html_hidden(const char name, const char value);	27	extern void html_hidden(const char name, const char value);
27	extern void html_option(const char value, const char text, const char *selected_value);	28	extern void html_option(const char value, const char text, const char *selected_value);
28	extern void html_intoption(int value, const char *text, int selected_value);	29	extern void html_intoption(int value, const char *text, int selected_value);


diff --git a/ui-shared.c b/ui-shared.c index 21f581f..54bbde7 100644 --- a/ui-shared.c +++ b/ui-shared.c
@@ -692,9 +692,11 @@ void cgit_print_http_headers(void)
692	htmlf("Content-Type: %s\n", ctx.page.mimetype);	692	htmlf("Content-Type: %s\n", ctx.page.mimetype);
693	if (ctx.page.size)	693	if (ctx.page.size)
694	htmlf("Content-Length: %zd\n", ctx.page.size);	694	htmlf("Content-Length: %zd\n", ctx.page.size);
695	if (ctx.page.filename)	695	if (ctx.page.filename) {
696	htmlf("Content-Disposition: inline; filename=\"%s\"\n",	696	html("Content-Disposition: inline; filename=\"");
697	ctx.page.filename);	697	html_header_arg_in_quotes(ctx.page.filename);
		698	html("\"\n");
		699	}
698	if (!ctx.env.authenticated)	700	if (!ctx.env.authenticated)
699	html("Cache-Control: no-cache, no-store\n");	701	html("Cache-Control: no-cache, no-store\n");
700	htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));	702	htmlf("Last-Modified: %s\n", http_date(ctx.page.modified));