* to users on the Citadel system.
*/
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include <time.h>
+#include "dynloader.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
#include "tools.h"
+#include "msgbase.h"
#include "internet_addressing.h"
#include "user_ops.h"
#include "room_ops.h"
struct trynamebuf {
- char buffer1[256];
- char buffer2[256];
+ char buffer1[SIZ];
+ char buffer2[SIZ];
};
char *inetcfg = NULL;
int CtdlHostAlias(char *fqdn) {
int config_lines;
int i;
- char buf[256];
- char host[256], type[256];
+ char buf[SIZ];
+ char host[SIZ], type[SIZ];
if (!strcasecmp(fqdn, config.c_fqdn)) return(hostalias_localhost);
+ if (!strcasecmp(fqdn, config.c_nodename)) return(hostalias_localhost);
if (inetcfg == NULL) return(hostalias_nomatch);
config_lines = num_tokens(inetcfg, '\n');
/*
* Return 0 if a given string fuzzy-matches a Citadel user account
*
- * FIX ... this needs to be updated to handle aliases.
+ * FIXME ... this needs to be updated to handle aliases.
*/
int fuzzy_match(struct usersupp *us, char *matchstring) {
int a;
/*
* Split an RFC822-style address into userid, host, and full name
- * (Originally from citmail.c, and unchanged so far)
*
*/
void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
/* extract full name - first, it's From minus <userid> */
strcpy(name, rfc822);
- for (a = 0; a < strlen(name); ++a) {
- if (name[a] == '<') {
- do {
- strcpy(&name[a], &name[a + 1]);
- } while ((strlen(name) > 0) && (name[a] != '>'));
- strcpy(&name[a], &name[a + 1]);
- }
- }
+ stripout(name, '<', '>');
+
/* strip anything to the left of a bang */
while ((strlen(name) > 0) && (haschar(name, '!') > 0))
strcpy(name, &name[1]);
/* but if there are parentheses, that changes the rules... */
if ((haschar(rfc822, '(') == 1) && (haschar(rfc822, ')') == 1)) {
strcpy(name, rfc822);
- while ((strlen(name) > 0) && (name[0] != '(')) {
- strcpy(&name[0], &name[1]);
- }
- strcpy(&name[0], &name[1]);
- for (a = 0; a < strlen(name); ++a) {
- if (name[a] == ')') {
- name[a] = 0;
- }
- }
+ stripallbut(name, '(', ')');
}
+
/* but if there are a set of quotes, that supersedes everything */
if (haschar(rfc822, 34) == 2) {
strcpy(name, rfc822);
strcpy(user, rfc822);
/* first get rid of anything in parens */
- for (a = 0; a < strlen(user); ++a)
- if (user[a] == '(') {
- do {
- strcpy(&user[a], &user[a + 1]);
- } while ((strlen(user) > 0) && (user[a] != ')'));
- strcpy(&user[a], &user[a + 1]);
- }
+ stripout(user, '(', ')');
+
/* if there's a set of angle brackets, strip it down to that */
if ((haschar(user, '<') == 1) && (haschar(user, '>') == 1)) {
- while ((strlen(user) > 0) && (user[0] != '<')) {
- strcpy(&user[0], &user[1]);
- }
- strcpy(&user[0], &user[1]);
- for (a = 0; a < strlen(user); ++a)
- if (user[a] == '>')
- user[a] = 0;
+ stripallbut(user, '<', '>');
}
+
/* strip anything to the left of a bang */
while ((strlen(user) > 0) && (haschar(user, '!') > 0))
strcpy(user, &user[1]);
strcpy(node, rfc822);
/* first get rid of anything in parens */
- for (a = 0; a < strlen(node); ++a)
- if (node[a] == '(') {
- do {
- strcpy(&node[a], &node[a + 1]);
- } while ((strlen(node) > 0) && (node[a] != ')'));
- strcpy(&node[a], &node[a + 1]);
- }
+ stripout(node, '(', ')');
+
/* if there's a set of angle brackets, strip it down to that */
if ((haschar(node, '<') == 1) && (haschar(node, '>') == 1)) {
- while ((strlen(node) > 0) && (node[0] != '<')) {
- strcpy(&node[0], &node[1]);
- }
- strcpy(&node[0], &node[1]);
- for (a = 0; a < strlen(node); ++a)
- if (node[a] == '>')
- node[a] = 0;
+ stripallbut(node, '<', '>');
}
- /* strip anything to the left of a @ */
- while ((strlen(node) > 0) && (haschar(node, '@') > 0))
- strcpy(node, &node[1]);
- /* strip anything to the left of a % */
- while ((strlen(node) > 0) && (haschar(node, '%') > 0))
- strcpy(node, &node[1]);
+ /* If no node specified, tack ours on instead */
+ if (
+ (haschar(node, '@')==0)
+ && (haschar(node, '%')==0)
+ && (haschar(node, '!')==0)
+ ) {
+ strcpy(node, config.c_nodename);
+ }
- /* reduce multiple system bang paths to node!user */
- while ((strlen(node) > 0) && (haschar(node, '!') > 1))
- strcpy(node, &node[1]);
+ else {
- /* now get rid of the user portion of a node!user string */
- for (a = 0; a < strlen(node); ++a)
- if (node[a] == '!')
- node[a] = 0;
+ /* strip anything to the left of a @ */
+ while ((strlen(node) > 0) && (haschar(node, '@') > 0))
+ strcpy(node, &node[1]);
+
+ /* strip anything to the left of a % */
+ while ((strlen(node) > 0) && (haschar(node, '%') > 0))
+ strcpy(node, &node[1]);
+
+ /* reduce multiple system bang paths to node!user */
+ while ((strlen(node) > 0) && (haschar(node, '!') > 1))
+ strcpy(node, &node[1]);
+
+ /* now get rid of the user portion of a node!user string */
+ for (a = 0; a < strlen(node); ++a)
+ if (node[a] == '!')
+ node[a] = 0;
+ }
/* strip leading and trailing spaces in all strings */
striplt(user);
* (Compares an internet name [buffer1] and stores in [buffer2] if found)
*/
void try_name(struct usersupp *us, void *data) {
+ struct passwd *pw;
struct trynamebuf *tnb;
tnb = (struct trynamebuf *)data;
-
+
if (!strncasecmp(tnb->buffer1, "cit", 3))
if (atol(&tnb->buffer1[3]) == us->usernum)
strcpy(tnb->buffer2, us->fullname);
if (!collapsed_strcmp(tnb->buffer1, us->fullname))
strcpy(tnb->buffer2, us->fullname);
- if (us->uid != BBSUID)
- if (!strcasecmp(tnb->buffer1, getpwuid(us->uid)->pw_name))
- strcpy(tnb->buffer2, us->fullname);
+ if (us->uid != BBSUID) {
+ pw = getpwuid(us->uid);
+ if (pw != NULL) {
+ if (!strcasecmp(tnb->buffer1, pw->pw_name)) {
+ strcpy(tnb->buffer2, us->fullname);
+ }
+ }
+ }
}
*/
int convert_internet_address(char *destuser, char *desthost, char *source)
{
- char user[256];
- char node[256];
- char name[256];
+ char user[SIZ];
+ char node[SIZ];
+ char name[SIZ];
struct quickroom qrbuf;
int i;
int hostalias;
struct trynamebuf tnb;
- char buf[256];
+ char buf[SIZ];
+ int passes = 0;
+ char sourcealias[1024];
+
+ safestrncpy(sourcealias, source, sizeof(sourcealias) );
+ alias(sourcealias);
+REALIAS:
/* Split it up */
- process_rfc822_addr(source, user, node, name);
+ process_rfc822_addr(sourcealias, user, node, name);
+ lprintf(9, "process_rfc822_addr() converted to <%s@%s> (%s)\n",
+ user, node, name);
/* Map the FQDN to a Citadel node name
*/
}
/* Now try to resolve the name
- * FIX ... do the multiple-addresses thing
+ * FIXME ... do the multiple-addresses thing
*/
if (!strcasecmp(node, config.c_nodename)) {
+
+
+ /* First, see if we hit an alias. Don't do this more than
+ * a few times, in case we accidentally hit an alias loop
+ */
+ strcpy(sourcealias, user);
+ alias(user);
+ if ( (strcasecmp(user, sourcealias)) && (++passes < 3) )
+ goto REALIAS;
+
/* Try all local rooms */
if (!strncasecmp(user, "room_", 5)) {
strcpy(name, &user[5]);
strcpy(destuser, user);
strcpy(desthost, node);
- return(rfc822_address_invalid); /* unknown error */
+ if (hostalias == hostalias_gatewaydomain)
+ return(rfc822_address_on_citadel_network);
+ return(rfc822_address_nonlocal);
}
int i;
int colonpos = (-1);
int processed = 0;
- char buf[256];
- char *user, *node, *name;
+ char buf[SIZ];
+ char user[1024];
+ char node[1024];
+ char name[1024];
+ char addr[1024];
+ time_t parsed_date;
rfc822 = msg->cm_fields['M']; /* M field contains rfc822 text */
for (i = end; i >= beg; --i) {
value = &key[(colonpos - beg) + 1];
unfold_rfc822_field(value);
- lprintf(9, "Key=<%s> Value=<%s>\n", key, value);
-
- /* Here's the big rfc822-to-citadel loop. */
+ /*
+ * Here's the big rfc822-to-citadel loop.
+ */
+ /* Date/time is converted into a unix timestamp. If the conversion
+ * fails, we replace it with the time the message arrived locally.
+ */
if (!strcasecmp(key, "Date")) {
- sprintf(buf, "%ld", parsedate(value) );
+ parsed_date = parsedate(value);
+ if (parsed_date < 0L) parsed_date = time(NULL);
+ snprintf(buf, sizeof buf, "%ld", parsed_date );
if (msg->cm_fields['T'] == NULL)
msg->cm_fields['T'] = strdoop(buf);
processed = 1;
}
else if (!strcasecmp(key, "From")) {
- user = mallok(1024);
- node = mallok(1024);
- name = mallok(1024);
process_rfc822_addr(value, user, node, name);
lprintf(9, "Converted to <%s@%s> (%s)\n", user, node, name);
+ snprintf(addr, sizeof addr, "%s@%s", user, node);
if (msg->cm_fields['A'] == NULL)
- msg->cm_fields['A'] = user;
- else
- phree(user);
- if (msg->cm_fields['N'] == NULL)
- msg->cm_fields['N'] = node;
- else
- phree(node);
- if (msg->cm_fields['H'] == NULL)
- msg->cm_fields['H'] = name;
- else
- phree(name);
+ msg->cm_fields['A'] = strdoop(name);
+ processed = 1;
+ if (msg->cm_fields['F'] == NULL)
+ msg->cm_fields['F'] = strdoop(addr);
processed = 1;
}
processed = 1;
}
+ else if (!strcasecmp(key, "Message-ID")) {
+ if (msg->cm_fields['I'] != NULL) {
+ lprintf(5, "duplicate message id\n");
+ }
+
+ if (msg->cm_fields['I'] == NULL) {
+ msg->cm_fields['I'] = strdoop(value);
+
+ /* Strip angle brackets */
+ while (haschar(msg->cm_fields['I'], '<') > 0) {
+ strcpy(&msg->cm_fields['I'][0],
+ &msg->cm_fields['I'][1]);
+ }
+ for (i = 0; i<strlen(msg->cm_fields['I']); ++i)
+ if (msg->cm_fields['I'][i] == '>')
+ msg->cm_fields['I'][i] = 0;
+ }
+
+ processed = 1;
+ }
+
/* Clean up and move on. */
phree(key); /* Don't free 'value', it's actually the same buffer */
return(processed);
/*
* Convert an RFC822 message (headers + body) to a CtdlMessage structure.
+ * NOTE: the supplied buffer becomes part of the CtdlMessage structure, and
+ * will be deallocated when CtdlFreeMessage() is called. Therefore, the
+ * supplied buffer should be DEREFERENCED. It should not be freed or used
+ * again.
*/
struct CtdlMessage *convert_internet_message(char *rfc822) {
struct CtdlMessage *msg;
- int pos, beg, end;
+ int pos, beg, end, msglen;
int done;
- char buf[256];
+ char buf[SIZ];
int converted;
msg = mallok(sizeof(struct CtdlMessage));
*/
beg = pos;
end = (-1);
- for (pos=beg; ((pos<=strlen(rfc822))&&(end<0)); ++pos) {
+
+ msglen = strlen(rfc822);
+ while ( (end < 0) && (done == 0) ) {
+
if ((rfc822[pos]=='\n')
&& (!isspace(rfc822[pos+1]))) {
end = pos;
}
- if ( (rfc822[pos]=='\n') /* done w. headers? */
+
+ /* done with headers? */
+ if ( ((rfc822[pos]=='\n')
+ ||(rfc822[pos]=='\r') )
&& ( (rfc822[pos+1]=='\n')
- ||(rfc822[pos+1]=='\r'))) {
+ ||(rfc822[pos+1]=='\r')) ) {
end = pos;
done = 1;
}
+ if (pos >= (msglen-1) ) {
+ end = pos;
+ done = 1;
+ }
+
+ ++pos;
+
}
/* At this point we have a field. Are we interested in it? */
converted = convert_field(msg, beg, end);
- /******
+ /* Strip the field out of the RFC822 header if we used it */
if (converted) {
strcpy(&rfc822[beg], &rfc822[pos]);
pos = beg;
}
- ********/
/* If we've hit the end of the message, bail out */
if (pos > strlen(rfc822)) done = 1;
/* If there's no timestamp on this message, set it to now. */
if (msg->cm_fields['T'] == NULL) {
- sprintf(buf, "%ld", time(NULL));
+ snprintf(buf, sizeof buf, "%ld", time(NULL));
msg->cm_fields['T'] = strdoop(buf);
}
return msg;
}
+
+
+/*
+ * Look for a particular header field in an RFC822 message text. If the
+ * requested field is found, it is unfolded (if necessary) and returned to
+ * the caller. The field name is stripped out, leaving only its contents.
+ * The caller is responsible for freeing the returned buffer. If the requested
+ * field is not present, or anything else goes wrong, it returns NULL.
+ */
+char *rfc822_fetch_field(char *rfc822, char *fieldname) {
+ int pos = 0;
+ int beg, end;
+ int done = 0;
+ int colonpos, i;
+ char *fieldbuf = NULL;
+
+ /* Should never happen, but sometimes we get stupid */
+ if (rfc822 == NULL) return(NULL);
+ if (fieldname == NULL) return(NULL);
+
+ while (!done) {
+
+ /* Locate beginning and end of field, keeping in mind that
+ * some fields might be multiline
+ */
+ beg = pos;
+ end = (-1);
+ for (pos=beg; ((pos<=strlen(rfc822))&&(end<0)); ++pos) {
+ if ((rfc822[pos]=='\n')
+ && (!isspace(rfc822[pos+1]))) {
+ end = pos;
+ }
+ if ( (rfc822[pos]=='\n') /* done w. headers? */
+ && ( (rfc822[pos+1]=='\n')
+ ||(rfc822[pos+1]=='\r'))) {
+ end = pos;
+ done = 1;
+ }
+
+ }
+
+ /* At this point we have a field. Is it The One? */
+ if (end > beg) {
+ fieldbuf = mallok((end-beg)+3);
+ if (fieldbuf == NULL) return(NULL);
+ safestrncpy(fieldbuf, &rfc822[beg], (end-beg)+1);
+ unfold_rfc822_field(fieldbuf);
+ colonpos = (-1);
+ for (i = strlen(fieldbuf); i >= 0; --i) {
+ if (fieldbuf[i] == ':') colonpos = i;
+ }
+ if (colonpos > 0) {
+ fieldbuf[colonpos] = 0;
+ if (!strcasecmp(fieldbuf, fieldname)) {
+ strcpy(fieldbuf, &fieldbuf[colonpos+1]);
+ striplt(fieldbuf);
+ return(fieldbuf);
+ }
+ }
+ phree(fieldbuf);
+ }
+
+ /* If we've hit the end of the message, bail out */
+ if (pos > strlen(rfc822)) done = 1;
+ }
+ return(NULL);
+}