Skip to content

Commit

Permalink
gitweb: Serve text/* 'blob_plain' as text/plain with $prevent_xss
Browse files Browse the repository at this point in the history
One of mechanism enabled by setting $prevent_xss to true is 'blob_plain'
view protection.  With XSS prevention on, blobs of all types except a
few known safe ones are served with "Content-Disposition: attachment" to
make sure they don't run in our security domain.

Instead of serving text/* type files, except text/plain (and including
text/html), as attachements, downgrade it to text/plain.  This way HTML
pages in 'blob_plain' (raw) view would be displayed in browser, but
safely as a source, and not asked to be saved.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jakub Narebski authored and Junio C Hamano committed Jun 30, 2011
1 parent bee6ea1 commit 86afbd0
Showing 1 changed file with 9 additions and 1 deletion.
10 changes: 9 additions & 1 deletion gitweb/gitweb.perl
Original file line number Diff line number Diff line change
Expand Up @@ -4752,7 +4752,15 @@ sub git_blob_plain {
# want to be sure not to break that by serving the image as an
# attachment (though Firefox 3 doesn't seem to care).
my $sandbox = $prevent_xss &&
$type !~ m!^(?:text/plain|image/(?:gif|png|jpeg))(?:[ ;]|$)!;
$type !~ m!^(?:text/[a-z]+|image/(?:gif|png|jpeg))(?:[ ;]|$)!;

# serve text/* as text/plain
if ($prevent_xss &&
$type =~ m!^text/[a-z]+\b(.*)$!) {
my $rest = $1;
$rest = defined $rest ? $rest : '';
$type = "text/plain$rest";
}

print $cgi->header(
-type => $type,
Expand Down

0 comments on commit 86afbd0

Please sign in to comment.