[PATCHv1 2/2] gitweb: Serve */*+xml 'blob_plain' as text/plain with $prevent_xss
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Jun 30, 2011, 09:39 UTC
- Message-ID
- <1309426761-819-3-git-send-email-jnareb@gmail.com>
- In-Reply-To
- <1309426761-819-1-git-send-email-jnareb@gmail.com>
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 <jnareb@gmail.com> --- This patch is new.
gitweb/gitweb.perl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index cb2e7bc..ae6244c 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -6143,7 +6143,8 @@ sub git_blob_plain { # serve text/* as text/plain if ($prevent_xss && - $type =~ m!^text/[a-z]+\b(.*)$!) { + ($type =~ m!^text/[a-z]+\b(.*)$! || + ($type =~ m!^[a-z]+/[a-z]\+xml\b(.*)$! && -T $fd))) { my $rest = $1; $rest = defined $rest ? $rest : ''; $type = "text/plain$rest";
-- 1.7.5