[PATCH] gitweb: Teach "a=blob" action to be more lenient about blob/file mime type
- From
Jakub Narebski <jnareb@gmail.com>
- Date
- Dec 8, 2007, 11:55 UTC
- Message-ID
- <1197114913-15626-1-git-send-email-jnareb@gmail.com>
Since 930cf7dd7cc6b87d173f182230763e1f1913d319 'blob' action knows the file type; if the file type is not "text/*" or one of common network image formats/mimetypes (gif, png, jpeg) then the action "blob" defaulted to "blob_plain". This caused the problem if mimetypes file was not well suited for web, for example returning "application/x-sh" for "*.sh" shell scripts, instead of "text/plain" (or other "text/*").
Now "blob" action defaults to "blob_plain" ('raw' view) only if file is of type which is neither "text/*" nor "image/{gif,png,jpeg}" AND it is binary file. Otherwise it assumes that it can be displayed either in <img> tag ("image/*" mimetype), or can be displayed line by line (otherwise).
Signed-off-by: Jakub Narebski <jnareb@gmail.com> --- The patch I've send earlier "[RFC/PATCH] gitweb: Try to sanitize mimetype for 'blob_plain' view" Message-Id: <1195484054-18164-1-git-send-email-jnareb@gmail.com> should also do what this patch is about. This one however IMHO is much less invasive, and much less controversial.
P.S. BTW is there some plumbing for scripts to help with gitattributes, for example showing all gitattributes (or status of selected attributes) for given path?
gitweb/gitweb.perl | 24 ++++++++++++------------ 1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index eac7e16..b833327 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -4302,7 +4302,7 @@ sub git_blob { open my $fd, "-|", git_cmd(), "cat-file", "blob", $hash or die_error(undef, "Couldn't cat $file_name, $hash"); my $mimetype = blob_mimetype($fd, $file_name); - if ($mimetype !~ m!^(?:text/|image/(?:gif|png|jpeg)$)!) { + if ($mimetype !~ m!^(?:text/|image/(?:gif|png|jpeg)$)! && -B $fd) { close $fd; return git_blob_plain($mimetype); } @@ -4343,16 +4343,7 @@ sub git_blob { } git_print_page_path($file_name, "blob", $hash_base); print "<div class=\"page_body\">\n"; - if ($mimetype =~ m!^text/!) { - my $nr; - while (my $line = <$fd>) { - chomp $line; - $nr++; - $line = untabify($line); - printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n", - $nr, $nr, $nr, esc_html($line, -nbsp=>1); - } - } elsif ($mimetype =~ m!^image/!) { + if ($mimetype =~ m!^image/!) { print qq!<img type="$mimetype"!; if ($file_name) { print qq! alt="$file_name" title="$file_name"!; @@ -4361,7 +4352,16 @@ sub git_blob { href(action=>"blob_plain", hash=>$hash, hash_base=>$hash_base, file_name=>$file_name) . qq!" />\n!; - } + } else { + my $nr; + while (my $line = <$fd>) { + chomp $line; + $nr++; + $line = untabify($line); + printf "<div class=\"pre\"><a id=\"l%i\" href=\"#l%i\" class=\"linenr\">%4i</a> %s</div>\n", + $nr, $nr, $nr, esc_html($line, -nbsp=>1); + } + } els close $fd or print "Reading blob failed.\n"; print "</div>";
-- 1.5.3.7