#include "support.h"
#include "config.h"
#include "tools.h"
+#include "msgbase.h"
#include "internet_addressing.h"
#include "user_ops.h"
#include "room_ops.h"
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 (!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);
+
+ }
+
+ 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)
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]);
+ /* 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);
char name[256];
struct quickroom qrbuf;
int i;
+ int hostalias;
struct trynamebuf tnb;
+ char buf[256];
+ 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
- * 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);
}
/* 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 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) {
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);
+ 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(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);
+ sprintf(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;
}
/* 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;