X-Git-Url: http://cgit.sxemacs.org/?p=gnus;a=blobdiff_plain;f=lisp%2Fspam-report.el;h=0086dd14792cf4a9eb559060ba9155000581991d;hp=145a30b154858d4dba845cf7cc1324d40607c691;hb=b52037f4a9c6bee1ff556c22750e158da1208d4b;hpb=6c361d03194a4c8470c2866197a82f7e3ec58b05 diff --git a/lisp/spam-report.el b/lisp/spam-report.el index 145a30b15..0086dd147 100644 --- a/lisp/spam-report.el +++ b/lisp/spam-report.el @@ -1,26 +1,24 @@ ;;; spam-report.el --- Reporting spam -;; Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2002-2016 Free Software Foundation, Inc. -;; Author: Teodor Zlatanov -;; Keywords: network +;; Author: Ted Zlatanov +;; Keywords: network, spam, mail, gmane, report ;; This file is part of GNU Emacs. -;; GNU Emacs is free software; you can redistribute it and/or modify +;; 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 2, or (at your option) -;; any later version. +;; 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 +;; 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; see the file COPYING. If not, write to the -;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -;; Boston, MA 02110-1301, USA. +;; along with GNU Emacs. If not, see . ;;; Commentary: @@ -32,8 +30,7 @@ (require 'gnus) (require 'gnus-sum) -(eval-and-compile - (autoload 'mm-url-insert "mm-url")) +(autoload 'mm-url-insert "mm-url") (defgroup spam-report nil "Spam reporting configuration." @@ -46,11 +43,15 @@ If you are using spam.el, consider setting gnus-spam-process-newsgroups or the gnus-group-spam-exit-processor-report-gmane group/topic parameter instead." :type '(radio (const nil) - (regexp :value "^nntp\+.*:gmane\.")) + (regexp :value "^nntp\\+.*:gmane\\.")) :group 'spam-report) (defcustom spam-report-gmane-use-article-number t - "Whether the article number (faster!) or the header should be used." + "Whether the article number (faster!) or the header should be used. + +You must set this to nil if you don't read Gmane groups directly +from news.gmane.org, e.g. when using local newsserver such as +leafnode." :type 'boolean :group 'spam-report) @@ -80,7 +81,7 @@ The function must accept the arguments `host' and `report'." "Email address that spam articles are resent to when reporting. If not set, the user will be prompted to enter a value which will be saved for future use." - :type 'string + :type '(choice (const :tag "Prompt" nil) string) :group 'spam-report) (defvar spam-report-url-ping-temp-agent-function nil @@ -93,43 +94,90 @@ undo that change.") "Report an article as spam by resending via email. Reports is as ham when HAM is set." (dolist (article articles) - (gnus-message 6 + (gnus-message 6 "Reporting %s article %d to <%s>..." (if ham "ham" "spam") article spam-report-resend-to) (unless spam-report-resend-to - (customize-set-variable + (customize-set-variable spam-report-resend-to (read-from-minibuffer "email address to resend SPAM/HAM to? "))) - ;; This is ganked from the `gnus-summary-resend-message' function. + ;; This is yanked from the `gnus-summary-resend-message' function. ;; It involves rendering the SPAM, which is undesirable, but there does ;; not seem to be a nicer way to achieve this. ;; select this particular article (gnus-summary-select-article nil nil nil article) ;; resend it to the destination address - (save-excursion - (set-buffer gnus-original-article-buffer) + (with-current-buffer gnus-original-article-buffer (message-resend spam-report-resend-to)))) (defun spam-report-resend-ham (articles) "Report an article as ham by resending via email." (spam-report-resend articles t)) -(defun spam-report-gmane (&rest articles) - "Report an article as spam through Gmane." +(defconst spam-report-gmane-max-requests 4 + "Number of reports to send before waiting for a response.") + +(defvar spam-report-gmane-wait nil + "When non-nil, wait until we get a server response. +This makes sure we don't DOS the host, if many reports are +submitted at once. Internal variable.") + +(defun spam-report-gmane-ham (&rest articles) + "Report ARTICLES as ham (unregister) through Gmane." (interactive (gnus-summary-work-articles current-prefix-arg)) - (dolist (article articles) - (when (and gnus-newsgroup-name - (or (null spam-report-gmane-regex) - (string-match spam-report-gmane-regex gnus-newsgroup-name))) - (gnus-message 6 "Reporting spam article %d to spam.gmane.org..." article) - (if spam-report-gmane-use-article-number - (spam-report-url-ping - "spam.gmane.org" - (format "/%s:%d" - (gnus-group-real-name gnus-newsgroup-name) - article)) + (let ((count 0)) + (dolist (article articles) + (setq count (1+ count)) + (let ((spam-report-gmane-wait + (zerop (% count spam-report-gmane-max-requests)))) + (spam-report-gmane-internal t article))))) + +(defun spam-report-gmane-spam (&rest articles) + "Report ARTICLES as spam through Gmane." + (interactive (gnus-summary-work-articles current-prefix-arg)) + (let ((count 0)) + (dolist (article articles) + (setq count (1+ count)) + (let ((spam-report-gmane-wait + (zerop (% count spam-report-gmane-max-requests)))) + (spam-report-gmane-internal nil article))))) + +;; `spam-report-gmane' was an interactive entry point, so we should provide an +;; alias. +(defalias 'spam-report-gmane 'spam-report-gmane-spam) + +(defun spam-report-gmane-internal (unspam article) + "Report ARTICLE as spam or not-spam through Gmane, depending on UNSPAM." + (when (and gnus-newsgroup-name + (or (null spam-report-gmane-regex) + (string-match spam-report-gmane-regex gnus-newsgroup-name))) + (let ((rpt-host (if unspam "unspam.gmane.org" "spam.gmane.org"))) + (gnus-message 6 "Reporting article %d to %s..." article rpt-host) + (cond + ;; Special-case nnweb groups -- these have the URL to use in + ;; the Xref headers. + ((eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnweb) + (spam-report-url-ping + rpt-host + (concat + "/" + (gnus-replace-in-string + (gnus-replace-in-string + (gnus-replace-in-string + (mail-header-xref (gnus-summary-article-header article)) + "/raw" ":silent") + "^.*article.gmane.org/" "") + "/" ":")))) + (spam-report-gmane-use-article-number + (spam-report-url-ping + rpt-host + (format "/%s:%d" + (gnus-group-real-name gnus-newsgroup-name) + article))) + (t (with-current-buffer nntp-server-buffer + (erase-buffer) (gnus-request-head article gnus-newsgroup-name) (let ((case-fold-search t) field host report url) @@ -141,24 +189,33 @@ Reports is as ham when HAM is set." ;; There might be more than one Archived-At header so we need to ;; find (and transform) the one related to Gmane. (setq field (or (gnus-fetch-field "X-Report-Spam") + (gnus-fetch-field "X-Report-Unspam") (gnus-fetch-field "Archived-At"))) - (setq host (progn - (string-match - (concat "http://\\([a-z]+\\.gmane\\.org\\)" - "\\(/[^:/]+[:/][0-9]+\\)") - field) - (match-string 1 field))) - (setq report (match-string 2 field)) - (when (string-equal "permalink.gmane.org" host) - (setq host "spam.gmane.org")) - (setq url (format "http://%s%s" host report)) + (if (not (stringp field)) + (if (and (setq field (gnus-fetch-field "Xref")) + (string-match "[^ ]+ +\\([^ ]+\\)" field)) + (setq report (concat "/" (match-string 1 field)) + host rpt-host)) + (setq host + (progn + (string-match + (concat "http://\\([a-z]+\\.gmane\\.org\\)" + "\\(/[^:/]+[:/][0-9]+\\)") + field) + (match-string 1 field))) + (setq report (match-string 2 field))) + (when host + (when (string-equal "permalink.gmane.org" host) + (setq host rpt-host) + (setq report (gnus-replace-in-string + report "/\\([0-9]+\\)$" ":\\1"))) + (setq url (format "http://%s%s" host report))) (if (not (and host report url)) (gnus-message 3 "Could not find a spam report header in article %d..." article) - (gnus-message 7 "Reporting spam through URL %s..." url) - (spam-report-url-ping host report)))))))) - + (gnus-message 7 "Reporting article through URL %s..." url) + (spam-report-url-ping host report))))))))) (defun spam-report-url-ping (host report) "Ping a host through HTTP, addressing a specific GET resource using @@ -168,6 +225,24 @@ the function specified by `spam-report-url-ping-function'." ;; report: "/gmane.some.group:123456" (funcall spam-report-url-ping-function host report)) +(defcustom spam-report-user-mail-address + (and (stringp user-mail-address) + (gnus-replace-in-string user-mail-address "@" "")) + "Mail address of this user used for spam reports to Gmane. +This is initialized based on `user-mail-address'." + :type '(choice string + (const :tag "Don't expose address" nil)) + :version "23.1" ;; No Gnus + :group 'spam-report) + +(defvar spam-report-user-agent + (if spam-report-user-mail-address + (format "%s (%s) %s" "spam-report.el" + spam-report-user-mail-address + (gnus-extended-version)) + (format "%s %s" "spam-report.el" + (gnus-extended-version)))) + (defun spam-report-url-ping-plain (host report) "Ping a host through HTTP, addressing a specific GET resource." (let ((tcp-connection)) @@ -180,10 +255,19 @@ the function specified by `spam-report-url-ping-function'." 80)) (error "Could not open connection to %s" host)) (set-marker (process-mark tcp-connection) (point-min)) + (gnus-set-process-query-on-exit-flag tcp-connection nil) (process-send-string tcp-connection - (format "GET %s HTTP/1.1\nUser-Agent: %s (spam-report.el)\nHost: %s\n\n" - report (gnus-emacs-version) host))))) + (format "GET %s HTTP/1.1\nUser-Agent: %s\nHost: %s\n\n" + report spam-report-user-agent host)) + ;; Wait until we get something so we don't DOS the host, if + ;; `spam-report-gmane-wait' is let-bound to t. + (when spam-report-gmane-wait + (gnus-message 7 "Waiting for response from %s..." host) + (while (and (memq (process-status tcp-connection) '(open run)) + (zerop (buffer-size))) + (accept-process-output tcp-connection 1)) + (gnus-message 7 "Waiting for response from %s... done" host))))) ;;;###autoload (defun spam-report-process-queue (&optional file keep) @@ -207,18 +291,23 @@ symbol `ask', query before flushing the queue file." (gnus-message 7 "Processing requests using `%s'." spam-report-url-ping-function)) (or file (setq file spam-report-requests-file)) - (save-excursion - (set-buffer (find-file-noselect file)) + (with-current-buffer (find-file-noselect file) (goto-char (point-min)) (while (and (not (eobp)) (re-search-forward "http://\\([^/]+\\)\\(/.*\\) *$" (point-at-eol) t)) - (funcall spam-report-url-ping-function (match-string 1) (match-string 2)) + (let ((spam-report-gmane-wait + (zerop (% (mm-line-number-at-pos) + spam-report-gmane-max-requests)))) + (gnus-message 6 "Reporting %s%s..." + (match-string 1) (match-string 2)) + (funcall spam-report-url-ping-function + (match-string 1) (match-string 2))) (forward-line 1)) (if (or (eq keep nil) (and (eq keep 'ask) (y-or-n-p - (format + (gnus-format-message "Flush requests from `%s'? " (current-buffer))))) (progn (gnus-message 7 "Flushing request file `%s'" @@ -294,5 +383,4 @@ Process queued spam reports." (provide 'spam-report) -;;; arch-tag: f6683295-ec89-4ab5-8803-8cc842293022 ;;; spam-report.el ends here.