diff options
Diffstat (limited to 'lib/PublicInbox/POP3.pm')
| -rw-r--r-- | lib/PublicInbox/POP3.pm | 56 |
1 files changed, 40 insertions, 16 deletions
diff --git a/lib/PublicInbox/POP3.pm b/lib/PublicInbox/POP3.pm index 5f992e14..06772069 100644 --- a/lib/PublicInbox/POP3.pm +++ b/lib/PublicInbox/POP3.pm @@ -41,6 +41,7 @@ use PublicInbox::IMAP; # for UID slice stuff use constant { LINE_MAX => 512, # XXX unsure + UID_SLICE => PublicInbox::IMAP::UID_SLICE, }; # XXX FIXME: duplicated stuff from NNTP.pm and IMAP.pm @@ -61,7 +62,7 @@ sub new { (bless { pop3d => $pop3d }, $cls)->greet($sock) } -# POP user is $UUID1@$NEWSGROUP.$SLICE +# POP user is $UUID1@$NEWSGROUP[.$SLICE][?QUERY_ARGS] sub cmd_user ($$) { my ($self, $mailbox) = @_; $self->{salt} // return \"-ERR already authed\r\n"; @@ -70,21 +71,26 @@ sub cmd_user ($$) { my $user = $1; $user =~ tr/-//d; # most have dashes, some (dbus-uuidgen) don't $user =~ m!\A[a-f0-9]{32}\z!i or return \"-ERR user has no UUID\r\n"; - my $slice; - $mailbox =~ s/\.([0-9]+)\z// and $slice = $1 + 0; + + my %l; + if ($mailbox =~ s/\?(.*)\z//) { # query args + for (split(/&+/, $1)) { + /\A(initial_limit|limit)=([0-9]+)\z/ and $l{$1} = $2; + } + $self->{limits} = \%l; + } + my $slice = $mailbox =~ s/\.([0-9]+)\z// ? $1 + 0 : undef; + my $ibx = $self->{pop3d}->{pi_cfg}->lookup_newsgroup($mailbox) // return \"-ERR $mailbox does not exist\r\n"; - my $uidmax = $ibx->mm(1)->num_highwater // 0; + my $uidmax = $self->{uidmax} = $ibx->mm(1)->num_highwater // 0; if (defined $slice) { - my $max = int($uidmax / PublicInbox::IMAP::UID_SLICE); + my $max = int($uidmax / UID_SLICE); my $tip = "$mailbox.$max"; return \"-ERR $mailbox.$slice does not exist ($tip does)\r\n" if $slice > $max; - $self->{uid_base} = $slice * PublicInbox::IMAP::UID_SLICE; $self->{slice} = $slice; - } else { # latest 50K messages - my $base = $uidmax - PublicInbox::IMAP::UID_SLICE; - $self->{uid_base} = $base < 0 ? 0 : $base; + } else { # latest messages: $self->{slice} = -1; } $self->{ibx} = $ibx; @@ -95,12 +101,27 @@ sub cmd_user ($$) { sub _login_ok ($) { my ($self) = @_; - if ($self->{pop3d}->lock_mailbox($self)) { - $self->{uid_max} = $self->{ibx}->over(1)->max; - \"+OK logged in\r\n"; - } else { - \"-ERR [IN-USE] unable to lock maildrop\r\n"; + $self->{pop3d}->lock_mailbox($self) or + return \"-ERR [IN-USE] unable to lock maildrop\r\n"; + + my $l = delete $self->{limits}; + $l = defined($self->{uid_dele}) ? $l->{limit} + : ($l->{initial_limit} // $l->{limit}); + my $uidmax = delete $self->{uidmax}; + if ($self->{slice} >= 0) { + $self->{uid_base} = $self->{slice} * UID_SLICE; + if (defined $l) { # n.b: the last slice is not full: + my $max = int($uidmax/UID_SLICE) == $self->{slice} ? + ($uidmax % UID_SLICE) : UID_SLICE; + my $off = $max - $l; + $self->{uid_base} += $off if $off > 0; + } + } else { # latest $l messages, or 1k if unspecified + my $base = $uidmax - ($l // 1000); + $self->{uid_base} = $base < 0 ? 0 : $base; } + $self->{uid_max} = $self->{ibx}->over(1)->max; + \"+OK logged in\r\n"; } sub cmd_apop { @@ -216,7 +237,10 @@ sub retr_cb { # called by git->cat_async via ibx_async_cat my ($self, $off, $top_nr) = @$args; my $hex = $self->{cache}->[$off * 3 + 2] // die "BUG: no hex (oid=$oid)"; - if (!defined($oid)) { + if (!defined($type)) { + warn "E: git aborted on $oid / $hex $self->{ibx}->{inboxdir}"; + return $self->close; + } elsif ($type ne 'blob') { # it's possible to have TOCTOU if an admin runs # public-inbox-(edit|purge), just move onto the next message warn "E: $hex missing in $self->{ibx}->{inboxdir}\n"; @@ -346,7 +370,7 @@ UPDATE users SET last_seen = ? WHERE user_id = ? $self->{pop3d}->unlock_mailbox($self); } $self->write(\"+OK public-inbox POP3 server signing off\r\n"); - $self->close; + $self->shutdn; undef; } |