This contains part of the BOFH patch by Andrew Gierth and my backport of the INN 2.x code to modify headers. --- inn-1.7.2.orig/nnrpd/post.c +++ inn-1.7.2/nnrpd/post.c @@ -20,8 +20,8 @@ STATIC char *tmpPtr ; STATIC char Error[SMBUF]; STATIC char NGSEPS[] = NG_SEPARATOR; -STATIC char **OtherHeaders; -STATIC int OtherCount; +char **OtherHeaders; +int OtherCount; STATIC int OtherSize; STATIC BOOL WasMailed; STATIC STRING BadDistribs[] = { @@ -886,8 +893,13 @@ #if defined(DO_PERL) /* Calls the Perl subroutine for headers management */ - if ((p = (char *)HandleHeaders()) != NULL) + if ((p = (char *)HandleHeaders(article)) != NULL) { + if (strncmp(p, "DROP", 4) == 0) { + syslog(L_NOTICE, "%s post %s", ClientHost, p); + return NULL; + } return p; + } #endif /* defined(DO_PERL) */ /* Open a local connection to the server. */ --- inn-1.7.2.orig/nnrpd/perl.c +++ inn-1.7.2/nnrpd/perl.c @@ -23,25 +23,40 @@ #include "paths.h" #include "post.h" #include "logging.h" +#include "macros.h" #if defined(DO_PERL) #include #include +#define my_perl PerlCode +extern PerlInterpreter *PerlCode; extern BOOL PerlFilterActive; extern HEADER Table[], *EndOfTable; extern char LogName[]; +extern char PERMuser[]; + +extern char **OtherHeaders; +extern int OtherCount; +static int HeaderLen; char * -HandleHeaders() +HandleHeaders(artBody) +char *artBody; { dSP; HEADER *hp; HV *hdr; + SV *body; int rc; char *p; static char buf[256]; + register int i; + register char *s,*t; + HE *scan; + SV *modswitch; + int OtherSize; if (!PerlFilterActive) return NULL; /* not really necessary */ @@ -56,17 +71,81 @@ hv_store(hdr, (char *) hp->Name, strlen(hp->Name), newSVpv(hp->Value, 0), 0); } + /* Also store other headers */ + OtherSize = OtherCount; + for (i = 0; i < OtherCount; i++) { + p = OtherHeaders[i]; + if (p == NULL) { + syslog (L_ERROR,"Null header number %d copying headers for Perl",i); + continue; + } + s = strchr(p,':'); + if (s == NULL) { + syslog (L_ERROR,"Bad header copying headers for Perl: '%s'",p); + continue; + } + s++; + t = (*s == ' ' ? s + 1 : s); + hv_store(hdr, p, (s - p) - 1, newSVpv(t, 0), 0); + } + /* Store user */ + sv_setpv(perl_get_sv("user",TRUE), PERMuser); + + /* Store body */ + body = perl_get_sv("body", TRUE); + sv_setpv(body, artBody); + + /* Call the filtering function */ rc = perl_call_argv("filter_post", G_EVAL|G_SCALAR, NULL); SPAGAIN; + /* Restore headers */ + modswitch = perl_get_sv("modify_headers",FALSE); + if (SvTRUE(modswitch)) { + HeaderLen = 0; + i = 0; + + hv_iterinit(hdr); + while ((scan = hv_iternext(hdr)) != NULL) { + register int x; + + /* Get the values */ + p = HePV(scan, PL_na); + s = SvPV(HeVAL(scan), PL_na); + + /* See if it's a table header */ + for (hp = Table; hp < EndOfTable; hp++) { + if (caseEQn(p, hp->Name, hp->Size)) { + hp->Value = COPY(s); + HeaderLen += strlen(s) + hp->Size + 3; + break; + } + } + if (hp != EndOfTable) continue; + + /* Add to other headers */ + if (i >= OtherSize - 1) { + OtherSize += 20; + RENEW(OtherHeaders, char*, OtherSize); + } + x = strlen(p) + strlen(s) + 3; + t = NEW(char, x); + sprintf(t,"%s: %s",p,s); + OtherHeaders[i++] = t; + HeaderLen += x; + } + OtherCount = i; + } + hv_undef (hdr); + sv_setsv (body, &PL_sv_undef); buf [0] = '\0' ; - if (SvTRUE(GvSV(errgv))) /* check $@ */ { + if (SvTRUE(ERRSV)) /* check $@ */ { syslog (L_ERROR,"Perl function filter_post died: %s", - SvPV(GvSV(errgv), na)) ; + SvPV(ERRSV, PL_na)) ; POPs ; PerlFilter (FALSE) ; } else if (rc == 1) {