author | Lars Hjemli <hjemli@gmail.com> | 2008-10-05 11:13:33 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2008-10-05 11:13:33 (UTC) |
commit | 20c895f6889a66d7cf43c67a7c22df6ef324ed5d (patch) (unidiff) | |
tree | 4fc0c044fa0919cab562b371191add67114d07a9 | |
parent | 204669ff4a4028a82cc48e9319632595ba3ff703 (diff) | |
parent | b575115d9d93e45cdbcd5d066cc445d34639ae6a (diff) | |
download | cgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.zip cgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.tar.gz cgit-20c895f6889a66d7cf43c67a7c22df6ef324ed5d.tar.bz2 |
Merge branch 'lh/escape-urls'
* lh/escape-urls:
ui-shared.c: use html_url_arg()
html.c: add html_url_arg
-rw-r--r-- | html.c | 16 | ||||
-rw-r--r-- | html.h | 1 | ||||
-rwxr-xr-x | tests/setup.sh | 13 | ||||
-rwxr-xr-x | tests/t0101-index.sh | 2 | ||||
-rwxr-xr-x | tests/t0104-tree.sh | 12 | ||||
-rw-r--r-- | ui-shared.c | 20 |
6 files changed, 53 insertions, 11 deletions
@@ -130,2 +130,18 @@ void html_attr(char *txt) | |||
130 | 130 | ||
131 | void html_url_arg(char *txt) | ||
132 | { | ||
133 | char *t = txt; | ||
134 | while(t && *t){ | ||
135 | int c = *t; | ||
136 | if (c=='"' || c=='#' || c=='%' || c=='&' || c=='\'' || c=='+' || c=='?') { | ||
137 | write(htmlfd, txt, t - txt); | ||
138 | write(htmlfd, fmt("%%%2x", c), 3); | ||
139 | txt = t+1; | ||
140 | } | ||
141 | t++; | ||
142 | } | ||
143 | if (t!=txt) | ||
144 | html(txt); | ||
145 | } | ||
146 | |||
131 | void html_hidden(char *name, char *value) | 147 | void html_hidden(char *name, char *value) |
@@ -12,2 +12,3 @@ extern void html_ntxt(int len, char *txt); | |||
12 | extern void html_attr(char *txt); | 12 | extern void html_attr(char *txt); |
13 | extern void html_url_arg(char *txt); | ||
13 | extern void html_hidden(char *name, char *value); | 14 | 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() { | |||
33 | done | 33 | done |
34 | if test "$3" = "testplus" | ||
35 | then | ||
36 | echo "hello" >a+b | ||
37 | git add a+b | ||
38 | git commit -m "add a+b" | ||
39 | git branch "1+2" | ||
40 | fi | ||
34 | cd $dir | 41 | cd $dir |
@@ -42,2 +49,3 @@ setup_repos() | |||
42 | mkrepo trash/repos/bar 50 >/dev/null | 49 | mkrepo trash/repos/bar 50 >/dev/null |
50 | mkrepo trash/repos/foo+bar 10 testplus >/dev/null | ||
43 | cat >trash/cgitrc <<EOF | 51 | cat >trash/cgitrc <<EOF |
@@ -63,2 +71,6 @@ repo.path=$PWD/trash/repos/bar/.git | |||
63 | repo.desc=the bar repo | 71 | repo.desc=the bar repo |
72 | |||
73 | repo.url=foo+bar | ||
74 | repo.path=$PWD/trash/repos/foo+bar/.git | ||
75 | repo.desc=the foo+bar repo | ||
64 | EOF | 76 | EOF |
@@ -115,2 +127 @@ cgit_url() | |||
115 | } | } | |
116 | |||
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' | |||
11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' | 11 | run_test 'find bar description' 'grep -e "the bar repo" trash/tmp' |
12 | run_test 'find foo+bar repo' 'grep -e ">foo+bar<" trash/tmp' | ||
13 | run_test 'verify foo+bar link' 'grep -e "/foo+bar/" trash/tmp' | ||
12 | run_test 'no tree-link' '! grep -e "foo/tree" trash/tmp' | 14 | 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' ' | |||
20 | 20 | ||
21 | run_test 'generate foo+bar/tree' 'cgit_url "foo%2bbar/tree" >trash/tmp' | ||
22 | |||
23 | run_test 'verify a+b link' ' | ||
24 | grep -e "/foo+bar/tree/a+b" trash/tmp | ||
25 | ' | ||
26 | |||
27 | run_test 'generate foo+bar/tree?h=1+2' 'cgit_url "foo%2bbar/tree&h=1%2b2" >trash/tmp' | ||
28 | |||
29 | run_test 'verify a+b?h=1+2 link' ' | ||
30 | grep -e "/foo+bar/tree/a+b?h=1%2b2" trash/tmp | ||
31 | ' | ||
32 | |||
21 | tests_done | 33 | 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, | |||
223 | html("?url="); | 223 | html("?url="); |
224 | html_attr(ctx.repo->url); | 224 | html_url_arg(ctx.repo->url); |
225 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') | 225 | if (ctx.repo->url[strlen(ctx.repo->url) - 1] != '/') |
@@ -227,6 +227,6 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
227 | if (page) { | 227 | if (page) { |
228 | html(page); | 228 | html_url_arg(page); |
229 | html("/"); | 229 | html("/"); |
230 | if (path) | 230 | if (path) |
231 | html_attr(path); | 231 | html_url_arg(path); |
232 | } | 232 | } |
@@ -237,3 +237,3 @@ static char *repolink(char *title, char *class, char *page, char *head, | |||
237 | html("h="); | 237 | html("h="); |
238 | html_attr(head); | 238 | html_url_arg(head); |
239 | delim = "&"; | 239 | delim = "&"; |
@@ -252,3 +252,3 @@ static void reporevlink(char *page, char *name, char *title, char *class, | |||
252 | html("id="); | 252 | html("id="); |
253 | html_attr(rev); | 253 | html_url_arg(rev); |
254 | } | 254 | } |
@@ -280,3 +280,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
280 | html("id="); | 280 | html("id="); |
281 | html_attr(rev); | 281 | html_url_arg(rev); |
282 | delim = "&"; | 282 | delim = "&"; |
@@ -286,3 +286,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
286 | html("qt="); | 286 | html("qt="); |
287 | html_attr(grep); | 287 | html_url_arg(grep); |
288 | delim = "&"; | 288 | delim = "&"; |
@@ -290,3 +290,3 @@ void cgit_log_link(char *name, char *title, char *class, char *head, | |||
290 | html("q="); | 290 | html("q="); |
291 | html_attr(pattern); | 291 | html_url_arg(pattern); |
292 | } | 292 | } |
@@ -335,3 +335,3 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
335 | html("id="); | 335 | html("id="); |
336 | html_attr(new_rev); | 336 | html_url_arg(new_rev); |
337 | delim = "&"; | 337 | delim = "&"; |
@@ -341,3 +341,3 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, | |||
341 | html("id2="); | 341 | html("id2="); |
342 | html_attr(old_rev); | 342 | html_url_arg(old_rev); |
343 | } | 343 | } |