proxmox-mirrors/pmg-api
1
0
Fork 0
mirror of https://git.proxmox.com/git/pmg-api synced 2025-10-04 22:28:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

utils: content-type: don't fallback to header information for magic

Browse Source 
file-type detection based on content/magic is the single piece of
information not determined by the headers of the e-mail, and thus not
directly controlled by the sender.

this patch removes the fallback to the content-type header mime-type
in case magic_mime_type_for_file does not detect the type.

one exception to this is trying to eagerly gain information from
archives - where we want to try to unpack an archive if the header
says it is an archive but the content is not detected as such.

Reported-by: Friedrich Weber <f.weber@proxmox.com>
Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
This commit is contained in:
Stoiko Ivanov 2025-02-21 17:48:16 +01:00 committed by Thomas Lamprecht
parent 3bcf02c204
commit c320d56091
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/PMG/RuleDB/ArchiveFilter.pm
View File

@ -59,7 +59,7 @@ sub parse_entity {
if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) { if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) {
chomp $id; chomp $id;
my $header_ct = $entity->head->mime_attr ('content-type'); my $header_ct = $entity->{PMX_header_ct};
my $magic_ct = $entity->{PMX_magic_ct}; my $magic_ct = $entity->{PMX_magic_ct};

2
src/PMG/RuleDB/ContentTypeFilter.pm
View File

@ -72,7 +72,7 @@ sub parse_entity {
if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) { if (my $id = $entity->head->mime_attr ('x-proxmox-tmp-aid')) {
chomp $id; chomp $id;
my $header_ct = $entity->head->mime_attr ('content-type'); my $header_ct = $entity->{PMX_header_ct};
my $magic_ct = $entity->{PMX_magic_ct}; my $magic_ct = $entity->{PMX_magic_ct};

12
src/PMG/Utils.pm
View File

@ -598,7 +598,7 @@ sub magic_mime_type_for_file {
my $bufsize = Xdgmime::xdg_mime_get_max_buffer_extents(); my $bufsize = Xdgmime::xdg_mime_get_max_buffer_extents();
die "got strange value for max_buffer_extents" if $bufsize > 4096*10; die "got strange value for max_buffer_extents" if $bufsize > 4096*10;
my $ct = "application/octet-stream"; my $ct;
my $fh = IO::File->new("<$filename") || my $fh = IO::File->new("<$filename") ||
die "unable to open file '$filename' - $!"; die "unable to open file '$filename' - $!";
@ -611,6 +611,7 @@ sub magic_mime_type_for_file {
die "unable to read file '$filename' - $!" if ($len < 0); die "unable to read file '$filename' - $!" if ($len < 0);
$ct ||= "application/octet-stream";
return $ct; return $ct;
} }
@ -619,14 +620,9 @@ sub add_ct_marks {
if (my $path = $entity->{PMX_decoded_path}) { if (my $path = $entity->{PMX_decoded_path}) {
# set a reasonable default if magic does not give a result $entity->{PMX_header_ct} = $entity->head->mime_attr('content-type');
$entity->{PMX_magic_ct} = $entity->head->mime_attr('content-type');
if (my $ct = magic_mime_type_for_file($path)) { $entity->{PMX_magic_ct} = magic_mime_type_for_file($path);
if ($ct ne 'application/octet-stream' || !$entity->{PMX_magic_ct}) {
$entity->{PMX_magic_ct} = $ct;
}
}
my $filename = $entity->head->recommended_filename; my $filename = $entity->head->recommended_filename;
$filename = basename($path) if !defined($filename) || $filename eq ''; $filename = basename($path) if !defined($filename) || $filename eq '';

8
src/bin/pmg-smtp-filter
View File

@ -561,9 +561,15 @@ sub run_dequeue {
sub unpack_entity { sub unpack_entity {
my ($self, $unpack, $entity, $msginfo, $queue) = @_; my ($self, $unpack, $entity, $msginfo, $queue) = @_;
my ($magic, $path) = $entity->@{'PMX_magic_ct', 'PMX_decoded_path'}; my ($magic, $headerct, $path) = $entity->@{'PMX_magic_ct', 'PMX_header_ct', 'PMX_decoded_path'};
if ($magic && $path) { if ($magic && $path) {
# in order to not miss information from a misdetected archive use information provided in the
# header here as well
if ($headerct && ($magic && $magic eq 'application/octet-stream')) {
$magic = $headerct;
}
my $filename = basename ($path); my $filename = basename ($path);
if (PMG::Unpack::is_archive ($magic)) { if (PMG::Unpack::is_archive ($magic)) {