[PATCH] gitweb: Make $prevent_xss protection for 'blob_plain' more usable
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Jun 10, 2011, 12:01 UTC
- Message-ID
- <201106101401.19108.jnareb@gmail.com>
- In-Reply-To
- <1307177015-880-1-git-send-email-jnareb@gmail.com>
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) wiew would be displayed in browser, but safely as a source, and not asked to be saved.
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- This is what GitHub interface does for text/html pages (*.html), if I remember it correctly...
gitweb/gitweb.perl | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 85acbed..470793a 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -6139,7 +6139,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 ($subtype, $rest) = ($1, $2); + $rest = defined $rest ? $rest : ''; + $type = "text/plain$rest" if ($subtype ne 'plain'); + } print $cgi->header( -type => $type,
-- 1.7.5