* 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"
+#include "parsedate.h"
+#include "database.h"
+
+
+#ifndef HAVE_SNPRINTF
+#include "snprintf.h"
+#endif
+
+
+struct trynamebuf {
+ char buffer1[SIZ];
+ char buffer2[SIZ];
+};
+
+char *inetcfg = NULL;
+
+
+
+/*
+ * Return nonzero if the supplied name is an alias for this host.
+ */
+int CtdlHostAlias(char *fqdn) {
+ int config_lines;
+ int i;
+ 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');
+ for (i=0; i<config_lines; ++i) {
+ extract_token(buf, inetcfg, i, '\n');
+ extract_token(host, buf, 0, '|');
+ extract_token(type, buf, 1, '|');
+
+ if ( (!strcasecmp(type, "localhost"))
+ && (!strcasecmp(fqdn, host)))
+ return(hostalias_localhost);
+
+ if ( (!strcasecmp(type, "gatewaydomain"))
+ && (!strcasecmp(&fqdn[strlen(fqdn)-strlen(host)], host)))
+ return(hostalias_gatewaydomain);
+
+ if ( (!strcasecmp(type, "directory"))
+ && (!strcasecmp(&fqdn[strlen(fqdn)-strlen(host)], host)))
+ return(hostalias_directory);
+
+ }
+
+ return(hostalias_nomatch);
+}
+
+
+
+
+
/*
* Return 0 if a given string fuzzy-matches a Citadel user account
*
- * FIX ... this needs to be updated to match any and all address syntaxes.
+ * FIXME ... this needs to be updated to handle aliases.
*/
int fuzzy_match(struct usersupp *us, char *matchstring) {
int a;
+ if ( (!strncasecmp(matchstring, "cit", 3))
+ && (atol(&matchstring[3]) == us->usernum)) {
+ return 0;
+ }
+
+
for (a=0; a<strlen(us->fullname); ++a) {
if (!strncasecmp(&us->fullname[a],
matchstring, strlen(matchstring))) {
/*
* 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);
/*
- * Back end for convert_internet_address()
- * (Compares an internet name [buffer1] and stores in [buffer2] if found)
+ * convert_field() is a helper function for convert_internet_message().
+ * Given start/end positions for an rfc822 field, it converts it to a Citadel
+ * field if it wants to, and unfolds it if necessary.
+ *
+ * Returns 1 if the field was converted and inserted into the Citadel message
+ * structure, implying that the source field should be removed from the
+ * message text.
*/
-void try_name(struct usersupp *us) {
-
- if (!strncasecmp(CC->buffer1, "cit", 3))
- if (atol(&CC->buffer1[3]) == us->usernum)
- strcpy(CC->buffer2, us->fullname);
-
- if (!collapsed_strcmp(CC->buffer1, us->fullname))
- strcpy(CC->buffer2, us->fullname);
-
- if (us->uid != BBSUID)
- if (!strcasecmp(CC->buffer1, getpwuid(us->uid)->pw_name))
- strcpy(CC->buffer2, us->fullname);
-}
-
+int convert_field(struct CtdlMessage *msg, int beg, int end) {
+ char *rfc822;
+ char *key, *value;
+ int i;
+ int colonpos = (-1);
+ int processed = 0;
+ 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) {
+ if (rfc822[i] == ':') colonpos = i;
+ }
-/*
- * Convert an Internet email address to a Citadel user/host combination
- */
-int convert_internet_address(char *destuser, char *desthost, char *source)
-{
- char user[256];
- char node[256];
- char name[256];
+ if (colonpos < 0) return(0); /* no colon? not a valid header line */
- /* Split it up */
- process_rfc822_addr(source, user, node, name);
+ key = mallok((end - beg) + 2);
+ safestrncpy(key, &rfc822[beg], (end-beg)+1);
+ key[colonpos - beg] = 0;
+ value = &key[(colonpos - beg) + 1];
+ unfold_rfc822_field(value);
- /* Map the FQDN to a Citadel node name
- * FIX ... we have to check for all known aliases for the local
- * system, and also handle gateway domains, etc. etc.
+ /*
+ * Here's the big rfc822-to-citadel loop.
*/
- if (!strcasecmp(node, config.c_fqdn)) {
- strcpy(node, config.c_nodename);
- }
- /* Return an error condition if the node is not known.
- * FIX ... make this work for non-local systems
- */
- if (strcasecmp(node, config.c_nodename)) {
- return(rfc822_address_invalid);
- }
-
- /* Now try to resolve the name
- * FIX ... do the multiple-addresses thing
+ /* Date/time is converted into a unix timestamp. If the conversion
+ * fails, we replace it with the time the message arrived locally.
*/
- if (!strcasecmp(node, config.c_nodename)) {
- strcpy(destuser, user);
- strcpy(desthost, config.c_nodename);
- strcpy(CC->buffer1, user);
- strcpy(CC->buffer2, "");
- ForEachUser(try_name);
- if (strlen(CC->buffer2) == 0) return(rfc822_no_such_user);
- strcpy(destuser, CC->buffer2);
- return(rfc822_address_locally_validated);
+ if (!strcasecmp(key, "Date")) {
+ parsed_date = parsedate(value);
+ if (parsed_date < 0L) parsed_date = time(NULL);
+ snprintf(buf, sizeof buf, "%ld", (long)parsed_date );
+ if (msg->cm_fields['T'] == NULL)
+ msg->cm_fields['T'] = strdoop(buf);
+ processed = 1;
}
- return(rfc822_address_invalid); /* unknown error */
-}
-
+ else if (!strcasecmp(key, "From")) {
+ 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'] = strdoop(name);
+ processed = 1;
+ if (msg->cm_fields['F'] == NULL)
+ msg->cm_fields['F'] = strdoop(addr);
+ processed = 1;
+ }
+ else if (!strcasecmp(key, "Subject")) {
+ if (msg->cm_fields['U'] == NULL)
+ msg->cm_fields['U'] = strdoop(value);
+ processed = 1;
+ }
+ else if (!strcasecmp(key, "Message-ID")) {
+ if (msg->cm_fields['I'] != NULL) {
+ lprintf(5, "duplicate message id\n");
+ }
-/*
- * convert_field() is a helper function for convert_internet_message().
- * Given start/end positions for an rfc822 field, it converts it to a Citadel
- * field if it wants to, and unfolds it if necessary
- */
-void convert_field(struct CtdlMessage *msg, int beg, int end) {
- char *rfc822;
- char *fieldbuf;
- char field[256];
- int i;
+ if (msg->cm_fields['I'] == NULL) {
+ msg->cm_fields['I'] = strdoop(value);
- rfc822 = msg->cm_fields['M']; /* M field contains rfc822 text */
- strcpy(field, "");
- for (i = beg; i <= end; ++i) {
- if ((rfc822[i] == ':') && ((i-beg)<sizeof(field))) {
- if (strlen(field)==0) {
- safestrncpy(field, &rfc822[beg], i-beg+1);
+ /* 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;
}
- fieldbuf = mallok(end - beg + 2);
- safestrncpy(fieldbuf, &rfc822[beg], end-beg+1);
- unfold_rfc822_field(fieldbuf);
- lprintf(9, "Field: key=<%s> value=<%s>\n", field, fieldbuf);
- phree(fieldbuf);
+ /* 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 msglen;
+ int pos, beg, end, msglen;
int done;
- char buf[256];
+ char buf[SIZ];
+ int converted;
msg = mallok(sizeof(struct CtdlMessage));
if (msg == NULL) return msg;
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_magic = CTDLMESSAGE_MAGIC; /* self check */
msg->cm_anon_type = 0; /* never anonymous */
- msg->cm_format_type = 4; /* always MIME */
+ msg->cm_format_type = FMT_RFC822; /* internet message */
msg->cm_fields['M'] = rfc822;
- /* FIX there's plenty to do here. */
- msglen = strlen(rfc822);
+ lprintf(9, "Unconverted RFC822 message length = %ld\n", (long)strlen(rfc822));
pos = 0;
done = 0;
*/
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? */
- convert_field(msg, beg, end);
+ 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;
}
-
/* Follow-up sanity checks... */
/* 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", (long)time(NULL));
msg->cm_fields['T'] = strdoop(buf);
}
+ lprintf(9, "RFC822 length remaining after conversion = %ld\n",
+ (long)strlen(rfc822));
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);
+}
+
+
+
+/*****************************************************************************
+ * DIRECTORY MANAGEMENT FUNCTIONS *
+ *****************************************************************************/
+
+/*
+ * Generate the index key for an Internet e-mail address to be looked up
+ * in the database.
+ */
+void directory_key(char *key, char *addr) {
+ int i;
+ int keylen = 0;
+
+ for (i=0; i<strlen(addr); ++i) {
+ if (!isspace(addr[i])) {
+ key[keylen++] = tolower(addr[i]);
+ }
+ }
+ key[keylen++] = 0;
+
+ lprintf(9, "Directory key is <%s>\n", key);
+}
+
+
+
+/* Return nonzero if the supplied address is in a domain we keep in
+ * the directory
+ */
+int IsDirectory(char *addr) {
+ char domain[SIZ];
+ int h;
+
+ extract_token(domain, addr, 1, '@');
+ striplt(domain);
+
+ h = CtdlHostAlias(domain);
+ lprintf(9, "IsDirectory(%s)\n", domain);
+
+ if ( (h == hostalias_localhost) || (h == hostalias_directory) ) {
+ lprintf(9, " ...yes\n");
+ return(1);
+ }
+ else {
+ lprintf(9, " ...no\n");
+ return(0);
+ }
+}
+
+
+/*
+ * Initialize the directory database (erasing anything already there)
+ */
+void CtdlDirectoryInit(void) {
+ cdb_trunc(CDB_DIRECTORY);
+}
+
+
+/*
+ * Add an Internet e-mail address to the directory for a user
+ */
+void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
+ char key[SIZ];
+
+ lprintf(9, "Dir: %s --> %s\n",
+ internet_addr, citadel_addr);
+ if (IsDirectory(internet_addr) == 0) return;
+
+ directory_key(key, internet_addr);
+
+ cdb_store(CDB_DIRECTORY, key, strlen(key),
+ citadel_addr, strlen(citadel_addr)+1 );
+}
+
+
+/*
+ * Delete an Internet e-mail address from the directory.
+ *
+ * (NOTE: we don't actually use or need the citadel_addr variable; it's merely
+ * here because the callback API expects to be able to send it.)
+ */
+void CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
+ char key[SIZ];
+
+ directory_key(key, internet_addr);
+ cdb_delete(CDB_DIRECTORY, key, strlen(key) );
+}
+
+
+/*
+ * Look up an Internet e-mail address in the directory.
+ * On success: returns 0, and Citadel address stored in 'target'
+ * On failure: returns nonzero
+ */
+int CtdlDirectoryLookup(char *target, char *internet_addr) {
+ struct cdbdata *cdbrec;
+ char key[SIZ];
+
+ lprintf(9, "CtdlDirectoryLookup(%s)\n", internet_addr);
+
+ if (IsDirectory(internet_addr) == 0) return(-1);
+
+ directory_key(key, internet_addr);
+ cdbrec = cdb_fetch(CDB_DIRECTORY, key, strlen(key) );
+ if (cdbrec != NULL) {
+ safestrncpy(target, cdbrec->ptr, SIZ);
+ cdb_free(cdbrec);
+ lprintf(9, "Looked up as <%s>\n", target);
+ return(0);
+ }
+
+ lprintf(9, "Lookup failed\n");
+ return(-1);
+}
projects / citadel.git / blobdiff