aboutsummaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorMatt Selsky <selsky@columbia.edu>2012-07-04 00:45:19 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2012-07-04 00:45:19 +0200
commit1b0d24407e618c4cc0ad1c6e176f5aca3803f7c9 (patch)
treee8cce604e6f1f435f5ca1aeefb4ca46f9669a4da /Bugzilla
parent08f32ca19c69416cfaa596a2ba1d72ce8fce1008 (diff)
downloadbugs-1b0d24407e618c4cc0ad1c6e176f5aca3803f7c9.tar
bugs-1b0d24407e618c4cc0ad1c6e176f5aca3803f7c9.tar.gz
bugs-1b0d24407e618c4cc0ad1c6e176f5aca3803f7c9.tar.bz2
bugs-1b0d24407e618c4cc0ad1c6e176f5aca3803f7c9.tar.xz
bugs-1b0d24407e618c4cc0ad1c6e176f5aca3803f7c9.zip
Bug 760562: Integrate TypeSniffer into core codebase (auto-detect attachment MIME type)
r/a=LpSolit
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/Attachment.pm53
-rw-r--r--Bugzilla/Install/Requirements.pm14
2 files changed, 60 insertions, 7 deletions
diff --git a/Bugzilla/Attachment.pm b/Bugzilla/Attachment.pm
index eb64d1d0a..d6c7e3924 100644
--- a/Bugzilla/Attachment.pm
+++ b/Bugzilla/Attachment.pm
@@ -513,6 +513,52 @@ sub _check_content_type {
}
trick_taint($content_type);
+ # $ENV{HOME} must be defined when using File::MimeInfo::Magic,
+ # see https://rt.cpan.org/Public/Bug/Display.html?id=41744.
+ local $ENV{HOME} = $ENV{HOME} || File::Spec->rootdir();
+
+ # If we have autodetected application/octet-stream from the Content-Type
+ # header, let's have a better go using a sniffer if available.
+ if (defined Bugzilla->input_params->{contenttypemethod}
+ && Bugzilla->input_params->{contenttypemethod} eq 'autodetect'
+ && $content_type eq 'application/octet-stream'
+ && Bugzilla->feature('typesniffer'))
+ {
+ import File::MimeInfo::Magic qw(mimetype);
+ require IO::Scalar;
+
+ # data is either a filehandle, or the data itself.
+ my $fh = $params->{data};
+ if (!ref($fh)) {
+ $fh = new IO::Scalar \$fh;
+ }
+ elsif (!$fh->isa('IO::Handle')) {
+ # CGI.pm sends us an Fh that isn't actually an IO::Handle, but
+ # has a method for getting an actual handle out of it.
+ $fh = $fh->handle;
+ # ->handle returns an literal IO::Handle, even though the
+ # underlying object is a file. So we rebless it to be a proper
+ # IO::File object so that we can call ->seek on it and so on.
+ # Just in case CGI.pm fixes this some day, we check ->isa first.
+ if (!$fh->isa('IO::File')) {
+ bless $fh, 'IO::File';
+ }
+ }
+
+ my $mimetype = mimetype($fh);
+ $content_type = $mimetype if $mimetype;
+ }
+
+ # Make sure patches are viewable in the browser
+ if (!ref($invocant)
+ && defined Bugzilla->input_params->{contenttypemethod}
+ && Bugzilla->input_params->{contenttypemethod} eq 'autodetect'
+ && $content_type =~ m{text/x-(?:diff|patch)})
+ {
+ $params->{ispatch} = 1;
+ $content_type = 'text/plain';
+ }
+
return $content_type;
}
@@ -926,13 +972,6 @@ sub get_content_type {
$cgi->uploadInfo($cgi->param('data'))->{'Content-Type'};
$content_type || ThrowUserError("missing_content_type");
- # Set the ispatch flag to 1 if the content type
- # is text/x-diff or text/x-patch
- if ($content_type =~ m{text/x-(?:diff|patch)}) {
- $cgi->param('ispatch', 1);
- $content_type = 'text/plain';
- }
-
# Internet Explorer sends image/x-png for PNG images,
# so convert that to image/png to match other browsers.
if ($content_type eq 'image/x-png') {
diff --git a/Bugzilla/Install/Requirements.pm b/Bugzilla/Install/Requirements.pm
index 265b04d66..c5abf1986 100644
--- a/Bugzilla/Install/Requirements.pm
+++ b/Bugzilla/Install/Requirements.pm
@@ -360,6 +360,20 @@ sub OPTIONAL_MODULES {
version => '0.96',
feature => ['mod_perl'],
},
+
+ # typesniffer
+ {
+ package => 'File-MimeInfo',
+ module => 'File::MimeInfo::Magic',
+ version => '0',
+ feature => ['typesniffer'],
+ },
+ {
+ package => 'IO-stringy',
+ module => 'IO::Scalar',
+ version => '0',
+ feature => ['typesniffer'],
+ },
);
my $extra_modules = _get_extension_requirements('OPTIONAL_MODULES');