Skip to content

Commit e8c3531

Browse files
jnarebgitster
authored andcommitted
gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
Enhance usability of 'blob_plain' view protection against XSS attacks (enabled by setting $prevent_xss to true) by serving contents inline as safe 'text/plain' mimetype where possible, instead of serving with "Content-Disposition: attachment" to make sure they don't run in gitweb's security domain. This patch broadens downgrading to 'text/plain' further, to any */*+xml mimetype. This includes: application/xhtml+xml (*.xhtml, *.xht) application/atom+xml (*.atom) application/rss+xml (*.rss) application/mathml+xm (*.mathml) application/docbook+xml (*.docbook) image/svg+xml (*.svg, *.svgz) Probably most useful is serving XHTML files as text/plain in 'blob_plain' view, directly viewable. Because file with 'image/svg+xml' mimetype can be compressed SVGZ file, we have to check if */*+xml really is text file, via '-T $fd'. Signed-off-by: Jakub Narebski <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 86afbd0 commit e8c3531

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

gitweb/gitweb.perl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4756,7 +4756,8 @@ sub git_blob_plain {
47564756

47574757
# serve text/* as text/plain
47584758
if ($prevent_xss &&
4759-
$type =~ m!^text/[a-z]+\b(.*)$!) {
4759+
($type =~ m!^text/[a-z]+\b(.*)$! ||
4760+
($type =~ m!^[a-z]+/[a-z]\+xml\b(.*)$! && -T $fd))) {
47604761
my $rest = $1;
47614762
$rest = defined $rest ? $rest : '';
47624763
$type = "text/plain$rest";

0 commit comments

Comments
 (0)