We shall ensure links continue working for this.
$desc = '' unless defined $desc;
$desc = ': '.$desc if $desc;
my $sfn;
$desc = '' unless defined $desc;
$desc = ': '.$desc if $desc;
my $sfn;
- if (defined $fn && $fn =~ /\A[\w-]+\.[a-z0-9]+\z/) {
+ if (defined $fn && $fn =~ /\A[\w\.-]+[a-zA-Z0-9]\z/) {
$sfn = $fn;
} elsif ($ct eq 'text/plain') {
$sfn = 'a.txt';
$sfn = $fn;
} elsif ($ct eq 'text/plain') {
$sfn = 'a.txt';
our $INBOX_RE = qr!\A/([\w\.\-]+)!;
our $MID_RE = qr!([^/]+)!;
our $END_RE = qr!(T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
our $INBOX_RE = qr!\A/([\w\.\-]+)!;
our $MID_RE = qr!([^/]+)!;
our $END_RE = qr!(T/|t/|R/|t\.mbox(?:\.gz)?|t\.atom|raw|)!;
-our $ATTACH_RE = qr!(\d[\.\d]*)-([\w-]+\.[a-z0-9]+)!i;
+our $ATTACH_RE = qr!(\d[\.\d]*)-([\w\.-]+[a-zA-Z0-9])!i;
sub new {
my ($class, $pi_config) = @_;
sub new {
my ($class, $pi_config) = @_;
body => $b64),
Email::MIME->create(
attributes => {
body => $b64),
Email::MIME->create(
attributes => {
+ filename => 'noop.txt',
content_type => 'text/plain',
},
body => $txt),
content_type => 'text/plain',
},
body => $txt),
test_psgi(sub { $www->call(@_) }, sub {
my ($cb) = @_;
my $res;
test_psgi(sub { $www->call(@_) }, sub {
my ($cb) = @_;
my $res;
+ $res = $cb->(GET('/test/Z%40B/'));
+ my @href = ($res->content =~ /^href="([^"]+)"/gms);
+ @href = grep(/\A[\d\.]+-/, @href);
+ is_deeply([qw(1-queue-pee 2-bayce-sixty-four 3-noop.txt)],
+ \@href, 'attachment links generated');
- $res = $cb->(GET('/test/Z%40B/1-a.txt'));
+ $res = $cb->(GET('/test/Z%40B/1-queue-pee'));
my $qp_res = $res->content;
ok(length($qp_res) >= length($qp), 'QP length is close');
like($qp_res, qr/\n\z/s, 'trailing newline exists');
my $qp_res = $res->content;
ok(length($qp_res) >= length($qp), 'QP length is close');
like($qp_res, qr/\n\z/s, 'trailing newline exists');
$qp_res =~ s/\r\n/\n/g;
is(index($qp_res, $qp), 0, 'QP trailing newline is there');
$qp_res =~ s/\r\n/\n/g;
is(index($qp_res, $qp), 0, 'QP trailing newline is there');
- $res = $cb->(GET('/test/Z%40B/2-a.txt'));
+ $res = $cb->(GET('/test/Z%40B/2-base-sixty-four'));
is(quotemeta($res->content), quotemeta($b64),
'Base64 matches exactly');
is(quotemeta($res->content), quotemeta($b64),
'Base64 matches exactly');
- $res = $cb->(GET('/test/Z%40B/3-a.txt'));
+ $res = $cb->(GET('/test/Z%40B/3-noop.txt'));
my $txt_res = $res->content;
my $txt_res = $res->content;
- ok(length($txt_res) >= length($txt), 'plain text almost matches');
+ ok(length($txt_res) >= length($txt),
+ 'plain text almost matches');
like($txt_res, qr/\n\z/s, 'trailing newline exists in text');
is(index($txt_res, $txt), 0, 'plain text not truncated');
});
like($txt_res, qr/\n\z/s, 'trailing newline exists in text');
is(index($txt_res, $txt), 0, 'plain text not truncated');
});