X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitmail.c;h=f1c6ae8c780b1e85708f8a378520dae8d1328151;hb=5b4f25945be356aa3a8797e70bbe16355538a967;hp=83c54ea664dbb8eea1d3fe472d2369e9070cd32b;hpb=de2bed8da8ca1878a155681b9f954e44b0612e11;p=citadel.git

diff --git a/citadel/citmail.c b/citadel/citmail.c
index 83c54ea66..f1c6ae8c7 100644
--- a/citadel/citmail.c
+++ b/citadel/citmail.c
@@ -1,13 +1,17 @@
-/*
- * 
- * Completely reworked version of "citmail"
- * This program attempts to act like a local MDA if you're using sendmail or
- * some other non-Citadel MTA.  It basically just forwards the message to
- * the Citadel SMTP listener on some non-standard port.
- *
- * $Id$
- *
- */
+// This program attempts to act like a local MDA if you're using sendmail or
+// some other non-Citadel MTA.  It basically just contacts the Citadel LMTP
+// listener on a unix domain socket and transmits the message.  Really though,
+// if your MTA supports LMTP then you definitely should be using that instead.
+//
+// Copyright (c) 1987-2021 by the citadel.org team
+//
+// This program is open source software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
 
 #include "sysdep.h"
 #include <stdlib.h>
@@ -17,164 +21,57 @@
 #include <signal.h>
 #include <sys/types.h>
 #include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <sys/un.h>
 #include <netdb.h>
 #include <string.h>
 #include <pwd.h>
 #include <errno.h>
 #include <stdarg.h>
+#include <limits.h>
+#include <libcitadel.h>
 #include "citadel.h"
-#include "citadel_decls.h"
-#include "ipc.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
-#ifndef INADDR_NONE
-#define INADDR_NONE 0xffffffff
-#endif
+#include "citadel_dirs.h"
 
 int serv_sock;
+int debug = 0;
 
-
-void strip_trailing_nonprint(char *buf)
-{
-        while ( (strlen(buf)>0) && (!isprint(buf[strlen(buf) - 1])) )
+void strip_trailing_nonprint(char *buf) {
+        while ( (!IsEmptyStr(buf)) && (!isprint(buf[strlen(buf) - 1])) ) {
                 buf[strlen(buf) - 1] = 0;
+	}
 }
 
 
-
-
-
-
-void timeout(int signum)
-{
+void timeout(int signum) {
 	exit(signum);
 }
 
 
-int connectsock(char *host, char *service, char *protocol)
-{
-	struct hostent *phe;
-	struct servent *pse;
-	struct protoent *ppe;
-	struct sockaddr_in sin;
-	int s, type;
-	struct sockaddr_un sun;
-
-	if ( (!strcmp(protocol, "unix")) || (atoi(service)<0) ) {
-		memset(&sun, 0, sizeof(sun));
-		sun.sun_family = AF_UNIX;
-		sprintf(sun.sun_path, USOCKPATH, 0-atoi(service) );
-
-		s = socket(AF_UNIX, SOCK_STREAM, 0);
-		if (s < 0) {
-			fprintf(stderr, "Can't create socket: %s\n",
-				strerror(errno));
-			exit(3);
-		}
-
-		if (connect(s, (struct sockaddr *) &sun, sizeof(sun)) < 0) {
-			fprintf(stderr, "can't connect: %s\n",
-				strerror(errno));
-			exit(3);
-		}
-
-		return s;
-	}
-
-
-	/* otherwise it's a network connection */
+int uds_connectsock(char *sockpath) {
+	int s;
+	struct sockaddr_un addr;
 
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
+	memset(&addr, 0, sizeof(addr));
+	addr.sun_family = AF_UNIX;
+	strcpy(addr.sun_path, sockpath);
 
-	pse = getservbyname(service, protocol);
-	if (pse) {
-		sin.sin_port = pse->s_port;
-	} else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
-		fprintf(stderr, "Can't get %s service entry: %s\n",
-			service, strerror(errno));
-		exit(3);
-	}
-	phe = gethostbyname(host);
-	if (phe) {
-		memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
-	} else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
-		fprintf(stderr, "Can't get %s host entry: %s\n",
-			host, strerror(errno));
-		exit(3);
-	}
-	if ((ppe = getprotobyname(protocol)) == 0) {
-		fprintf(stderr, "Can't get %s protocol entry: %s\n",
-			protocol, strerror(errno));
-		exit(3);
-	}
-	if (!strcmp(protocol, "udp")) {
-		type = SOCK_DGRAM;
-	} else {
-		type = SOCK_STREAM;
-	}
-
-	s = socket(PF_INET, type, ppe->p_proto);
+	s = socket(AF_UNIX, SOCK_STREAM, 0);
 	if (s < 0) {
-		fprintf(stderr, "Can't create socket: %s\n", strerror(errno));
+		fprintf(stderr, "citmail: Can't create socket: %s\n",
+			strerror(errno));
 		exit(3);
 	}
-	signal(SIGALRM, timeout);
-	alarm(30);
 
-	if (connect(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) {
-		fprintf(stderr, "can't connect to %s.%s: %s\n",
-			host, service, strerror(errno));
+	if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
+		fprintf(stderr, "citmail: can't connect: %s\n",
+			strerror(errno));
+		close(s);
 		exit(3);
 	}
-	alarm(0);
-	signal(SIGALRM, SIG_IGN);
 
-	return (s);
+	return s;
 }
 
-/*
- * convert service and host entries into a six-byte numeric in the format
- * expected by a SOCKS v4 server
- */
-void numericize(char *buf, char *host, char *service, char *protocol)
-{
-	struct hostent *phe;
-	struct servent *pse;
-	struct sockaddr_in sin;
-
-	memset(&sin, 0, sizeof(sin));
-	sin.sin_family = AF_INET;
-
-	pse = getservbyname(service, protocol);
-	if (pse) {
-		sin.sin_port = pse->s_port;
-	} else if ((sin.sin_port = htons((u_short) atoi(service))) == 0) {
-		fprintf(stderr, "Can't get %s service entry: %s\n",
-			service, strerror(errno));
-		exit(3);
-	}
-	buf[1] = (((sin.sin_port) & 0xFF00) >> 8);
-	buf[0] = ((sin.sin_port) & 0x00FF);
-
-	phe = gethostbyname(host);
-	if (phe) {
-		memcpy(&sin.sin_addr, phe->h_addr, phe->h_length);
-	} else if ((sin.sin_addr.s_addr = inet_addr(host)) == INADDR_NONE) {
-		fprintf(stderr, "Can't get %s host entry: %s\n",
-			host, strerror(errno));
-		exit(3);
-	}
-	buf[5] = ((sin.sin_addr.s_addr) & 0xFF000000) >> 24;
-	buf[4] = ((sin.sin_addr.s_addr) & 0x00FF0000) >> 16;
-	buf[3] = ((sin.sin_addr.s_addr) & 0x0000FF00) >> 8;
-	buf[2] = ((sin.sin_addr.s_addr) & 0x000000FF);
-}
 
 /*
  * input binary data from socket
@@ -224,13 +121,13 @@ void serv_gets(char *buf)
 	 */
 	for (i = 0;; i++) {
 		serv_read(&buf[i], 1);
-		if (buf[i] == '\n' || i == 255)
+		if (buf[i] == '\n' || i == (SIZ-1))
 			break;
 	}
 
 	/* If we got a long line, discard characters until the newline.
 	 */
-	if (i == 255)
+	if (i == (SIZ-1))
 		while (buf[i] != '\n')
 			serv_read(&buf[i], 1);
 
@@ -238,6 +135,7 @@ void serv_gets(char *buf)
 	 */
 	buf[i] = 0;
 	strip_trailing_nonprint(buf);
+	if (debug) fprintf(stderr, "> %s\n", buf);
 }
 
 
@@ -246,21 +144,22 @@ void serv_gets(char *buf)
  */
 void serv_puts(char *buf)
 {
-	/* printf("< %s\n", buf); */
+	if (debug) fprintf(stderr, "< %s\n", buf);
 	serv_write(buf, strlen(buf));
 	serv_write("\n", 1);
 }
 
 
 
-
-
 void cleanup(int exitcode) {
 	char buf[1024];
 
+	if (exitcode != 0) {
+		fprintf(stderr, "citmail: error #%d occurred while sending mail.\n", exitcode);
+		fprintf(stderr, "Please check your Citadel configuration.\n");
+	}
 	serv_puts("QUIT");
 	serv_gets(buf);
-	fprintf(stderr, "%s\n", buf);
 	exit(exitcode);
 }
 
@@ -270,43 +169,155 @@ int main(int argc, char **argv) {
 	char buf[1024];
 	char fromline[1024];
 	FILE *fp;
+	int i;
+	struct passwd *pw;
+	int from_header = 0;
+	int in_body = 0;
+	char ctdldir[PATH_MAX]=CTDLDIR;
+	char *sp, *ep;
+	char hostname[256];
+	char **recipients = NULL;
+	int num_recipients = 0;
+	int to_or_cc = 0;
+	int read_recipients_from_headers = 0;
+	char *add_these_recipients = NULL;
+
+	for (i=1; i<argc; ++i) {
+		if (!strcmp(argv[i], "-d")) {
+			debug = 1;
+		}
+		else if (!strcmp(argv[i], "-t")) {
+			read_recipients_from_headers = 1;
+		}
+		else if (!strncmp(argv[i], "-h", 2)) {
+			safestrncpy(ctdldir, &argv[i][2], sizeof ctdldir);
+		}
+		else if (argv[i][0] != '-') {
+			++num_recipients;
+			recipients = realloc(recipients, (num_recipients * sizeof (char *)));
+			recipients[num_recipients - 1] = strdup(argv[i]);
+		}
+	}
+
+	if (chdir(ctdldir) != 0) {
+		fprintf(stderr, "sendcommand: %s: %s\n", ctdldir, strerror(errno));
+		exit(errno);
+	}
+	       
+	pw = getpwuid(getuid());
 
 	fp = tmpfile();
 	if (fp == NULL) return(errno);
-	sprintf(fromline, "From: someone@somewhere.org");
+	serv_sock = uds_connectsock(file_lmtp_socket);
+	serv_gets(buf);
+	if (buf[0] != '2') {
+		fprintf(stderr, "%s\n", &buf[4]);
+		if (debug) fprintf(stderr, "citmail: could not connect to LMTP socket.\n");
+		cleanup(1);
+	}
+
+	sp = strchr (buf, ' ');
+	if (sp == NULL) {
+		if (debug) fprintf(stderr, "citmail: could not calculate hostname.\n");
+		cleanup(2);
+	}
+	sp ++;
+	ep = strchr (sp, ' ');
+	if (ep == NULL) {
+		if (debug) fprintf(stderr, "citmail: error parsing hostname\n");
+		cleanup(3);
+	}
+	else
+		*ep = '\0';
+
+	strncpy(hostname, sp, sizeof hostname);
+
+	snprintf(fromline, sizeof fromline, "From: %s@%s", pw->pw_name, hostname);
 	while (fgets(buf, 1024, stdin) != NULL) {
+		if ( ( (buf[0] == 13) || (buf[0] == 10)) && (in_body == 0) ) {
+			in_body = 1;
+			if (from_header == 0) {
+				fprintf(fp, "%s%s", fromline, buf);
+			}
+		}
+		if (in_body == 0 && !strncasecmp(buf, "From:", 5)) {
+			strcpy(fromline, buf);
+			from_header = 1;
+		}
+
+		if (read_recipients_from_headers) {
+			add_these_recipients = NULL;
+			if ((isspace(buf[0])) && (to_or_cc)) {
+				add_these_recipients = buf;
+			}
+			else {
+				if ((!strncasecmp(buf, "To:", 3)) || (!strncasecmp(buf, "Cc:", 3))) {
+					to_or_cc = 1;
+				}
+				else {
+					to_or_cc = 0;
+				}
+				if (to_or_cc) {
+					add_these_recipients = &buf[3];
+				}
+			}
+
+			if (add_these_recipients) {
+				int num_recp_on_this_line;
+				char this_recp[256];
+
+				num_recp_on_this_line = num_tokens(add_these_recipients, ',');
+				for (i=0; i<num_recp_on_this_line; ++i) {
+					extract_token(this_recp, add_these_recipients,
+						i, ',', sizeof this_recp);
+					striplt(this_recp);
+					if (!IsEmptyStr(this_recp)) {
+						++num_recipients;
+						recipients = realloc(recipients,
+							(num_recipients * sizeof (char *)));
+						recipients[num_recipients - 1] = strdup(this_recp);
+					}
+				}
+			}
+		}
+
 		fprintf(fp, "%s", buf);
-		if (!strncasecmp(buf, "From:", 5)) strcpy(fromline, buf);
 	}
 	strip_trailing_nonprint(fromline);
 
-	sprintf(buf, "%d", SMTP_PORT);
-	serv_sock = connectsock("localhost", buf, "tcp");
-	serv_gets(buf);
-	fprintf(stderr, "%s\n", buf);
-	if (buf[0]!='2') cleanup(1);
-
-	serv_puts("HELO localhost");
-	serv_gets(buf);
-	fprintf(stderr, "%s\n", buf);
-	if (buf[0]!='2') cleanup(1);
-
-	sprintf(buf, "MAIL %s", fromline);
+	sprintf(buf, "LHLO %s", hostname);
 	serv_puts(buf);
-	serv_gets(buf);
-	fprintf(stderr, "%s\n", buf);
-	if (buf[0]!='2') cleanup(1);
+	do {
+		serv_gets(buf);
+		strcat(buf, "    ");
+	} while (buf[3] == '-');
+	if (buf[0] != '2') {
+		if (debug) fprintf(stderr, "citmail: LHLO command failed\n");
+		cleanup(4);
+	}
 
-	sprintf(buf, "RCPT To: %s", argv[1]);
+	snprintf(buf, sizeof buf, "MAIL %s", fromline);
 	serv_puts(buf);
 	serv_gets(buf);
-	fprintf(stderr, "%s\n", buf);
-	if (buf[0]!='2') cleanup(1);
+	if (buf[0] != '2') {
+		if (debug) fprintf(stderr, "citmail: MAIL command failed\n");
+		cleanup(5);
+	}
+
+	for (i=0; i<num_recipients; ++i) {
+		snprintf(buf, sizeof buf, "RCPT To: %s", recipients[i]);
+		serv_puts(buf);
+		serv_gets(buf);
+		free(recipients[i]);
+	}
+	free(recipients);
 
 	serv_puts("DATA");
 	serv_gets(buf);
-	fprintf(stderr, "%s\n", buf);
-	if (buf[0]!='3') cleanup(1);
+	if (buf[0]!='3') {
+		if (debug) fprintf(stderr, "citmail: DATA command failed\n");
+		cleanup(6);
+	}
 
 	rewind(fp);
 	while (fgets(buf, sizeof buf, fp) != NULL) {
@@ -315,8 +326,17 @@ int main(int argc, char **argv) {
 	}
 	serv_puts(".");
 	serv_gets(buf);
-	fprintf(stderr, "%s\n", buf);
-	if (buf[0]!='2') cleanup(1);
-	else cleanup(0);
+	if (buf[0] != '2') {
+		fprintf(stderr, "%s\n", &buf[4]);
+		cleanup(7);
+	}
+	else {
+		cleanup(0);
+	}
+
+	/* We won't actually reach this statement but the compiler will
+	 * display a spurious warning about an invalid return type if
+	 * we don't return an int.
+	 */
 	return(0);
 }