Merge branch 'lh/escape-urls'

* lh/escape-urls:
  ui-shared.c: use html_url_arg()
  html.c: add html_url_arg

6 files changed, 53 insertions, 11 deletions

diff --git a/html.c b/html.c
index 36e9a2f..167127f 100644
--- a/html.c
+++ b/html.c
@@ -130,2 +130,18 @@ void html_attr(char *txt)
 
+void html_url_arg(char *txt)
+{
+	char *t = txt;
+	while(t && *t){
+		int c = *t;
+		if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') {
+			write(htmlfd, txt, t - txt);
+			write(htmlfd, fmt("%%%2x", c), 3);
+			txt = t+1;
+		}
+		t++;
+	}
+	if (t!=txt)
+		html(txt);
+}
+
 void html_hidden(char *name, char *value)
diff --git a/html.h b/html.h
index 3c32935..038cf60 100644
--- a/html.h
+++ b/html.h
@@ -12,2 +12,3 @@ extern void html_ntxt(int len, char *txt);
 extern void html_attr(char *txt);
+extern void html_url_arg(char *txt);
 extern void html_hidden(char *name, char *value);
diff --git a/tests/setup.sh b/tests/setup.sh
index e37306e..1457dd5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -33,2 +33,9 @@ mkrepo() {
 	done
+	if test "$3" = "testplus"
+	then
+		echo "hello" >a+b
+		git add a+b
+		git commit -m "add a+b"
+		git branch "1+2"
+	fi
 	cd $dir
@@ -42,2 +49,3 @@ setup_repos()
 	mkrepo trash/repos/bar 50 >/dev/null
+	mkrepo trash/repos/foo+bar 10 testplus >/dev/null
 	cat >trash/cgitrc <<EOF
@@ -63,2 +71,6 @@ repo.path=$PWD/trash/repos/bar/.git
 repo.desc=the bar repo
+
+repo.url=foo+bar
+repo.path=$PWD/trash/repos/foo+bar/.git
+repo.desc=the foo+bar repo
 EOF
@@ -115,2 +127 @@ cgit_url()
 }
-
diff --git a/tests/t0101-index.sh b/tests/t0101-index.sh
index 445af6a..07e39f9 100755
--- a/tests/t0101-index.sh
+++ b/tests/t0101-index.sh
@@ -11,2 +11,4 @@ run_test 'find bar repo' 'grep -e "bar" trash/tmp'
 run_test 'find bar description' 'grep -e "the bar repo" trash/tmp'
+run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp'
+run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp'
 run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp'
diff --git a/tests/t0104-tree.sh b/tests/t0104-tree.sh
index 2516c72..0d62cc8 100755
--- a/tests/t0104-tree.sh
+++ b/tests/t0104-tree.sh
@@ -20,2 +20,14 @@ run_test 'no line 2' '
 
+run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp'
+
+run_test 'verify a+b link' '
+	grep -e "/foo+bar/tree/a+b" trash/tmp
+'
+
+run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp'
+
+run_test 'verify a+b?h=1+2 link' '
+	grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp
+'
+
 tests_done
diff --git a/ui-shared.c b/ui-shared.c
index c23bc75..a2f636c 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -223,3 +223,3 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		html("?url=");
-		html_attr(ctx.repo->url);
+		html_url_arg(ctx.repo->url);
 		if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/')
@@ -227,6 +227,6 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		if (page) {
-			html(page);
+			html_url_arg(page);
 			html("/");
 			if (path)
-				html_attr(path);
+				html_url_arg(path);
 		}
@@ -237,3 +237,3 @@ static char *repolink(char *title, char *class, char *page, char *head,
 		html("h=");
-		html_attr(head);
+		html_url_arg(head);
 		delim = "&amp;";
@@ -252,3 +252,3 @@ static void reporevlink(char *page, char *name, char *title, char *class,
 		html("id=");
-		html_attr(rev);
+		html_url_arg(rev);
 	}
@@ -280,3 +280,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 		html("id=");
-		html_attr(rev);
+		html_url_arg(rev);
 		delim = "&";
@@ -286,3 +286,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 		html("qt=");
-		html_attr(grep);
+		html_url_arg(grep);
 		delim = "&";
@@ -290,3 +290,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
 		html("q=");
-		html_attr(pattern);
+		html_url_arg(pattern);
 	}
@@ -335,3 +335,3 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
 		html("id=");
-		html_attr(new_rev);
+		html_url_arg(new_rev);
 		delim = "&amp;";
@@ -341,3 +341,3 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
 		html("id2=");
-		html_attr(old_rev);
+		html_url_arg(old_rev);
 	}