Make upas/marshal fail when attachments cannot be read

Make upas/marshal fail when attachments cannot be read

[Alex Musolino]

Upas/marshal currently proceeds to send messages even when some of
the attachments cannot be read.  The following patch instead makes
this a fatal error so that no delivery takes place.

Any objections?

diff -r 902035955580 sys/src/cmd/upas/marshal/marshal.c
--- a/sys/src/cmd/upas/marshal/marshal.c	Thu Jun 18 12:11:06 2020 +0930
+++ b/sys/src/cmd/upas/marshal/marshal.c	Sun Jun 21 15:30:28 2020 +0930
@@ -136,6 +136,7 @@
 char *login;
 Alias *aliases;
 int rfc822syntaxerror;
+int attachfailed;
 char lastchar;
 char *replymsg;
 
@@ -308,6 +309,10 @@
 		holding = holdon();
 		headersrv = readheaders(&in, &flags, &hdrstring,
 			eightflag? &to: nil, eightflag? &cc: nil, eightflag? &bcc: nil, l, 1);
+		if(attachfailed){
+			Bdrain(&in);
+			fatal("attachment(s) failed, message not sent");
+		}
 		if(rfc822syntaxerror){
 			Bdrain(&in);
 			fatal("rfc822 syntax error, message not sent");
@@ -501,8 +506,11 @@
 				if(att == nil)
 					break;
 				*att = mkattach(hdrval(s_to_c(sline)), nil, hdrtype == Hinclude);
-				if(*att != nil)
-					att = &(*att)->next;
+				if(*att == nil){
+					attachfailed = 1;
+					return Error;
+				}
+				att = &(*att)->next;
 				break;
 			}
 			s_free(sline);

Re: [9front] Make upas/marshal fail when attachments cannot be read

[Stanley Lieber]

On June 21, 2020 2:06:14 AM EDT, Alex Musolino <alex@musolino.id.au> wrote:
>Upas/marshal currently proceeds to send messages even when some of
>the attachments cannot be read.  The following patch instead makes
>this a fatal error so that no delivery takes place.
>
>Any objections?
>
>diff -r 902035955580 sys/src/cmd/upas/marshal/marshal.c
>--- a/sys/src/cmd/upas/marshal/marshal.c	Thu Jun 18 12:11:06 2020 +0930
>+++ b/sys/src/cmd/upas/marshal/marshal.c	Sun Jun 21 15:30:28 2020 +0930
>@@ -136,6 +136,7 @@
> char *login;
> Alias *aliases;
> int rfc822syntaxerror;
>+int attachfailed;
> char lastchar;
> char *replymsg;
> 
>@@ -308,6 +309,10 @@
> 		holding = holdon();
> 		headersrv = readheaders(&in, &flags, &hdrstring,
> 			eightflag? &to: nil, eightflag? &cc: nil, eightflag? &bcc: nil, l, 1);
>+		if(attachfailed){
>+			Bdrain(&in);
>+			fatal("attachment(s) failed, message not sent");
>+		}
> 		if(rfc822syntaxerror){
> 			Bdrain(&in);
> 			fatal("rfc822 syntax error, message not sent");
>@@ -501,8 +506,11 @@
> 				if(att == nil)
> 					break;
> 				*att = mkattach(hdrval(s_to_c(sline)), nil, hdrtype == Hinclude);
>-				if(*att != nil)
>-					att = &(*att)->next;
>+				if(*att == nil){
>+					attachfailed = 1;
>+					return Error;
>+				}
>+				att = &(*att)->next;
> 				break;
> 			}
> 			s_free(sline);

i approve