use warnings;
use Test::More;
use Email::MIME;
-use Email::Filter;
use PublicInbox::Filter;
sub count_body_parts {
# plain-text email is passed through unchanged
{
- my $s = Email::Simple->create(
+ my $s = Email::MIME->create(
header => [
From => 'a@example.com',
To => 'b@example.com',
],
body => "hello world\n",
);
- my $f = Email::Filter->new(data => $s->as_string);
- is(1, PublicInbox::Filter->run($f->simple), "run was a success");
- is($s->as_string, $f->simple->as_string, "plain email unchanged");
+ is(1, PublicInbox::Filter->run($s), "run was a success");
}
# convert single-part HTML to plain-text
{
- my $s = Email::Simple->create(
+ my $s = Email::MIME->create(
header => [
From => 'a@example.com',
To => 'b@example.com',
],
body => "<html><body>bad body</body></html>\n",
);
- my $f = Email::Filter->new(data => $s->as_string);
- is(1, PublicInbox::Filter->run($f->simple), "run was a success");
- unlike($f->simple->as_string, qr/<html>/, "HTML removed");
- is("text/plain", $f->simple->header("Content-Type"),
+ is(1, PublicInbox::Filter->run($s), "run was a success");
+ unlike($s->as_string, qr/<html>/, "HTML removed");
+ is("text/plain", $s->header("Content-Type"),
"content-type changed");
- like($f->simple->body, qr/\A\s*bad body\s*\z/, "body");
- like($f->simple->header("X-Content-Filtered-By"),
+ like($s->body, qr/\A\s*bad body\s*\z/, "body");
+ like($s->header("X-Content-Filtered-By"),
qr/PublicInbox::Filter/, "XCFB header added");
}
],
parts => $parts,
);
- my $f = Email::Filter->new(data => $email->as_string);
- is(1, PublicInbox::Filter->run($f->simple), "run was a success");
- my $parsed = Email::MIME->new($f->simple->as_string);
+ is(1, PublicInbox::Filter->run($email), "run was a success");
+ my $parsed = Email::MIME->new($email->as_string);
is("text/plain", $parsed->header("Content-Type"));
is(scalar $parsed->parts, 1, "HTML part removed");
my %bodies;
header_str => [ From => 'a@example.com', Subject => 'blah' ],
parts => $parts,
);
- my $f = Email::Filter->new(data => $email->as_string);
- is(1, PublicInbox::Filter->run($f->simple), "run was a success");
- my $parsed = Email::MIME->new($f->simple->as_string);
+ is(1, PublicInbox::Filter->run($email), "run was a success");
+ my $parsed = Email::MIME->new($email->as_string);
is(scalar $parsed->parts, 2, "still 2 parts");
my %bodies;
$parsed->walk_parts(sub {
header_str => [ From => 'a@example.com', Subject => 'blah' ],
parts => $parts,
);
- my $f = Email::Filter->new(data => $email->as_string);
- is(1, PublicInbox::Filter->run($f->simple), "run was a success");
- my $parsed = Email::MIME->new($f->simple->as_string);
+ is(1, PublicInbox::Filter->run($email), "run was a success");
+ my $parsed = Email::MIME->new($email->as_string);
is(scalar $parsed->parts, 2, "still 2 parts");
my %bodies;
$parsed->walk_parts(sub {
header_str => [ From => 'a@example.com', Subject => 'blah' ],
parts => $parts,
);
- my $f = Email::Filter->new(data => $email->as_string);
- is(1, PublicInbox::Filter->run($f->simple), "run was a success");
- my $parsed = Email::MIME->new($f->simple->as_string);
+ is(1, PublicInbox::Filter->run($email), "run was a success");
+ my $parsed = Email::MIME->new($email->as_string);
is(scalar $parsed->parts, 1, "image part removed");
my %bodies;
$parsed->walk_parts(sub {
header_str => [ From => 'a@example.com', Subject => 'blah' ],
parts => $parts,
);
- my $f = Email::Filter->new(data => $email->as_string);
- is(0, PublicInbox::Filter->run($f->simple),
+ is(0, PublicInbox::Filter->run($email),
"run signaled to stop delivery");
- my $parsed = Email::MIME->new($f->simple->as_string);
+ my $parsed = Email::MIME->new($email->as_string);
is(scalar $parsed->parts, 1, "bad parts removed");
my %bodies;
$parsed->walk_parts(sub {
}
{
- my $s = Email::Simple->create(
+ my $s = Email::MIME->create(
header => [
From => 'a@example.com',
To => 'b@example.com',
],
body => "hello world\n",
);
- my $f = Email::Filter->new(data => $s->as_string);
- is(0, PublicInbox::Filter->run($f->simple), "run was a failure");
- like($f->simple->as_string, qr/scrubbed/, "scrubbed message");
+ is(0, PublicInbox::Filter->run($s), "run was a failure");
+ like($s->as_string, qr/scrubbed/, "scrubbed message");
+}
+
+{
+ my $s = Email::MIME->create(
+ header => [
+ From => 'a@example.com',
+ To => 'b@example.com',
+ 'Content-Type' => 'text/plain',
+ 'Mail-Followup-To' => 'c@example.com',
+ Subject => 'mfttest',
+ ],
+ body => "mft\n",
+ );
+
+ is('c@example.com', $s->header("Mail-Followup-To"),
+ "mft set correctly");
+ is(1, PublicInbox::Filter->run($s), "run succeeded for mft");
+ is(undef, $s->header("Mail-Followup-To"), "mft stripped");
+}
+
+# multi-part with application/octet-stream
+{
+ my $os = 'application/octet-stream';
+ my $parts = [
+ Email::MIME->create(
+ attributes => { content_type => $os },
+ body => <<EOF
+#include <stdio.h>
+int main(void)
+{
+ printf("Hello world\\n");
+ return 0;
+}
+\f
+/* some folks like ^L */
+EOF
+ ),
+ Email::MIME->create(
+ attributes => {
+ filename => 'zero.data',
+ encoding => 'base64',
+ content_type => $os,
+ },
+ body => ("\0" x 4096),
+ )
+ ];
+ my $email = Email::MIME->create(
+ header_str => [ From => 'a@example.com', Subject => 'blah' ],
+ parts => $parts,
+ );
+ is(1, PublicInbox::Filter->run($email), "run was a success");
+ my $parsed = Email::MIME->new($email->as_string);
+ is(scalar $parsed->parts, 1, "only one remaining part");
+ like($parsed->header("X-Content-Filtered-By"),
+ qr/PublicInbox::Filter/, "XCFB header added");
}
done_testing();