diff options
Diffstat (limited to 'lib/PublicInbox/POP3.pm')
| -rw-r--r-- | lib/PublicInbox/POP3.pm | 130 |
1 files changed, 87 insertions, 43 deletions
diff --git a/lib/PublicInbox/POP3.pm b/lib/PublicInbox/POP3.pm index 7469922b..06772069 100644 --- a/lib/PublicInbox/POP3.pm +++ b/lib/PublicInbox/POP3.pm @@ -41,15 +41,11 @@ 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 -sub err ($$;@) { - my ($self, $fmt, @args) = @_; - printf { $self->{pop3d}->{err} } $fmt."\n", @args; -} - sub out ($$;@) { my ($self, $fmt, @args) = @_; printf { $self->{pop3d}->{out} } $fmt."\n", @args; @@ -66,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"; @@ -75,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; @@ -100,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 { @@ -154,32 +170,32 @@ SELECT num,ddd FROM over WHERE num >= ? AND num <= ? ORDER BY num ASC $sth->execute($beg, $end); - do { - $m = $sth->fetchall_arrayref({}, 1000); + my $tot = 0; + while (defined($m = $sth->fetchall_arrayref({}, 1000))) { for my $x (@$m) { PublicInbox::Over::load_from_row($x); push(@cache, $x->{num}, $x->{bytes} + 0, $x->{blob}); undef $x; # saves ~1.5M memory w/ 50k messages + $tot += $cache[-2]; } - } while (scalar(@$m) && ($beg = $cache[-3] + 1)); - \@cache; + } + $self->{total_bytes} = $tot; + $self->{cache} = \@cache; } sub cmd_stat { my ($self) = @_; my $err; $err = need_txn($self) and return $err; - my $cache = $self->{cache} //= _stat_cache($self); - my $tot = 0; - for (my $i = 1; $i < scalar(@$cache); $i += 3) { $tot += $cache->[$i] } + my $cache = $self->{cache} // _stat_cache($self); my $nr = @$cache / 3 - ($self->{nr_dele} // 0); - "+OK $nr $tot\r\n"; + "+OK $nr $self->{total_bytes}\r\n"; } # for LIST and UIDL sub _list { my ($desc, $idx, $self, $msn) = @_; my $err; $err = need_txn($self) and return $err; - my $cache = $self->{cache} //= _stat_cache($self); + my $cache = $self->{cache} // _stat_cache($self); if (defined $msn) { my $base_off = ($msn - 1) * 3; my $val = $cache->[$base_off + $idx] // @@ -209,8 +225,9 @@ sub mark_dele ($$) { my $old = $self->{txn_max_uid} //= $uid; $self->{txn_max_uid} = $uid if $uid > $old; + $self->{total_bytes} -= $cache->[$base_off + 1]; $cache->[$base_off] = undef; # clobber UID - $cache->[$base_off + 1] = 0; # zero bytes (simplifies cmd_stat) + $cache->[$base_off + 1] = undef; # clobber bytes $cache->[$base_off + 2] = undef; # clobber oidhex ++$self->{nr_dele}; } @@ -220,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"; @@ -238,7 +258,7 @@ sub retr_cb { # called by git->cat_async via ibx_async_cat my @tmp = split(/^/m, $bdy); $hdr .= join('', splice(@tmp, 0, $top_nr)); } elsif (exists $self->{expire}) { - $self->{expire} .= pack('S', $off + 1); + $self->{expire} .= pack('S', $off); } $$bref =~ s/^\./../gms; $$bref .= substr($$bref, -2, 2) eq "\r\n" ? ".\r\n" : "\r\n.\r\n"; @@ -252,7 +272,7 @@ sub cmd_retr { return \"-ERR lines must be a non-negative number\r\n" if (defined($top_nr) && $top_nr !~ /\A[0-9]+\z/); my $err; $err = need_txn($self) and return $err; - my $cache = $self->{cache} //= _stat_cache($self); + my $cache = $self->{cache} // _stat_cache($self); my $off = $msn - 1; my $hex = $cache->[$off * 3 + 2] // return \"-ERR no such message\r\n"; ${ibx_async_cat($self->{ibx}, $hex, \&retr_cb, @@ -272,7 +292,7 @@ sub cmd_rset { sub cmd_dele { my ($self, $msn) = @_; my $err; $err = need_txn($self) and return $err; - $self->{cache} //= _stat_cache($self); + $self->{cache} // _stat_cache($self); $msn =~ /\A[1-9][0-9]*\z/ or return \"-ERR no such message\r\n"; mark_dele($self, $msn - 1) ? \"+OK\r\n" : \"-ERR no such message\r\n"; } @@ -301,6 +321,27 @@ sub close { $self->SUPER::close; } +# must be called inside a state_dbh transaction with flock held +sub __cleanup_state { + my ($self, $txn_id) = @_; + my $user_id = $self->{user_id} // die 'BUG: no {user_id}'; + $self->{pop3d}->{-state_dbh}->prepare_cached(<<'')->execute($txn_id); +DELETE FROM deletes WHERE txn_id = ? AND uid_dele = -1 + + my $sth = $self->{pop3d}->{-state_dbh}->prepare_cached(<<'', undef, 1); +SELECT COUNT(*) FROM deletes WHERE user_id = ? + + $sth->execute($user_id); + my $nr = $sth->fetchrow_array; + if ($nr == 0) { + $sth = $self->{pop3d}->{-state_dbh}->prepare_cached(<<''); +DELETE FROM users WHERE user_id = ? + + $sth->execute($user_id); + } + $nr; +} + sub cmd_quit { my ($self) = @_; if (defined(my $txn_id = $self->{txn_id})) { @@ -308,26 +349,28 @@ sub cmd_quit { if (my $exp = delete $self->{expire}) { mark_dele($self, $_) for unpack('S*', $exp); } + my $keep = 1; my $dbh = $self->{pop3d}->{-state_dbh}; my $lk = $self->{pop3d}->lock_for_scope; - my $sth; $dbh->begin_work; - if (defined $self->{txn_max_uid}) { - $sth = $dbh->prepare_cached(<<''); + if (defined(my $max = $self->{txn_max_uid})) { + $dbh->prepare_cached(<<'')->execute($max, $txn_id, $max) UPDATE deletes SET uid_dele = ? WHERE txn_id = ? AND uid_dele < ? - $sth->execute($self->{txn_max_uid}, $txn_id, - $self->{txn_max_uid}); + } else { + $keep = $self->__cleanup_state($txn_id); } - $sth = $dbh->prepare_cached(<<''); + $dbh->prepare_cached(<<'')->execute(time, $user_id) if $keep; UPDATE users SET last_seen = ? WHERE user_id = ? - $sth->execute(time, $user_id); $dbh->commit; + # we MUST do txn_id F_UNLCK here inside ->lock_for_scope: + $self->{did_quit} = 1; + $self->{pop3d}->unlock_mailbox($self); } $self->write(\"+OK public-inbox POP3 server signing off\r\n"); - $self->close; + $self->shutdn; undef; } @@ -341,8 +384,8 @@ sub process_line ($$) { \"-ERR command not recognized\r\n"; my $err = $@; if ($err && $self->{sock}) { - chomp($l); - err($self, 'error from: %s (%s)', $l, $err); + $l =~ s/\r?\n//s; + warn("error from: $l ($err)\n"); $res = \"-ERR program fault - command not performed\r\n"; } defined($res) ? $self->write($res) : 0; @@ -351,6 +394,7 @@ sub process_line ($$) { # callback used by PublicInbox::DS for any (e)poll (in/out/hup/err) sub event_step { my ($self) = @_; + local $SIG{__WARN__} = $self->{pop3d}->{warn_cb}; return unless $self->flush_write && $self->{sock} && !$self->{long_cb}; # only read more requests if we've drained the write buffer, |