#include "tools.h"
#include "internet_addressing.h"
#include "user_ops.h"
+#include "room_ops.h"
#include "parsedate.h"
+struct trynamebuf {
+ char buffer1[256];
+ char buffer2[256];
+};
+
+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[256];
+ char host[256], type[256];
+
+ if (!strcasecmp(fqdn, config.c_fqdn)) 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);
+
+ }
+
+ 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.
+ * FIX ... 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))) {
* Back end for convert_internet_address()
* (Compares an internet name [buffer1] and stores in [buffer2] if found)
*/
-void try_name(struct usersupp *us) {
+void try_name(struct usersupp *us, void *data) {
+ struct trynamebuf *tnb;
+ tnb = (struct trynamebuf *)data;
- if (!strncasecmp(CC->buffer1, "cit", 3))
- if (atol(&CC->buffer1[3]) == us->usernum)
- strcpy(CC->buffer2, us->fullname);
+ if (!strncasecmp(tnb->buffer1, "cit", 3))
+ if (atol(&tnb->buffer1[3]) == us->usernum)
+ strcpy(tnb->buffer2, us->fullname);
- if (!collapsed_strcmp(CC->buffer1, us->fullname))
- strcpy(CC->buffer2, us->fullname);
+ if (!collapsed_strcmp(tnb->buffer1, us->fullname))
+ strcpy(tnb->buffer2, us->fullname);
if (us->uid != BBSUID)
- if (!strcasecmp(CC->buffer1, getpwuid(us->uid)->pw_name))
- strcpy(CC->buffer2, us->fullname);
+ if (!strcasecmp(tnb->buffer1, getpwuid(us->uid)->pw_name))
+ strcpy(tnb->buffer2, us->fullname);
}
-
/*
* Convert an Internet email address to a Citadel user/host combination
*/
char user[256];
char node[256];
char name[256];
+ struct quickroom qrbuf;
+ int i;
+ int hostalias;
+ struct trynamebuf tnb;
+ char buf[256];
/* Split it up */
process_rfc822_addr(source, user, node, name);
/* 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.
*/
- if (!strcasecmp(node, config.c_fqdn)) {
- strcpy(node, config.c_nodename);
+ hostalias = CtdlHostAlias(node);
+ switch(hostalias) {
+ case hostalias_localhost:
+ strcpy(node, config.c_nodename);
+ break;
+
+ case hostalias_gatewaydomain:
+ extract_token(buf, node, 0, '.');
+ safestrncpy(node, buf, sizeof buf);
}
- /* 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
*/
if (!strcasecmp(node, config.c_nodename)) {
+ /* Try all local rooms */
+ if (!strncasecmp(user, "room_", 5)) {
+ strcpy(name, &user[5]);
+ for (i=0; i<strlen(name); ++i)
+ if (name[i]=='_') name[i]=' ';
+ if (getroom(&qrbuf, name) == 0) {
+ strcpy(destuser, qrbuf.QRname);
+ strcpy(desthost, config.c_nodename);
+ return rfc822_room_delivery;
+ }
+ }
+
+ /* Try all local users */
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);
+ strcpy(tnb.buffer1, user);
+ strcpy(tnb.buffer2, "");
+ ForEachUser(try_name, &tnb);
+ if (strlen(tnb.buffer2) == 0) return(rfc822_no_such_user);
+ strcpy(destuser, tnb.buffer2);
return(rfc822_address_locally_validated);
}
+ strcpy(destuser, user);
+ strcpy(desthost, node);
return(rfc822_address_invalid); /* unknown error */
}
int colonpos = (-1);
int processed = 0;
char buf[256];
- char *user, *node, *name;
+ 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 (colonpos < 0) return(0); /* no colon? not a valid header line */
- value = mallok((end - beg) + 2);
- safestrncpy(value, &rfc822[beg], (end-beg)+1);
- key = value;
+ 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);
- /* Here's the big rfc822-to-citadel loop. */
+ lprintf(9, "Key=<%s> Value=<%s>\n", key, value);
+
+ /*
+ * 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")) {
- lprintf(9, "converting date <%s>\n", value);
- sprintf(buf, "%ld", parsedate(value) );
- lprintf(9, "parsed value is <%s>\n", buf);
- if (msg->cm_fields['T'] != NULL)
+ parsed_date = parsedate(value);
+ if (parsed_date < 0L) parsed_date = time(NULL);
+ lprintf(9, "Parsed date is %s",
+ asctime(localtime(&parsed_date)));
+ sprintf(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(strlen(value));
- node = mallok(strlen(value));
- name = mallok(strlen(value));
process_rfc822_addr(value, user, node, name);
- if (msg->cm_fields['A'] != NULL)
- msg->cm_fields['A'] = strdoop(user);
- if (msg->cm_fields['N'] != NULL)
- msg->cm_fields['N'] = strdoop(node);
- if (msg->cm_fields['H'] != NULL)
- msg->cm_fields['H'] = strdoop(name);
- phree(user);
- phree(node);
- phree(name);
+ lprintf(9, "Converted to <%s@%s> (%s)\n", user, node, name);
+ sprintf(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(key);
+ if (msg->cm_fields['U'] == NULL)
+ msg->cm_fields['U'] = strdoop(value);
processed = 1;
}
/* Clean up and move on. */
- lprintf(9, "Field: key=<%s> value=<%s> processed=%d\n",
- key, value, processed);
phree(key); /* Don't free 'value', it's actually the same buffer */
return(processed);
}
struct CtdlMessage *msg;
int pos, beg, end;
- int msglen;
int done;
char buf[256];
int converted;
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 = %d\n", strlen(rfc822));
pos = 0;
done = 0;
/* 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 (pos > strlen(rfc822)) done = 1;
}
-
/* Follow-up sanity checks... */
/* If there's no timestamp on this message, set it to now. */
msg->cm_fields['T'] = strdoop(buf);
}
+ lprintf(9, "RFC822 length remaining after conversion = %d\n",
+ strlen(rfc822));
return msg;
}
projects / citadel.git / blobdiff