Having a file start with '.' or '-' can be confusing
and for users, so do not allow it.
$desc = $fn unless defined $desc;
$desc = '' unless defined $desc;
my $sfn;
$desc = $fn unless defined $desc;
$desc = '' unless defined $desc;
my $sfn;
- if (defined $fn && $fn =~ /\A[\w\.-]+[a-zA-Z0-9]\z/) {
+ if (defined $fn && $fn =~ /\A[[:alnum:]][\w\.-]+[[:alnum:]]\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-zA-Z0-9])!i;
+our $ATTACH_RE = qr!(\d[\.\d]*)-([[:alnum:]][\w\.-]+[[:alnum:]])!i;
sub new {
my ($class, $pi_config) = @_;
sub new {
my ($class, $pi_config) = @_;
my $qp = "abcdef=g\n==blah\n";
my $b64 = 'b64'.$buf."\n";
my $txt = "plain\ntext\npass\nthrough\n";
my $qp = "abcdef=g\n==blah\n";
my $b64 = 'b64'.$buf."\n";
my $txt = "plain\ntext\npass\nthrough\n";
my $parts = [
Email::MIME->create(
attributes => {
my $parts = [
Email::MIME->create(
attributes => {
content_type => 'text/plain',
},
body => $txt),
content_type => 'text/plain',
},
body => $txt),
+ Email::MIME->create(
+ attributes => {
+ filename => '.dotfile',
+ content_type => 'text/plain',
+ },
+ body => $dot),
];
my $mime = Email::MIME->create(
parts => $parts,
];
my $mime = Email::MIME->create(
parts => $parts,
$res = $cb->(GET('/test/Z%40B/'));
my @href = ($res->content =~ /^href="([^"]+)"/gms);
@href = grep(/\A[\d\.]+-/, @href);
$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)],
+ is_deeply([qw(1-queue-pee 2-bayce-sixty-four 3-noop.txt
+ 4-a.txt)],
\@href, 'attachment links generated');
$res = $cb->(GET('/test/Z%40B/1-queue-pee'));
\@href, 'attachment links generated');
$res = $cb->(GET('/test/Z%40B/1-queue-pee'));
'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');
'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');
+
+ $res = $cb->(GET('/test/Z%40B/4-a.txt'));
+ my $dot_res = $res->content;
+ ok(length($dot_res) >= length($dot), 'dot almost matches');
+ $res = $cb->(GET('/test/Z%40B/4-any-filename.txt'));
+ is($res->content, $dot_res, 'user-specified filename is OK');
+