use MIME::Entity and MIME::Parser from MIME::Tools instead of Email::MIME

.github/workflows/ci.yml

@@ -38,7 +38,8 @@ jobs:
             DBD::mysql
             Net::IP
             Socket6
-            Email::MIME
+            MIME::Entity
+            MIME::Parser
             Net::SMTPS
             XML::LibXML
             Email::Sender

.github/workflows/codecov.yml

@@ -36,7 +36,8 @@ jobs:
             DBD::mysql
             Net::IP
             Socket6
-            Email::MIME
+            MIME::Entity
+            MIME::Parser
             Net::HTTP
             Net::SMTPS
             XML::LibXML

Build.PL

@@ -35,7 +35,6 @@ my $module_build_args = {
     "DBD::SQLite" => "1.31",
     "DBIx::Simple" => "1.35",
     "Data::Dumper" => 0,
-    "Email::MIME" => 0,
     "Email::Sender" => 0,
     "Email::Sender::Simple" => "1.300032",
     "Email::Simple" => 0,
@@ -50,6 +49,10 @@ my $module_build_args = {
     "IO::Socket::SSL" => 0,
     "IO::Uncompress::Gunzip" => 0,
     "IO::Uncompress::Unzip" => 0,
+    "Mail::Field" => 0,
+    "Mail::Internet" => 0,
+    "MIME::Entity" => 0,
+    "MIME::Parser" => 0,
     "Net::DNS::Resolver" => 0,
     "Net::IDN::Encode" => 0,
     "Net::IP" => 0,

META.json

@@ -39,7 +39,6 @@
             "DBD::SQLite" : "1.31",
             "DBIx::Simple" : "1.35",
             "Data::Dumper" : "0",
-            "Email::MIME" : "0",
             "Email::Sender" : "0",
             "Email::Sender::Simple" : "1.300032",
             "Email::Simple" : "0",
@@ -54,6 +53,10 @@
             "IO::Socket::SSL" : "0",
             "IO::Uncompress::Gunzip" : "0",
             "IO::Uncompress::Unzip" : "0",
+            "Mail::Field" : "0",
+            "Mail::Internet" : "0",
+            "MIME::Entity" : "0",
+            "MIME::Parser" : "0",
             "Net::DNS::Resolver" : "0",
             "Net::IDN::Encode" : "0",
             "Net::IP" : "0",

META.yml

@@ -116,7 +116,6 @@ requires:
   DBD::SQLite: '1.31'
   DBIx::Simple: '1.35'
   Data::Dumper: '0'
-  Email::MIME: '0'
   Email::Sender: '0'
   Email::Sender::Simple: '1.300032'
   Email::Simple: '0'
@@ -131,6 +130,10 @@ requires:
   IO::Socket::SSL: '0'
   IO::Uncompress::Gunzip: '0'
   IO::Uncompress::Unzip: '0'
+  Mail::Field : '0'
+  Mail::Internet : '0'
+  MIME::Entity: '0'
+  MIME::Parser: '0'
   Net::DNS::Resolver: '0'
   Net::IDN::Encode: '0'
   Net::IP: '0'

Makefile.PL

@@ -55,7 +55,6 @@ my %META = (
         "DBD::SQLite" => "1.31",
         "DBIx::Simple" => "1.35",
         "Data::Dumper" => 0,
-        "Email::MIME" => 0,
         "Email::Sender" => 0,
         "Email::Sender::Simple" => "1.300032",
         "Email::Simple" => 0,
@@ -70,6 +69,10 @@ my %META = (
         "IO::Socket::SSL" => 0,
         "IO::Uncompress::Gunzip" => 0,
         "IO::Uncompress::Unzip" => 0,
+        "Mail::Field" => 0,
+        "Mail::Internet" => 0,
+        "MIME::Entity" => 0,
+        "MIME::Parser" => 0,
         "Net::DNS::Resolver" => 0,
         "Net::IDN::Encode" => 0,
         "Net::IP" => 0,

lib/Mail/DMARC/Report/Receive.pm

@@ -6,7 +6,7 @@ our $VERSION = '1.20240214';
 
 use Carp;
 use Data::Dumper;
-use Email::MIME;
+use MIME::Parser;
 use Email::Simple;
 use Encode;
 use IO::Uncompress::Unzip;
@@ -137,8 +137,10 @@ sub from_email_simple {
     };
 
     my $rep_type;
-    foreach my $part ( Email::MIME->new( $email->as_string )->parts ) {
-        my ($c_type) = split /;/, $part->content_type || '';
+    my $parser = MIME::Parser->new;
+    foreach my $part ( $parser->parse( $email->as_string )->parts_DFS ) {
+        next if defined(!$part->bodyhandle); # something to process
+        my ($c_type) = split /;/, $part->effective_type || '';
         next if $c_type eq 'text/plain';
         if ( $c_type eq 'text/rfc822-headers' ) {
             warn "TODO: handle forensic reports\n";  ## no critic (Carp)
@@ -151,7 +153,7 @@ sub from_email_simple {
             next;
         }
         my $bigger;
-        my $filename = $part->{ct}{attributes}{name} || '';
+        my $filename = $part->head->recommended_filename || $part->bodyhandle->path || '';
 
         if ( $c_type eq 'application/zip' || $c_type eq 'application/x-zip-compressed' ) {
             $self->get_submitter_from_filename( $filename );

lib/Mail/DMARC/Report/Send/SMTP.pm

@@ -6,7 +6,7 @@ our $VERSION = '1.20240214';
 
 use Carp;
 use English '-no_match_vars';
-use Email::MIME;
+use MIME::Entity;
 #use Mail::Sender;  # something to consider
 use Sys::Hostname;
 use POSIX;
@@ -115,24 +115,20 @@ sub get_filename {
 sub assemble_too_big_message_object {
     my ( $self, $to, $body ) = @_;
 
-    my @parts    = Email::MIME->create(
-        attributes => {
-            content_type => "text/plain",
-            disposition  => "inline",
-            charset      => "US-ASCII",
-        },
-        body => $body,
-    ) or croak "unable to add body!";
-
-    my $email = Email::MIME->create(
-        header_str => [
-            From => $self->config->{organization}{email},
-            To   => $to,
-            Date => $self->get_timestamp_rfc2822,
-            Subject => 'DMARC too big report',
-        ],
-        parts => [@parts],
-    ) or croak "unable to assemble message\n";
+    my $email = MIME::Entity->build(
+        Type => "multipart/mixed",
+	From => $self->config->{organization}{email},
+        To   => $to,
+        Date => $self->get_timestamp_rfc2822,
+        Subject => 'DMARC too big report'
+    ) or croak "unable to create header!";
+
+    $email->attach(
+        Type => "text/plain",
+        Disposition  => "inline",
+        Charset      => "US-ASCII",
+        Data => $body,
+    ) or croak "unable to add body and assemble message!";
 
     return $email;
 }
@@ -146,35 +142,27 @@ sub assemble_message_object {
     my $cf       = 'gzip';
       $filename .= $cf eq 'gzip' ? '.gz' : '.zip';
 
-    my @parts    = Email::MIME->create(
-        attributes => {
-            content_type => "text/plain",
-            disposition  => "inline",
-            charset      => "US-ASCII",
-        },
-        body => $self->human_summary( $agg_ref ),
-    ) or croak "unable to add body!";
-
-    push @parts,
-        Email::MIME->create(
-        attributes => {
-            filename     => $filename,
-            content_type => "application/$cf",
-            encoding     => "base64",
-            name         => $filename,
-        },
-        body => $shrunk,
-        ) or croak "unable to add report!";
-
-    my $email = Email::MIME->create(
-        header_str => [
-            From => $self->config->{organization}{email},
-            To   => $to,
-            Date => $self->get_timestamp_rfc2822,
-            Subject => $self->get_subject( $agg_ref ),
-        ],
-        parts => [@parts],
-    ) or croak "unable to assemble message\n";
+    my $email = MIME::Entity->build(
+        Type    => "multipart/mixed",
+        From    => $self->config->{organization}{email},
+        To      => $to,
+        Date    => $self->get_timestamp_rfc2822,
+        Subject => $self->get_subject( $agg_ref )
+    ) or croak "unable to create header!";
+
+    $email->attach(
+        Type         => "text/plain",
+        Disposition  => "inline",
+        Charset      => "US-ASCII",
+        Data         => \$self->human_summary( $agg_ref ),
+    ) or croak "unable to add body to message!";
+
+    $email->attach(
+        Type      => "application/$cf",
+        Encoding  => "base64",
+        Filename  => $filename,
+        Data      => \$shrunk,
+    ) or croak "unable to add report to message!";
 
     return $email;
 }