@matheusbsbs / matheus-bagliano / commits / a376e37b2c
Fork 0

gitweb: escape URLs generated by href()

There's a cross-site scripting problem in gitweb, where it will print URLs generated by its href() helper without further quoting. This allows an attacker to point a victim to a specially crafted gitweb URL and inject arbitrary HTML into the resulting page (which the victim sees as coming from gitweb). The base of the URL comes from evaluate_uri(), which pulls the value of $REQUEST_URI via the CGI module. It tries to strip off $PATH_INFO, but fails to do so in some cases (including ones that contain special characters, like "+"). Most of the uses of the URL end up being passed to "$cgi->a(-href = href())", which will get quoted properly by the CGI module. But in a few places, we output them ourselves as part of manually-generated HTML, and whatever was in the original URL will appear unquoted in the output. Given that all of the nearby variables placed into this manual HTML _are_ quoted, it seems like the authors assumed that these URLs would not need quoting. So it's possible that the bug is actually in evaluate_uri(), which should be doing a more careful job of stripping $PATH_INFO. There's some discussion in a comment in that function, as well as the commit message in 81d3fe9f48 (gitweb: fix wrong base URL when non-root DirectoryIndex, 2009-02-15). But I'm not sure I understand it. Regardless, it's a good idea to quote these values at the point of insertion into the HTML output: 1. Even if there is a bug in evaluate_uri(), this would give us belt-and-suspenders protection. 2. evaluate_uri() is only handling the base. Some generated URLs will also mention arbitrary refs or filenames in the repositories, and these should be quoted anyway. 3. It should never _hurt_ to quote (and that's what all of the $cgi->a() calls are doing already). So there may be further work here, but this patch at least prevents the XSS vulnerability, and shouldn't make anything worse. The test here covers the calls in print_feed_meta(), but I manually audited every call to href() to see how its output was used, and quoted appropriately. Most of them are esc_attr(), as they're used in tag attributes, but I used esc_html() when the URLs were printed bare. The distinction is largely academic, as one is implemented as a wrapper for the other. Reported-by: NAKAYAMA DAISUKE <nakyamad@icloud.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Nov 15, 2019 at 04:06 UTC a376e37b2c418b8f630741552d76a5b18c87c133
2 files changed +19 -15
gitweb/gitweb.perl
+17 -14
@@ -4048,7 +4048,7 @@ sub print_feed_meta {
4048
4049 $href_params{'extra_options'} = undef;
4050 $href_params{'action'} = $type;
4051 - $link_attr{'-href'} = href(%href_params);
4051 + $link_attr{'-href'} = esc_attr(href(%href_params));
4052 print "<link ".
4053 "rel=\"$link_attr{'-rel'}\" ".
4054 "title=\"$link_attr{'-title'}\" ".
@@ -4057,7 +4057,7 @@ sub print_feed_meta {
4057 "/>\n";
4058
4059 $href_params{'extra_options'} = '--no-merges';
4060 - $link_attr{'-href'} = href(%href_params);
4060 + $link_attr{'-href'} = esc_attr(href(%href_params));
4061 $link_attr{'-title'} .= ' (no merges)';
4062 print "<link ".
4063 "rel=\"$link_attr{'-rel'}\" ".
@@ -4070,10 +4070,12 @@ sub print_feed_meta {
4070 } else {
4071 printf('<link rel="alternate" title="%s projects list" '.
4072 'href="%s" type="text/plain; charset=utf-8" />'."\n",
4073 - esc_attr($site_name), href(project=>undef, action=>"project_index"));
4073 + esc_attr($site_name),
4074 + esc_attr(href(project=>undef, action=>"project_index")));
4075 printf('<link rel="alternate" title="%s projects feeds" '.
4076 'href="%s" type="text/x-opml" />'."\n",
4076 - esc_attr($site_name), href(project=>undef, action=>"opml"));
4077 + esc_attr($site_name),
4078 + esc_attr(href(project=>undef, action=>"opml")));
4079 }
4080 }
4081
@@ -4287,8 +4289,8 @@ sub git_footer_html {
4289 if (defined $action &&
4290 $action eq 'blame_incremental') {
4291 print qq!<script type="text/javascript">\n!.
4290 - qq!startBlame("!. href(action=>"blame_data", -replay=>1) .qq!",\n!.
4291 - qq! "!. href() .qq!");\n!.
4292 + qq!startBlame("!. esc_attr(href(action=>"blame_data", -replay=>1)) .qq!",\n!.
4293 + qq! "!. esc_attr(href()) .qq!");\n!.
4294 qq!</script>\n!;
4295 } else {
4296 my ($jstimezone, $tz_cookie, $datetime_class) =
@@ -7155,8 +7157,8 @@ sub git_blob {
7157 print qq! alt="!.esc_attr($file_name).qq!" title="!.esc_attr($file_name).qq!"!;
7158 }
7159 print qq! src="! .
7158 - href(action=>"blob_plain", hash=>$hash,
7159 - hash_base=>$hash_base, file_name=>$file_name) .
7160 + esc_attr(href(action=>"blob_plain", hash=>$hash,
7161 + hash_base=>$hash_base, file_name=>$file_name)) .
7162 qq!" />\n!;
7163 } else {
7164 my $nr;
@@ -8239,6 +8241,7 @@ sub git_feed {
8241 } else {
8242 $alt_url = href(-full=>1, action=>"summary");
8243 }
8244 + $alt_url = esc_attr($alt_url);
8245 print qq!<?xml version="1.0" encoding="utf-8"?>\n!;
8246 if ($format eq 'rss') {
8247 print <<XML;
@@ -8276,7 +8279,7 @@ XML
8279 $alt_url . '" />' . "\n" .
8280 '<link rel="self" type="' . $content_type . '" href="' .
8281 $cgi->self_url() . '" />' . "\n" .
8279 - "<id>" . href(-full=>1) . "</id>\n" .
8282 + "<id>" . esc_url(href(-full=>1)) . "</id>\n" .
8283 # use project owner for feed author
8284 "<author><name>$owner</name></author>\n";
8285 if (defined $favicon) {
@@ -8322,7 +8325,7 @@ XML
8325 "<author>" . esc_html($co{'author'}) . "</author>\n" .
8326 "<pubDate>$cd{'rfc2822'}</pubDate>\n" .
8327 "<guid isPermaLink=\"true\">$co_url</guid>\n" .
8325 - "<link>$co_url</link>\n" .
8328 + "<link>" . esc_html($co_url) . "</link>\n" .
8329 "<description>" . esc_html($co{'title'}) . "</description>\n" .
8330 "<content:encoded>" .
8331 "<![CDATA[\n";
@@ -8344,8 +8347,8 @@ XML
8347 }
8348 print "</contributor>\n" .
8349 "<published>$cd{'iso-8601'}</published>\n" .
8347 - "<link rel=\"alternate\" type=\"text/html\" href=\"$co_url\" />\n" .
8348 - "<id>$co_url</id>\n" .
8350 + "<link rel=\"alternate\" type=\"text/html\" href=\"" . esc_attr($co_url) . "\" />\n" .
8351 + "<id>" . esc_html($co_url) . "</id>\n" .
8352 "<content type=\"xhtml\" xml:base=\"" . esc_url($my_url) . "\">\n" .
8353 "<div xmlns=\"http://www.w3.org/1999/xhtml\">\n";
8354 }
@@ -8452,8 +8455,8 @@ XML
8455 }
8456
8457 my $path = esc_html(chop_str($proj{'path'}, 25, 5));
8455 - my $rss = href('project' => $proj{'path'}, 'action' => 'rss', -full => 1);
8456 - my $html = href('project' => $proj{'path'}, 'action' => 'summary', -full => 1);
8458 + my $rss = esc_attr(href('project' => $proj{'path'}, 'action' => 'rss', -full => 1));
8459 + my $html = esc_attr(href('project' => $proj{'path'}, 'action' => 'summary', -full => 1));
8460 print "<outline type=\"rss\" text=\"$path\" title=\"$path\" xmlUrl=\"$rss\" htmlUrl=\"$html\"/>\n";
8461 }
8462 print <<XML;
t/t9502-gitweb-standalone-parse-output.sh
+2 -1
@@ -200,7 +200,8 @@ xss() {
200 test_expect_success 'xss checks' '
201 TAG="<magic-xss-tag>" &&
202 xss "a=rss&p=$TAG" &&
203 - xss "a=rss&p=foo.git&f=$TAG"
203 + xss "a=rss&p=foo.git&f=$TAG" &&
204 + xss "" "$TAG+"
205 '
206
207 test_done