;;; Code:
+(eval-when-compile (require 'cl))
+
(require 'mail-utils)
-(provide 'pop3)
(defconst pop3-version "1.3s")
Used for APOP authentication.")
(defvar pop3-leave-mail-on-server nil
- "Non-nil if mail is to be left on the server and UIDL used for
-message retrieval.")
+ "Non-nil if mail is to be left on the server and UIDL used for message retrieval.")
(defvar pop3-maximum-message-size nil
"If non-nil only download messages smaller than this.")
+(defvar pop3-except-header-regexp nil
+ "If non-nil we do not retrieve messages whose headers are matching this regexp.")
+
(defvar pop3-uidl-file-name "~/.uidls"
"File in which to store the UIDL of processed messages.")
(defvar pop3-debug nil)
(eval-and-compile
- (autoload 'open-ssl-stream "ssl"))
+ (autoload 'open-ssl-stream "ssl")
+ (autoload 'starttls-open-stream "starttls")
+ (autoload 'starttls-negotiate "starttls"))
(defvar pop3-ssl-program-arguments
- '("-quiet")
+ '("s_client" "-quiet")
"Arguments to be passed to the program `pop3-ssl-program-name'.")
+(defun pop3-progress-message (format percent &rest args)
+ (apply (function message) format args))
+
(defun pop3-movemail (&optional crashbox)
"Transfer contents of a maildrop to the specified CRASHBOX."
(or crashbox (setq crashbox (expand-file-name "~/.crashbox")))
(let* ((process (pop3-open-server pop3-mailhost pop3-port))
(crashbuf (get-buffer-create " *pop3-retr*"))
(n 1)
- (msgid 1)
- (msglen 0)
- message-count
(pop3-password pop3-password)
- (pop3-uidl-file-name
- (concat pop3-uidl-file-name "-" pop3-mailhost))
+ (pop3-uidl-file-name
+ (convert-standard-filename
+ (concat pop3-uidl-file-name "-" pop3-mailhost)))
(retrieved-messages nil)
- messages)
+ messages message-count)
;; for debugging only
(if pop3-debug (switch-to-buffer (process-buffer process)))
;; query for password
((equal 'pass pop3-authentication-scheme)
(pop3-user process pop3-maildrop)
(pop3-pass process))
- (t (error "Invalid POP3 authentication scheme.")))
+ (t (error "Invalid POP3 authentication scheme")))
;; get messages that are suitable for download
(message "Retrieving message list...")
(setq messages (pop3-get-message-numbers process)
- message-count (length messages))
- (message (format "Retrieving message list...%d unread" message-count))
+ message-count (length (cdr messages)))
+ (message (format "Retrieving message list...%d of %d unread"
+ message-count (pop messages)))
(unwind-protect
- (progn
- (while (<= n message-count)
- (setq msgid (caar messages)
- msglen (cdar messages)
- messages (cdr messages))
- ;; only retrieve messages matching our regexp or in the uidl list
- (unless (or (not msgid)
- ;; don't download messages that are too large
- (and pop3-maximum-message-size
- (> msglen pop3-maximum-message-size)))
- (message (format "Retrieving message %d of %d from %s..."
- n message-count pop3-mailhost))
- (pop3-retr process msgid crashbuf)
- (setq retrieved-messages (cons msgid retrieved-messages)))
- (setq n (1+ n)))
+ (unless (not (stringp crashbox))
+ (while messages
+ (pop3-progress-message
+ "Retrieving message %d of %d (%d octets) from %s..."
+ (floor (* (/ (float n) message-count) 100))
+ n message-count (cdar messages) pop3-mailhost)
+ (pop3-retr process (caar messages) crashbuf)
+ (push (caar messages) retrieved-messages)
+ (setq messages (cdr messages)
+ n (1+ n)))
(with-current-buffer crashbuf
(write-region-as-binary (point-min) (point-max)
- crashbox 'append 'nomesg)
- )
+ crashbox 'append 'nomesg))
;; mark messages as read
(when pop3-leave-mail-on-server
(pop3-save-uidls))
)
(pop3-quit process))
(kill-buffer crashbuf)
- t))
+ message-count))
+
+(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
+ (pop3-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))
(defun pop3-open-server (mailhost port)
"Open TCP connection to MAILHOST.
-Returns the process associated with the connection."
+Returns the process associated with the connection.
+Argument PORT specifies connecting port."
(let ((process-buffer
(get-buffer-create (format "trace of POP session to %s" mailhost)))
(process))
(cond
((eq pop3-connection-type 'ssl)
(pop3-open-ssl-stream "POP" process-buffer mailhost port))
+ ((eq pop3-connection-type 'tls)
+ (pop3-open-tls-stream "POP" process-buffer mailhost port))
(t
(open-network-stream-as-binary "POP" process-buffer mailhost port))))
(setq pop3-read-point (point-min))
process))
(defun pop3-open-ssl-stream-1 (name buffer host service extra-arg)
- (let* ((ssl-program-arguments
+ (require 'path-util)
+ (let* ((ssl-program-name
+ (cond ((exec-installed-p "openssl")
+ "openssl")
+ (t
+ "ssleay")))
+ (ssl-program-arguments
`(,@pop3-ssl-program-arguments ,extra-arg
"-connect" ,(format "%s:%d" host service)))
(process (open-ssl-stream name buffer host service)))
process))))
(defun pop3-open-ssl-stream (name buffer host service)
- "Open a SSL connection for a service to a host."
- (as-binary-process
- (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
- (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))
+ "Open a SSL connection for a service to a host.
+Returns a subprocess-object to represent the connection.
+Args are NAME BUFFER HOST SERVICE."
+ (cond ((eq system-type 'windows-nt)
+ (let (selective-display
+ (coding-system-for-write 'binary)
+ (coding-system-for-read 'raw-text-dos))
+ (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
+ (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))
+ (t
+ (as-binary-process
+ (or (pop3-open-ssl-stream-1 name buffer host service "-ssl3")
+ (pop3-open-ssl-stream-1 name buffer host service "-ssl2"))))))
+
+(defun pop3-open-tls-stream (name buffer host service)
+ "Open a TLSv1 connection for a service to a host.
+Returns a subprocess-object to represent the connection.
+Args are NAME BUFFER HOST SERVICE."
+ (let ((process
+ (as-binary-process (starttls-open-stream
+ name buffer host service))))
+ (pop3-stls process)
+ (starttls-negotiate process)
+ process))
;; Support functions
(insert output)))
(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"))
- )
+ (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."
+ "Read the response from the server PROCESS.
+Return the response string if optional second argument RETURN is non-nil."
(let ((case-fold-search nil)
match-end)
(save-excursion
;; we use the LIST comand first anyway to get the message lengths.
;; then if we're leaving mail on the server, see if the UIDL command
;; is implemented. if so, we use it to get the message number list.
- (let ((messages (pop3-list process))
- (uidl (if pop3-leave-mail-on-server
- (pop3-get-uidl process))))
- (when messages
- (pop messages)
- (cond
- ((eq pop3-uidl-support t)
- ;; remove elements not in the uidl, this assumes the uidl is short
- (remove-if-not
- (lambda (message) (memq (car message) uidl))
- (reverse messages)))
- (t messages)))))
+ (let* ((messages (pop3-list process))
+ (total (or (pop messages) 0))
+ (uidl (if pop3-leave-mail-on-server
+ (pop3-get-uidl process)))
+ out)
+ (while messages
+ ;; only retrieve messages matching our regexp or in the uidl list
+ (when (and
+ ;; remove elements not in the uidl, this assumes the uidl is short
+ (or (not (eq pop3-uidl-support t))
+ (memq (caar messages) uidl))
+ (caar messages)
+ ;; don't download messages that are too large
+ (not (and pop3-maximum-message-size
+ (> (cdar messages) pop3-maximum-message-size)))
+ (not (and pop3-except-header-regexp
+ (string-match pop3-except-header-regexp
+ (pop3-top process (caar messages) 0)))))
+ (push (car messages) out))
+ (setq messages (cdr messages)))
+ (cons total (reverse out))))
(defun pop3-get-uidl (process)
"Use PROCESS to get a list of unread message numbers."
(defun pop3-save-uidls ()
"Save the updated UIDLs to disk for use next time."
- (when (and pop3-leave-mail-on-server
- pop3-uidl-obarray
- (catch 'found
- (dotimes (i (length pop3-uidl-obarray))
- (if (symbolp (aref pop3-uidl-obarray i))
- (throw 'found t)))))
+ (when (and pop3-leave-mail-on-server
+ ;; UIDL hash table is non-empty
+ (let ((len (length pop3-uidl-obarray)))
+ (while (< 0 len)
+ (setq len (if (symbolp (aref pop3-uidl-obarray (1- len)))
+ -1 (1- len))))
+ (minusp len)))
+ (when (file-readable-p pop3-uidl-file-name)
+ (copy-file pop3-uidl-file-name
+ (concat pop3-uidl-file-name ".old")
+ 'overwrite 'keeptime))
(save-excursion
- (with-temp-buffer
- (when (file-readable-p pop3-uidl-file-name)
- (copy-file pop3-uidl-file-name
- (concat pop3-uidl-file-name ".old")
- 'overwrite 'keeptime))
- (mapatoms
+ (with-temp-file pop3-uidl-file-name
+ (mapatoms
(lambda (atom)
(when (car (symbol-value atom))
(insert (format "%s\n" atom))))
- pop3-uidl-obarray)
- (write-file pop3-uidl-file-name)))))
+ pop3-uidl-obarray)))))
+
;; The Command Set
(if (not (and response (string-match "+OK" response)))
(pop3-quit process))))
+(autoload 'md5 "md5")
+
(defun pop3-apop (process user)
"Send alternate authentication information to the server."
- (if (not (fboundp 'md5)) (autoload 'md5 "md5"))
(let ((hash (md5 (concat pop3-timestamp pop3-password))))
(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)))))
+(defun pop3-stls (process)
+ "Query whether TLS extension is supported"
+ (pop3-send-command process "STLS")
+ (let ((response (pop3-read-response process t)))
+ (if (not (and response (string-match "+OK" response)))
+ (pop3-quit process))))
+
;; TRANSACTION STATE
(defun pop3-stat (process)
(pop3-read-response process)
(save-excursion
(let ((region (pop3-get-extended-response process)))
- (apply 'pop3-munge-message-separator region)
- (apply 'append-to-buffer crashbuf region)
- (apply 'delete-region region)
+ (pop3-munge-message-separator (car region) (cadr region))
+ (append-to-buffer crashbuf (car region) (cadr region))
+ (delete-region (car region) (cadr region))
)))
(defun pop3-dele (process msg)
(set-buffer (process-buffer process))
(goto-char (point-max))
(delete-process process)
- )))
+ ))
+ (when pop3-leave-mail-on-server
+ (mapatoms
+ (lambda (atom)
+ (when (car (symbol-value atom))
+ (unintern atom pop3-uidl-obarray)))
+ pop3-uidl-obarray)))
(defun pop3-uidl (process &optional msgno)
"Return the results of a UIDL command in PROCESS for optional MSGNO.
(cons (length pairs) (nreverse pairs))
)))))
+(defun pop3-top (process msgno &optional lines)
+ "Return the top LINES of messages for PROCESS and MSGNO.
+If msgno is invalid, return nil. Otherwise, return a string."
+ (pop3-send-command process (format "TOP %d %d" msgno (or lines 1)))
+ (if (pop3-read-response process t)
+ nil ;; MSGNO is not valid number
+ (save-excursion
+ (apply 'buffer-substring (pop3-get-extended-response process)))
+ ))
+
;;; Utility code
(defun pop3-get-extended-response (process)
(let ((start pop3-read-point) end)
(set-buffer (process-buffer process))
(goto-char start)
- (while (not (re-search-forward "\\.\r\n" nil t))
+ (while (not (re-search-forward "^\\.\r\n" nil t))
(accept-process-output process 3)
(goto-char start))
(setq pop3-read-point (point-marker))
;; -ERR [invalid password]
;; -ERR [unable to lock maildrop]
+;; STLS
+;; Arguments: none
+;; Restrictions: authorization state
+;; Possible responses:
+;; +OK [negotiation is ready]
+;; -ERR [security layer is already active]
+
;;; TRANSACTION STATE
;; STAT
;; +OK [scan listing follows]
;; -ERR [no such message]
+;; TOP msg [lines]
+;; Arguments: a message-id (required), number of lines (optional)
+;; Restrictions: transaction state; msg must not be deleted
+;; Possible responses:
+;; +OK [partial message listing follows]
+;; -ERR [no such message]
+
;; UIDL [msg]
;; Arguments: a message-id (optional)
;; Restrictions: transaction state; msg must not be deleted
;; Restrictions: none
;; Possible responses:
;; +OK [TCP connection closed]
+
+(provide 'pop3)
+
+;;; pop3.el ends here
projects / elisp / gnus.git- / blobdiff