[mlmmj] mlmmj patches from distributions: Gentoo

* [mlmmj] mlmmj patches from distributions: Gentoo
@ 2022-12-08  1:13 Robin H. Johnson
  2022-12-08  8:01 ` Baptiste Daroussin
                   ` (5 more replies)
  0 siblings, 6 replies; 7+ messages in thread
From: Robin H. Johnson @ 2022-12-08  1:13 UTC (permalink / raw)
  To: mlmmj


[-- Attachment #1.1: Type: text/plain, Size: 1071 bytes --]

It's great to see more active development again.
Gentoo Linux still runs mlmmj for all our lists, and we've got some
patches that would be great to land upstream.

mlmmj-1.3.0-gcc-10.patch - GCC 10 fix

mlmmj-1.2.19.0-listcontrol-customheaders.patch
Include the customheaders file content in list control messages.

mlmmj-1.3.0-logging.patch - this is a brand new patch, not tested yet.
When dropping messages from non-subscribers, we wanted a better trail
about it. Ideally we'd 
1) log the message-id
2) give a per-message SMTP-time rejection (need postfix filter stuff)

There's one scaling discussion we need to have, but the handling needs
to include how to incrementally get there:

How to have millions of mails in /archive/!

Our most active list is now approaching 1.5M emails in that directory,
and it worries me.

-- 
Robin Hugh Johnson
Gentoo Linux: Dev, Infra Lead, Foundation Treasurer
E-Mail   : robbat2@gentoo.org
GnuPG FP : 11ACBA4F 4778E3F6 E4EDF38E B27B944E 34884E85
GnuPG FP : 7D0B3CEB E9B85B1F 825BCECF EE05E6F6 A48F6136

[-- Attachment #1.2: mlmmj-1.3.0-logging.patch --]
[-- Type: text/plain, Size: 2632 bytes --]

On a high-mail system, it's hard to link errors back to specific mails.
Log the list address, poster address and envelope to aid that.

Better work here would be capturing the message-id and logging that, but it's
not presently captured, so that is a more invasive change.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

--- mlmmj-1.3.0.orig/src/mlmmj-process.c	2022-11-24 16:09:30.839848253 -0800
+++ mlmmj-1.3.0/src/mlmmj-process.c	2022-11-24 16:52:32.311365699 -0800
@@ -193,7 +193,8 @@ static void newmoderated(const char *lis
 	if (notifymod) {
 		childpid = fork();
 		if(childpid < 0)
-			log_error(LOG_ARGS, "Could not fork; poster not notified");
+			log_error(LOG_ARGS, "Could not fork; poster not notified"
+ 					"; list=%s poster=%s envelope=%s", listaddr, posteraddr, efromsender);
 	} else
 		childpid = -1;
 
@@ -919,8 +920,10 @@ int main(int argc, char **argv)
 			log_error(LOG_ARGS, "Discarding %s because list"
 					" address was not in To: or Cc:,"
 					" and From: was the list or"
-					" notoccdenymails was set",
-					mailfile);
+					" notoccdenymails was set"
+ 					"; list=%s poster=%s envelope=%s",
+					mailfile,
+					listaddr, posteraddr, efrom);
 			myfree(listaddr);
 			unlink(donemailname);
 			myfree(donemailname);
@@ -971,8 +974,10 @@ int main(int argc, char **argv)
 					" it was denied by an access"
 					" rule, and From: was the list"
 					" address or noaccessdenymails"
-					" was set",
-					mailfile);
+					" was set"
+ 					"; list=%s poster=%s envelope=%s",
+					mailfile,
+					listaddr, posteraddr, efrom);
 				myfree(listaddr);
 				unlink(donemailname);
 				myfree(donemailname);
@@ -1046,8 +1051,10 @@ int main(int argc, char **argv)
 		if (strcasecmp(listaddr, posteraddr) == 0) {
 			log_error(LOG_ARGS, "Discarding %s because"
 					" there are sender restrictions but"
-					" From: was the list address",
-					mailfile);
+					" From: was the list address"
+ 					"; list=%s poster=%s envelope=%s",
+					mailfile,
+					listaddr, posteraddr, efrom);
 			myfree(listaddr);
 			unlink(donemailname);
 			myfree(donemailname);
@@ -1072,8 +1079,10 @@ int main(int argc, char **argv)
 				    (modonlypost &&
 				    statctrl(listdir, "nomodonlydenymails"))) {
 				log_error(LOG_ARGS, "Discarding %s because"
-					" no{sub|mod}onlydenymails was set",
-					mailfile);
+					" no{sub|mod}onlydenymails was set"
+ 					"; list=%s poster=%s envelope=%s",
+					mailfile,
+					listaddr, posteraddr, efrom);
 				myfree(listaddr);
 				unlink(donemailname);
 				myfree(donemailname);

[-- Attachment #1.3: mlmmj-1.3.0-gcc-10.patch --]
[-- Type: text/plain, Size: 656 bytes --]

--- a/include/mlmmj.h
+++ b/include/mlmmj.h
@@ -81,7 +81,7 @@ enum subtype {
 	SUB_NONE /* For when an address is not subscribed at all */
 };
 
-char *subtype_strs[7]; /* count matches enum above; defined in subscriberfuncs.c */
+extern char *subtype_strs[7]; /* count matches enum above; defined in subscriberfuncs.c */
 
 enum subreason {
 	SUB_REQUEST,
@@ -92,7 +92,7 @@ enum subreason {
 	SUB_SWITCH
 };
 
-char * subreason_strs[6]; /* count matches enum above; defined in subscriberfuncs.c */
+extern char * subreason_strs[6]; /* count matches enum above; defined in subscriberfuncs.c */
 
 void print_version(const char *prg);
 

[-- Attachment #1.4: mlmmj-1.2.19.0-listcontrol-customheaders.patch --]
[-- Type: text/plain, Size: 1231 bytes --]

List control emails do not include customheaders, and can lead to RBL issues
for forged senders.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>

diff -Nuar --exclude '*~' mlmmj-1.2.19.0.orig/src/mlmmj-process.c mlmmj-1.2.19.0/src/mlmmj-process.c
--- mlmmj-1.2.19.0.orig/src/mlmmj-process.c	2014-03-23 17:57:24.000000000 -0700
+++ mlmmj-1.2.19.0/src/mlmmj-process.c	2016-05-04 13:50:26.034174788 -0700
@@ -702,8 +702,19 @@
 						    "output mail file");
 				exit(EXIT_FAILURE);
 			}
-			if(do_all_the_voodoo_here(rawmailfd, donemailfd, -1,
-					-1, delheaders,
+			/* hdrfd is checked in do_all_the_voodoo_here(), because the
+			 * customheaders file might not exist */
+			headerfilename = concatstr(2, listdir, "/control/customheaders");
+			hdrfd = open(headerfilename, O_RDONLY);
+			myfree(headerfilename);
+
+			/* footfd is checked in do_all_the_voodoo_here(), see above */
+			footerfilename = concatstr(2, listdir, "/control/footer");
+			footfd = open(footerfilename, O_RDONLY);
+			myfree(footerfilename);
+
+			if(do_all_the_voodoo_here(rawmailfd, donemailfd, hdrfd,
+					footfd, delheaders,
 					NULL, &allheaders, NULL) < 0) {
 				log_error(LOG_ARGS, "do_all_the_voodoo_here");
 				exit(EXIT_FAILURE);

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 1113 bytes --]

^ permalink raw reply	[flat|nested] 7+ messages in thread