Mercurial > emacs
view lisp/gnus/pop3.el @ 110410:f2e111723c3a
Merge changes made in Gnus trunk.
Reimplement nnimap, and do tweaks to the rest of the code to support that.
* gnus-int.el (gnus-finish-retrieve-group-infos)
(gnus-retrieve-group-data-early): New functions.
* gnus-range.el (gnus-range-nconcat): New function.
* gnus-start.el (gnus-get-unread-articles): Support early retrieval of
data.
(gnus-read-active-for-groups): Support finishing the early retrieval of
data.
* gnus-sum.el (gnus-summary-move-article): Pass the move-to group name
if the move is internal, so that nnimap can do fast internal moves.
* gnus.el (gnus-article-special-mark-lists): Add uid/active tuples, for
nnimap usage.
* nnimap.el: Rewritten.
* nnmail.el (nnmail-inhibit-default-split-group): New internal variable
to allow the mail splitting to not return a default group. This is
useful for nnimap, which will leave unmatched mail in the inbox.
* utf7.el (utf7-encode): Autoload.
Implement shell connection.
* nnimap.el (nnimap-open-shell-stream): New function.
(nnimap-open-connection): Use it.
Get the number of lines by using BODYSTRUCTURE.
(nnimap-transform-headers): Get the number of lines in each message.
(nnimap-retrieve-headers): Query for BODYSTRUCTURE so that we get the
number of lines.
Not all servers return UIDNEXT. Work past this problem.
Remove junk from end of file.
Fix typo in "bogus" section.
Make capabilties be case-insensitive.
Require cl when compiling.
Don't bug out if the LIST command doesn't have any parameters.
2010-09-17 Knut Anders Hatlen <kahatlen@gmail.com> (tiny change)
* nnimap.el (nnimap-get-groups): Don't bug out if the LIST command
doesn't have any parameters.
(mm-text-html-renderer): Document gnus-article-html.
2010-09-17 Julien Danjou <julien@danjou.info> (tiny fix)
* mm-decode.el (mm-text-html-renderer): Document gnus-article-html.
* dgnushack.el: Define netrc-credentials.
If the user doesn't have a /etc/services, supply some sensible port defaults.
Have `unseen-or-unread' select an unread unseen article first.
(nntp-open-server): Return whether the open was successful or not.
Throughout all files, replace (save-excursion (set-buffer ...)) with (with-current-buffer ... ).
Save result so that it doesn't say "failed" all the time.
Add ~/.authinfo to the default, since that's probably most useful for users.
Don't use the "finish" method when we're reading from the agent.
Add some more nnimap-relevant agent stuff to nnagent.el.
* nnimap.el (nnimap-with-process-buffer): Removed.
Revert one line that was changed by mistake in the last checkin.
(nnimap-open-connection): Don't error out when we can't make a connection
nnimap-related changes to avoid bugging out if we can't contact a server.
* gnus-start.el (gnus-get-unread-articles): Don't try to scan groups
from methods that are denied.
* nnimap.el (nnimap-possibly-change-group): Return nil if we can't log
in.
(nnimap-finish-retrieve-group-infos): Make sure we're not waiting for
nothing.
* gnus-sum.el (gnus-select-newsgroup): Indent.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sat, 18 Sep 2010 10:02:19 +0000 |
parents | 5be11972ce6a |
children | 07940da9c47a |
line wrap: on
line source
;;; pop3.el --- Post Office Protocol (RFC 1460) interface ;; Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, ;; 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Richard L. Pieri <ratinox@peorth.gweep.net> ;; Maintainer: FSF ;; Keywords: mail ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; Most of the standard Post Office Protocol version 3 (RFC 1460) commands ;; are implemented. The LIST command has not been implemented due to lack ;; of actual usefulness. ;; The optional POP3 command TOP has not been implemented. ;; This program was inspired by Kyle E. Jones's vm-pop program. ;;; Code: (eval-when-compile (require 'cl)) (require 'mail-utils) (defvar parse-time-months) (defgroup pop3 nil "Post Office Protocol." :group 'mail :group 'mail-source) (defcustom pop3-maildrop (or (user-login-name) (getenv "LOGNAME") (getenv "USER")) "*POP3 maildrop." :version "22.1" ;; Oort Gnus :type 'string :group 'pop3) (defcustom pop3-mailhost (or (getenv "MAILHOST") ;; nil -> mismatch "pop3") "*POP3 mailhost." :version "22.1" ;; Oort Gnus :type 'string :group 'pop3) (defcustom pop3-port 110 "*POP3 port." :version "22.1" ;; Oort Gnus :type 'number :group 'pop3) (defcustom pop3-password-required t "*Non-nil if a password is required when connecting to POP server." :version "22.1" ;; Oort Gnus :type 'boolean :group 'pop3) ;; Should this be customizable? (defvar pop3-password nil "*Password to use when connecting to POP server.") (defcustom pop3-authentication-scheme 'pass "*POP3 authentication scheme. Defaults to `pass', for the standard USER/PASS authentication. The other valid value is 'apop'." :type '(choice (const :tag "Normal user/password" pass) (const :tag "APOP" apop)) :version "22.1" ;; Oort Gnus :group 'pop3) (defcustom pop3-leave-mail-on-server nil "*Non-nil if the mail is to be left on the POP server after fetching. If `pop3-leave-mail-on-server' is non-nil the mail is to be left on the POP server after fetching. Note that POP servers maintain no state information between sessions, so what the client believes is there and what is actually there may not match up. If they do not, then you may get duplicate mails or the whole thing can fall apart and leave you with a corrupt mailbox." ;; We can't use the UILD support from XEmacs mail-lib or cvs.m17n.org: ;; http://thread.gmane.org/v9lld8fml4.fsf@marauder.physik.uni-ulm.de ;; http://thread.gmane.org/b9yy8hzy9ej.fsf@jpl.org ;; Any volunteer to re-implement this? :version "22.1" ;; Oort Gnus :type 'boolean :group 'pop3) (defvar pop3-timestamp nil "Timestamp returned when initially connected to the POP server. Used for APOP authentication.") (defvar pop3-read-point nil) (defvar pop3-debug nil) ;; Borrowed from nnheader-accept-process-output in nnheader.el. See the ;; comments there for explanations about the values. (eval-and-compile (if (and (fboundp 'nnheader-accept-process-output) (boundp 'nnheader-read-timeout)) (defalias 'pop3-accept-process-output 'nnheader-accept-process-output) ;; Borrowed from `nnheader.el': (defvar pop3-read-timeout (if (string-match "windows-nt\\|os/2\\|cygwin" (symbol-name system-type)) 1.0 0.01) "How long pop3 should wait between checking for the end of output. Shorter values mean quicker response, but are more CPU intensive.") (defun pop3-accept-process-output (process) (accept-process-output process (truncate pop3-read-timeout) (truncate (* (- pop3-read-timeout (truncate pop3-read-timeout)) 1000)))))) ;;;###autoload (defun pop3-movemail (file) "Transfer contents of a maildrop to the specified FILE. Use streaming commands." (let* ((process (pop3-open-server pop3-mailhost pop3-port)) message-count message-total-size) (pop3-logon process) (with-current-buffer (process-buffer process) (let ((size (pop3-stat process))) (setq message-count (car size) message-total-size (cadr size))) (when (plusp message-count) (pop3-send-streaming-command process "RETR" message-count message-total-size) (pop3-write-to-file file) (unless pop3-leave-mail-on-server (pop3-send-streaming-command process "DELE" message-count nil)))) (pop3-quit process) t)) (defun pop3-send-streaming-command (process command count total-size) (erase-buffer) (let ((i 1)) (while (>= count i) (process-send-string process (format "%s %d\r\n" command i)) ;; Only do 100 messages at a time to avoid pipe stalls. (when (zerop (% i 100)) (pop3-wait-for-messages process i total-size)) (incf i))) (pop3-wait-for-messages process count total-size)) (defun pop3-wait-for-messages (process count total-size) (while (< (pop3-number-of-responses total-size) count) (when total-size (message "pop3 retrieved %dKB (%d%%)" (truncate (/ (buffer-size) 1000)) (truncate (* (/ (* (buffer-size) 1.0) total-size) 100)))) (pop3-accept-process-output process))) (defun pop3-write-to-file (file) (let ((pop-buffer (current-buffer)) (start (point-min)) beg end temp-buffer) (with-temp-buffer (setq temp-buffer (current-buffer)) (with-current-buffer pop-buffer (goto-char (point-min)) (while (re-search-forward "^\\+OK" nil t) (forward-line 1) (setq beg (point)) (when (re-search-forward "^\\.\r?\n" nil t) (setq start (point)) (forward-line -1) (setq end (point))) (with-current-buffer temp-buffer (goto-char (point-max)) (let ((hstart (point))) (insert-buffer-substring pop-buffer beg end) (pop3-clean-region hstart (point)) (goto-char (point-max)) (pop3-munge-message-separator hstart (point)) (goto-char (point-max)))))) (let ((coding-system-for-write 'binary)) (goto-char (point-min)) ;; Check whether something inserted a newline at the start and ;; delete it. (when (eolp) (delete-char 1)) (write-region (point-min) (point-max) file nil 'nomesg))))) (defun pop3-number-of-responses (endp) (let ((responses 0)) (save-excursion (goto-char (point-min)) (while (or (and (re-search-forward "^\\+OK" nil t) (or (not endp) (re-search-forward "^\\.\r?\n" nil t))) (re-search-forward "^-ERR " nil t)) (incf responses))) responses)) (defun pop3-logon (process) (let ((pop3-password pop3-password)) ;; for debugging only (if pop3-debug (switch-to-buffer (process-buffer process))) ;; query for password (if (and pop3-password-required (not pop3-password)) (setq pop3-password (read-passwd (format "Password for %s: " pop3-maildrop)))) (cond ((equal 'apop pop3-authentication-scheme) (pop3-apop process pop3-maildrop)) ((equal 'pass pop3-authentication-scheme) (pop3-user process pop3-maildrop) (pop3-pass process)) (t (error "Invalid POP3 authentication scheme"))))) (defun pop3-get-message-count () "Return the number of messages in the maildrop." (let* ((process (pop3-open-server pop3-mailhost pop3-port)) message-count (pop3-password pop3-password)) ;; for debugging only (if pop3-debug (switch-to-buffer (process-buffer process))) ;; query for password (if (and pop3-password-required (not pop3-password)) (setq pop3-password (read-passwd (format "Password for %s: " pop3-maildrop)))) (cond ((equal 'apop pop3-authentication-scheme) (pop3-apop process pop3-maildrop)) ((equal 'pass pop3-authentication-scheme) (pop3-user process pop3-maildrop) (pop3-pass process)) (t (error "Invalid POP3 authentication scheme"))) (setq message-count (car (pop3-stat process))) (pop3-quit process) message-count)) (autoload 'open-tls-stream "tls") (autoload 'starttls-open-stream "starttls") (autoload 'starttls-negotiate "starttls") ; avoid warning (defcustom pop3-stream-type nil "*Transport security type for POP3 connexions. This may be either nil (plain connexion), `ssl' (use an SSL/TSL-secured stream) or `starttls' (use the starttls mechanism to turn on TLS security after opening the stream). However, if this is nil, `ssl' is assumed for connexions to port 995 (pop3s)." :version "23.1" ;; No Gnus :group 'pop3 :type '(choice (const :tag "Plain" nil) (const :tag "SSL/TLS" ssl) (const starttls))) (eval-and-compile (if (fboundp 'set-process-query-on-exit-flag) (defalias 'pop3-set-process-query-on-exit-flag 'set-process-query-on-exit-flag) (defalias 'pop3-set-process-query-on-exit-flag 'process-kill-without-query))) (defun pop3-open-server (mailhost port) "Open TCP connection to MAILHOST on PORT. Returns the process associated with the connection." (let ((coding-system-for-read 'binary) (coding-system-for-write 'binary) process) (save-excursion (set-buffer (get-buffer-create (concat " trace of POP session to " mailhost))) (erase-buffer) (setq pop3-read-point (point-min)) (setq process (cond ((or (eq pop3-stream-type 'ssl) (and (not pop3-stream-type) (member port '(995 "pop3s")))) ;; gnutls-cli, openssl don't accept service names (if (or (equal port "pop3s") (null port)) (setq port 995)) (let ((process (open-tls-stream "POP" (current-buffer) mailhost port))) (when process ;; There's a load of info printed that needs deleting. (let ((again 't)) ;; repeat until ;; - either we received the +OK line ;; - or accept-process-output timed out without getting ;; anything (while (and again (setq again (memq (process-status process) '(open run)))) (setq again (pop3-accept-process-output process)) (goto-char (point-max)) (forward-line -1) (cond ((looking-at "\\+OK") (setq again nil) (delete-region (point-min) (point))) ((not again) (pop3-quit process) (error "POP SSL connexion failed"))))) process))) ((eq pop3-stream-type 'starttls) ;; gnutls-cli, openssl don't accept service names (if (equal port "pop3") (setq port 110)) (let ((process (starttls-open-stream "POP" (current-buffer) mailhost (or port 110)))) (pop3-send-command process "STLS") (let ((response (pop3-read-response process t))) (if (and response (string-match "+OK" response)) (starttls-negotiate process) (pop3-quit process) (error "POP server doesn't support starttls"))) process)) (t (open-network-stream "POP" (current-buffer) mailhost port)))) (let ((response (pop3-read-response process t))) (setq pop3-timestamp (substring response (or (string-match "<" response) 0) (+ 1 (or (string-match ">" response) -1))))) (pop3-set-process-query-on-exit-flag process nil) process))) ;; Support functions (defun pop3-send-command (process command) (set-buffer (process-buffer process)) (goto-char (point-max)) ;; (if (= (aref command 0) ?P) ;; (insert "PASS <omitted>\r\n") ;; (insert command "\r\n")) (setq pop3-read-point (point)) (goto-char (point-max)) (process-send-string process (concat command "\r\n"))) (defun pop3-read-response (process &optional return) "Read the response from the server. Return the response string if optional second argument is non-nil." (let ((case-fold-search nil) match-end) (save-excursion (set-buffer (process-buffer process)) (goto-char pop3-read-point) (while (and (memq (process-status process) '(open run)) (not (search-forward "\r\n" nil t))) (pop3-accept-process-output process) (goto-char pop3-read-point)) (setq match-end (point)) (goto-char pop3-read-point) (if (looking-at "-ERR") (error "%s" (buffer-substring (point) (- match-end 2))) (if (not (looking-at "+OK")) (progn (setq pop3-read-point match-end) nil) (setq pop3-read-point match-end) (if return (buffer-substring (point) match-end) t) ))))) (defun pop3-clean-region (start end) (setq end (set-marker (make-marker) end)) (save-excursion (goto-char start) (while (and (< (point) end) (search-forward "\r\n" end t)) (replace-match "\n" t t)) (goto-char start) (while (and (< (point) end) (re-search-forward "^\\." end t)) (replace-match "" t t) (forward-char))) (set-marker end nil)) ;; Copied from message-make-date. (defun pop3-make-date (&optional now) "Make a valid date header. If NOW, use that time instead." (require 'parse-time) (let* ((now (or now (current-time))) (zone (nth 8 (decode-time now))) (sign "+")) (when (< zone 0) (setq sign "-") (setq zone (- zone))) (concat (format-time-string "%d" now) ;; The month name of the %b spec is locale-specific. Pfff. (format " %s " (capitalize (car (rassoc (nth 4 (decode-time now)) parse-time-months)))) (format-time-string "%Y %H:%M:%S " now) ;; We do all of this because XEmacs doesn't have the %z spec. (format "%s%02d%02d" sign (/ zone 3600) (/ (% zone 3600) 60))))) (defun pop3-munge-message-separator (start end) "Check to see if a message separator exists. If not, generate one." (save-excursion (save-restriction (narrow-to-region start end) (goto-char (point-min)) (if (not (or (looking-at "From .?") ; Unix mail (looking-at "\001\001\001\001\n") ; MMDF (looking-at "BABYL OPTIONS:") ; Babyl )) (let* ((from (mail-strip-quoted-names (mail-fetch-field "From"))) (tdate (mail-fetch-field "Date")) (date (split-string (or (and tdate (not (string= "" tdate)) tdate) (pop3-make-date)) " ")) (From_)) ;; sample date formats I have seen ;; Date: Tue, 9 Jul 1996 09:04:21 -0400 (EDT) ;; Date: 08 Jul 1996 23:22:24 -0400 ;; should be ;; Tue Jul 9 09:04:21 1996 ;; Fixme: This should use timezone on the date field contents. (setq date (cond ((not date) "Tue Jan 1 00:00:0 1900") ((string-match "[A-Z]" (nth 0 date)) (format "%s %s %s %s %s" (nth 0 date) (nth 2 date) (nth 1 date) (nth 4 date) (nth 3 date))) (t ;; this really needs to be better but I don't feel ;; like writing a date to day converter. (format "Sun %s %s %s %s" (nth 1 date) (nth 0 date) (nth 3 date) (nth 2 date))) )) (setq From_ (format "\nFrom %s %s\n" from date)) (while (string-match "," From_) (setq From_ (concat (substring From_ 0 (match-beginning 0)) (substring From_ (match-end 0))))) (goto-char (point-min)) (insert From_) (if (search-forward "\n\n" nil t) nil (goto-char (point-max)) (insert "\n")) (let ((size (- (point-max) (point)))) (forward-line -1) (insert (format "Content-Length: %s\n" size))) ))))) ;; The Command Set ;; AUTHORIZATION STATE (defun pop3-user (process user) "Send USER information to POP3 server." (pop3-send-command process (format "USER %s" user)) (let ((response (pop3-read-response process t))) (if (not (and response (string-match "+OK" response))) (error "USER %s not valid" user)))) (defun pop3-pass (process) "Send authentication information to the server." (pop3-send-command process (format "PASS %s" pop3-password)) (let ((response (pop3-read-response process t))) (if (not (and response (string-match "+OK" response))) (pop3-quit process)))) (defun pop3-apop (process user) "Send alternate authentication information to the server." (let ((pass pop3-password)) (if (and pop3-password-required (not pass)) (setq pass (read-passwd (format "Password for %s: " pop3-maildrop)))) (if pass (let ((hash (md5 (concat pop3-timestamp pass) nil nil 'binary))) (pop3-send-command process (format "APOP %s %s" user hash)) (let ((response (pop3-read-response process t))) (if (not (and response (string-match "+OK" response))) (pop3-quit process))))) )) ;; TRANSACTION STATE (defun pop3-stat (process) "Return the number of messages in the maildrop and the maildrop's size." (pop3-send-command process "STAT") (let ((response (pop3-read-response process t))) (list (string-to-number (nth 1 (split-string response " "))) (string-to-number (nth 2 (split-string response " ")))) )) (defun pop3-list (process &optional msg) "If MSG is nil, return an alist of (MESSAGE-ID . SIZE) pairs. Otherwise, return the size of the message-id MSG" (pop3-send-command process (if msg (format "LIST %d" msg) "LIST")) (let ((response (pop3-read-response process t))) (if msg (string-to-number (nth 2 (split-string response " "))) (let ((start pop3-read-point) end) (save-excursion (set-buffer (process-buffer process)) (while (not (re-search-forward "^\\.\r\n" nil t)) (pop3-accept-process-output process) (goto-char start)) (setq pop3-read-point (point-marker)) (goto-char (match-beginning 0)) (setq end (point-marker)) (mapcar #'(lambda (s) (let ((split (split-string s " "))) (cons (string-to-number (nth 0 split)) (string-to-number (nth 1 split))))) (delete "" (split-string (buffer-substring start end) "\r\n")))))))) (defun pop3-retr (process msg crashbuf) "Retrieve message-id MSG to buffer CRASHBUF." (pop3-send-command process (format "RETR %s" msg)) (pop3-read-response process) (let ((start pop3-read-point) end) (save-excursion (set-buffer (process-buffer process)) (while (not (re-search-forward "^\\.\r\n" nil t)) (pop3-accept-process-output process) (goto-char start)) (setq pop3-read-point (point-marker)) ;; this code does not seem to work for some POP servers... ;; and I cannot figure out why not. ;; (goto-char (match-beginning 0)) ;; (backward-char 2) ;; (if (not (looking-at "\r\n")) ;; (insert "\r\n")) ;; (re-search-forward "\\.\r\n") (goto-char (match-beginning 0)) (setq end (point-marker)) (pop3-clean-region start end) (pop3-munge-message-separator start end) (save-excursion (set-buffer crashbuf) (erase-buffer)) (copy-to-buffer crashbuf start end) (delete-region start end) ))) (defun pop3-dele (process msg) "Mark message-id MSG as deleted." (pop3-send-command process (format "DELE %s" msg)) (pop3-read-response process)) (defun pop3-noop (process msg) "No-operation." (pop3-send-command process "NOOP") (pop3-read-response process)) (defun pop3-last (process) "Return highest accessed message-id number for the session." (pop3-send-command process "LAST") (let ((response (pop3-read-response process t))) (string-to-number (nth 1 (split-string response " "))) )) (defun pop3-rset (process) "Remove all delete marks from current maildrop." (pop3-send-command process "RSET") (pop3-read-response process)) ;; UPDATE (defun pop3-quit (process) "Close connection to POP3 server. Tell server to remove all messages marked as deleted, unlock the maildrop, and close the connection." (pop3-send-command process "QUIT") (pop3-read-response process t) (if process (save-excursion (set-buffer (process-buffer process)) (goto-char (point-max)) (delete-process process)))) ;; Summary of POP3 (Post Office Protocol version 3) commands and responses ;;; AUTHORIZATION STATE ;; Initial TCP connection ;; Arguments: none ;; Restrictions: none ;; Possible responses: ;; +OK [POP3 server ready] ;; USER name ;; Arguments: a server specific user-id (required) ;; Restrictions: authorization state [after unsuccessful USER or PASS ;; Possible responses: ;; +OK [valid user-id] ;; -ERR [invalid user-id] ;; PASS string ;; Arguments: a server/user-id specific password (required) ;; Restrictions: authorization state, after successful USER ;; Possible responses: ;; +OK [maildrop locked and ready] ;; -ERR [invalid password] ;; -ERR [unable to lock maildrop] ;; STLS (RFC 2595) ;; Arguments: none ;; Restrictions: Only permitted in AUTHORIZATION state. ;; Possible responses: ;; +OK ;; -ERR ;;; TRANSACTION STATE ;; STAT ;; Arguments: none ;; Restrictions: transaction state ;; Possible responses: ;; +OK nn mm [# of messages, size of maildrop] ;; LIST [msg] ;; Arguments: a message-id (optional) ;; Restrictions: transaction state; msg must not be deleted ;; Possible responses: ;; +OK [scan listing follows] ;; -ERR [no such message] ;; RETR msg ;; Arguments: a message-id (required) ;; Restrictions: transaction state; msg must not be deleted ;; Possible responses: ;; +OK [message contents follow] ;; -ERR [no such message] ;; DELE msg ;; Arguments: a message-id (required) ;; Restrictions: transaction state; msg must not be deleted ;; Possible responses: ;; +OK [message deleted] ;; -ERR [no such message] ;; NOOP ;; Arguments: none ;; Restrictions: transaction state ;; Possible responses: ;; +OK ;; LAST ;; Arguments: none ;; Restrictions: transaction state ;; Possible responses: ;; +OK nn [highest numbered message accessed] ;; RSET ;; Arguments: none ;; Restrictions: transaction state ;; Possible responses: ;; +OK [all delete marks removed] ;;; UPDATE STATE ;; QUIT ;; Arguments: none ;; Restrictions: none ;; Possible responses: ;; +OK [TCP connection closed] (provide 'pop3) ;;; pop3.el ends here