From: Matthew Vernon <matthew@debian.org>
Date: Sun, 5 Jan 2014 13:21:17 +0000 (+0000)
Subject: Restore the suspicious posters list
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~webstump/git?a=commitdiff_plain;h=e9d05da9b766b444fd932a32cc166be45e65ca7f;p=modbot-ulm.git

Restore the suspicious posters list

ULM mods have decided they'd rather have a watch list for posters than
a ban list. The first part of making that change is reverting the bits
of the remove_steps branch that removed the watched posters list.
---

diff --git a/webstump/doc/help/filter-lists.html b/webstump/doc/help/filter-lists.html
index 595edff..fe7fad7 100644
--- a/webstump/doc/help/filter-lists.html
+++ b/webstump/doc/help/filter-lists.html
@@ -18,6 +18,9 @@ The algorithm for every incoming article is as follows:
   <LI> Reject message if the author is listed in <A
        HREF=##bad.posters.list>the List of Banned Posters.</A>.
 
+  <LI> File message for human review if the author is listed in <A
+       HREF=##watch.posters.list>the List of Untrusted Posters</A>.
+
   <LI> File message for human review if the article contains words from <A
        HREF=##watch.words.list>the List of Suspicious Words</A>.
 
diff --git a/webstump/scripts/filter.lib.pl b/webstump/scripts/filter.lib.pl
index d9e460e..b82a55a 100644
--- a/webstump/scripts/filter.lib.pl
+++ b/webstump/scripts/filter.lib.pl
@@ -102,6 +102,12 @@ sub review_incoming_message { # Newsgroup, From, Subject, RealSubject, Message,
 
   $ignore_demo_mode = 1;
 
+  if( $match = &name_is_in_list( $from, "watch.posters.list" ) ) {
+    &append_to_file( $warning_file, "Warning: poster '$from' matches '$match' from the list of suspicious posters\n" );
+print STDERR "Filing Article for review because poster '$from' matches '$match'\n";
+    return; # file message
+  }
+
   if( $match = &name_is_in_list( $message, "watch.words.list" ) ) {
     &append_to_file( $warning_file, "Warning: article matches '$match' from the list of suspicious words\n" );
 print STDERR "Filing Article for review because article matches '$match'\n";
diff --git a/webstump/scripts/html_output.pl b/webstump/scripts/html_output.pl
index c9d9ce6..505ff32 100644
--- a/webstump/scripts/html_output.pl
+++ b/webstump/scripts/html_output.pl
@@ -754,6 +754,7 @@ sub html_newsgroup_management {
   Configuration List: <SELECT NAME=list_to_edit>
 
     <OPTION VALUE=good.posters.list>Good Posters List
+    <OPTION VALUE=watch.posters.list>Suspicious Posters List
     <OPTION VALUE=bad.posters.list>Banned Posters List
     <OPTION VALUE=watch.words.list>Suspicious Words List
 
diff --git a/webstump/scripts/webstump.lib.pl b/webstump/scripts/webstump.lib.pl
index 5bd575f..379cf06 100644
--- a/webstump/scripts/webstump.lib.pl
+++ b/webstump/scripts/webstump.lib.pl
@@ -397,6 +397,7 @@ sub check_config_list {
 
  &user_error( "invalid list name $list_to_edit" )
     if( $list_to_edit ne "good.posters.list"
+        && $list_to_edit ne "watch.posters.list"
         && $list_to_edit ne "bad.posters.list"
         && $list_to_edit ne "watch.words.list" );