Ticket #24: store-filtered.diff

doc/man/storage.conf.5

@@ -36 +36 @@
         expires: <mintime>[,<maxtime>]
         options: <options>
         exactmatch: <bool>
+        filtered: <bool>
 }
 
 .fi
@@ -122 +123 @@
 described above.)  This is a boolan value and ``true'', ``yes''
 and ``on'' are usable to enable this key.  The case of these values is not
 significant.  The default is false.
+.TP
+.B filtered
+If this key is set to ``true'', the article must have been rejected by the
+Perl/Python filter.  This also requires that ``dontfilterrejected'' is set 
+to ``true'' in
+.IR inn.conf .
+This is a boolan value and ``true'', ``yes'' and ``on'' are usable to enable
+this key.  The case of these values is not significant.  The default is false.
 .PP
 If an article matches all of the constraints of an entry, it is stored via
 that storage method and is associated with that <storage_class>.  This

include/storage.h

@@ -44 +44 @@
   void           *private;   /* A pointer to method specific data */
   time_t         arrived;    /* The time when the article arrived */
   time_t         expires;    /* The time when the article will be expired */
+  bool           filtered;   /* Article was marked by the filter */
   char           *groups;    /* Where Newsgroups header starts */
   int            groupslen;  /* Length of Newsgroups header */
   TOKEN          *token;     /* A pointer to the article's TOKEN */

innd/art.c

@@ -518 +518 @@
   arth.arrived = (time_t)0;
   arth.token = (TOKEN *)NULL;
   arth.expires = data->Expires;
+  arth.filtered = data->Filtered;
   if (innconf->storeonxref) {
     arth.groups = data->Replic;
     arth.groupslen = data->ReplicLength;
@@ -1886 +1887 @@
   TMRstop(TMR_PYTHON);
   if (filterrc != NULL) {
     if (innconf->dontrejectfiltered) {
+      snprintf(cp->Error, sizeof(cp->Error), "%d %.200s", NNTP_REJECTIT_VAL,
+               filterrc);
+      syslog(L_NOTICE, "filtering[python] %s %s", HDR(HDR__MESSAGE_ID),
+             cp->Error);
       Filtered = true;
     } else {
       snprintf(cp->Error, sizeof(cp->Error), "%d %.200s", NNTP_REJECTIT_VAL,
@@ -1913 +1918 @@
   if (filterrc) {
     if (innconf->dontrejectfiltered) {
       Filtered = true;
+      snprintf(cp->Error, sizeof(cp->Error), "%d %.200s", NNTP_REJECTIT_VAL,
+               filterrc);
+      syslog(L_NOTICE, "filtering[perl] %s %s", HDR(HDR__MESSAGE_ID),
+             cp->Error);
     } else {
       snprintf(cp->Error, sizeof(cp->Error), "%d %.200s", NNTP_REJECTIT_VAL,
                filterrc);
@@ -2295 +2304 @@
   for (i = 0; (ngp = GroupPointers[i]) != NULL; i++)
     ngp->PostCount = 0;
 
+  data->Filtered = Filtered;
   token = ARTstore(cp);
   /* change trailing '\r\n' to '\0\n' of all system header */
   for (i = 0 ; i < MAX_ARTHEADER ; i++) {

innd/innd.h

@@ -197 +197 @@
   int             HeaderLines;          /* number of header lines */
   long            BytesValue;           /* size of stored article, "\r\n" is
                                            counted as 1 byte */
+  bool            Filtered;             /* Marked by filter */
   char            Bytes[16];            /* generated Bytes header */
   int             BytesLength;          /* generated Bytes header length */
   char        *   BytesHeader;          /* where Bytes header begins in

scripts/innreport_inn.pm

@@ -244 +244 @@
       # SERVER cancelled +id
       return 1 if $left =~ /^SERVER cancelled /o;
     }
-    # rejecting[perl]
-    if ($left =~ /^rejecting\[perl\] <[^>]+> \d+ (.*)/o) {
+    # rejecting[perl]/filtering[perl]
+    if ($left =~ /^(?:rejecting|filtering)\[perl\] <[^>]+> \d+ (.*)/o) {
       $innd_filter_perl{$1}++;
       return 1;
     }

storage/interface.c

@@ -334 +334 @@
 #define SMexpire  14
 #define SMoptions 15
 #define SMexactmatch 16
+#define SMfiltered 17
 
 static CONFTOKEN smtoks[] = {
   { SMlbrace,   "{" },
@@ -345 +346 @@
   { SMexpire,   "expires:" },
   { SMoptions,  "options:" },
   { SMexactmatch,       "exactmatch:" },
+  { SMfiltered, "filtered:" },
   { 0, 0 }
 };
 
@@ -371 +373 @@
     char                *options = 0;
     int                 inbrace;
     bool                exactmatch = false;
+    bool                filtered = false;
 
     /* if innconf isn't already read in, do so. */
     if (innconf == NULL) {
@@ -423 +426 @@
             minexpire = 0;
             maxexpire = 0;
             exactmatch = false;
+            filtered = false;
 
         } else {
             type = tok->type;
@@ -470 +474 @@
                         || strcasecmp(p, "on") == 0)
                         exactmatch = true;
                     break;
+                  case SMfiltered:
+                    if (strcasecmp(p, "true") == 0
+                        || strcasecmp(p, "yes") == 0
+                        || strcasecmp(p, "on") == 0)
+                        filtered = true;
+                    break;
                   default:
                     SMseterror(SMERR_CONFIG, "Unknown keyword in method declaration");
                     syslog(L_ERROR, "SM Unknown keyword in method declaration, line %d: %s", f->lineno, tok->name);
@@ -512 +522 @@
             sub->minexpire = minexpire;
             sub->maxexpire = maxexpire;
             sub->exactmatch = exactmatch;
+            sub->filtered = filtered;
 
             free(method);
             method = 0;
@@ -694 +705 @@
             (!sub->minexpire || article.expires >= sub->minexpire) &&
             (!sub->maxexpire || (article.expires <= sub->maxexpire)) &&
             MatchGroups(article.groups, article.groupslen, sub->pattern,
-                        sub->exactmatch)) {
+                        sub->exactmatch) &&
+            (sub->filtered == article.filtered)) {
             if (InitMethod(typetoindex[sub->type]))
                 return sub;
         }

storage/interface.h

@@ -45 +45 @@
                                         method */
     bool                exactmatch;  /* all newsgroups to which article belongs
                                         should match the patterns */
+    bool                filtered;    /* article was marked by the filter */
     struct __S_SUB__   *next;
 } STORAGE_SUB;