#include <limits.h>
#include "citadel.h"
#include "server.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
};
char *inetcfg = NULL;
-
+struct spamstrings_t *spamstrings = NULL;
/*
int CtdlHostAlias(char *fqdn) {
int config_lines;
int i;
- char buf[SIZ];
- char host[SIZ], type[SIZ];
+ char buf[256];
+ char host[256], type[256];
+ if (fqdn == NULL) return(hostalias_nomatch);
+ if (strlen(fqdn) == 0) return(hostalias_nomatch);
+ if (!strcasecmp(fqdn, "localhost")) return(hostalias_localhost);
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, '|');
+ extract_token(buf, inetcfg, i, '\n', sizeof buf);
+ extract_token(host, buf, 0, '|', sizeof host);
+ extract_token(type, buf, 1, '|', sizeof type);
if ( (!strcasecmp(type, "localhost"))
&& (!strcasecmp(fqdn, host)))
*
* FIXME ... this needs to be updated to handle aliases.
*/
-int fuzzy_match(struct usersupp *us, char *matchstring) {
+int fuzzy_match(struct ctdluser *us, char *matchstring) {
int a;
if ( (!strncasecmp(matchstring, "cit", 3))
* Split an RFC822-style address into userid, host, and full name
*
*/
-void process_rfc822_addr(char *rfc822, char *user, char *node, char *name)
+void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
{
int a;
striplt(user);
striplt(node);
striplt(name);
-}
-
-
-
-/*
- * Back end for convert_internet_address()
- * (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) {
- pw = getpwuid(us->uid);
- if (pw != NULL) {
- if (!strcasecmp(tnb->buffer1, pw->pw_name)) {
- strcpy(tnb->buffer2, us->fullname);
- }
- }
- }
-}
-
-/*
- * Convert an Internet email address to a Citadel user/host combination
- */
-int convert_internet_address(char *destuser, char *desthost, char *source)
-{
- char user[SIZ];
- char node[SIZ];
- char name[SIZ];
- struct quickroom qrbuf;
- int i;
- int hostalias;
- struct trynamebuf tnb;
- char buf[SIZ];
- int passes = 0;
- char sourcealias[1024];
-
- safestrncpy(sourcealias, source, sizeof(sourcealias) );
- alias(sourcealias);
-
-REALIAS:
- /* Split it up */
- 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
- */
- 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
- * FIXME ... do the multiple-addresses thing
+ /* If we processed a string that had the address in angle brackets
+ * but no name outside the brackets, we now have an empty name. In
+ * this case, use the user portion of the address as the name.
*/
- 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]);
- 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(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);
- if (hostalias == hostalias_gatewaydomain) {
- return(rfc822_address_on_citadel_network);
+ if ((strlen(name) == 0) && (strlen(user) > 0)) {
+ strcpy(name, user);
}
- return(rfc822_address_nonlocal);
}
-
/*
* convert_field() is a helper function for convert_internet_message().
* Given start/end positions for an rfc822 field, it converts it to a Citadel
if (colonpos < 0) return(0); /* no colon? not a valid header line */
- key = mallok((end - beg) + 2);
+ key = malloc((end - beg) + 2);
safestrncpy(key, &rfc822[beg], (end-beg)+1);
key[colonpos - beg] = 0;
value = &key[(colonpos - beg) + 1];
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);
+ msg->cm_fields['T'] = strdup(buf);
processed = 1;
}
else if (!strcasecmp(key, "From")) {
process_rfc822_addr(value, user, node, name);
- lprintf(9, "Converted to <%s@%s> (%s)\n", user, node, name);
+ lprintf(CTDL_DEBUG, "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);
+ msg->cm_fields['A'] = strdup(name);
processed = 1;
if (msg->cm_fields['F'] == NULL)
- msg->cm_fields['F'] = strdoop(addr);
+ msg->cm_fields['F'] = strdup(addr);
processed = 1;
}
else if (!strcasecmp(key, "Subject")) {
if (msg->cm_fields['U'] == NULL)
- msg->cm_fields['U'] = strdoop(value);
+ msg->cm_fields['U'] = strdup(value);
+ processed = 1;
+ }
+
+ else if (!strcasecmp(key, "To")) {
+ if (msg->cm_fields['R'] == NULL)
+ msg->cm_fields['R'] = strdup(value);
processed = 1;
}
else if (!strcasecmp(key, "Message-ID")) {
if (msg->cm_fields['I'] != NULL) {
- lprintf(5, "duplicate message id\n");
+ lprintf(CTDL_WARNING, "duplicate message id\n");
}
if (msg->cm_fields['I'] == NULL) {
- msg->cm_fields['I'] = strdoop(value);
+ msg->cm_fields['I'] = strdup(value);
/* Strip angle brackets */
while (haschar(msg->cm_fields['I'], '<') > 0) {
}
/* Clean up and move on. */
- phree(key); /* Don't free 'value', it's actually the same buffer */
+ free(key); /* Don't free 'value', it's actually the same buffer */
return(processed);
}
char buf[SIZ];
int converted;
- msg = mallok(sizeof(struct CtdlMessage));
+ msg = malloc(sizeof(struct CtdlMessage));
if (msg == NULL) return msg;
memset(msg, 0, sizeof(struct CtdlMessage));
msg->cm_format_type = FMT_RFC822; /* internet message */
msg->cm_fields['M'] = rfc822;
- lprintf(9, "Unconverted RFC822 message length = %ld\n", (long)strlen(rfc822));
pos = 0;
done = 0;
}
/* done with headers? */
- if ( ((rfc822[pos]=='\n')
- ||(rfc822[pos]=='\r') )
+ if ( (rfc822[pos]=='\n')
&& ( (rfc822[pos+1]=='\n')
||(rfc822[pos+1]=='\r')) ) {
end = pos;
/* If there's no timestamp on this message, set it to now. */
if (msg->cm_fields['T'] == NULL) {
snprintf(buf, sizeof buf, "%ld", (long)time(NULL));
- msg->cm_fields['T'] = strdoop(buf);
+ msg->cm_fields['T'] = strdup(buf);
}
- lprintf(9, "RFC822 length remaining after conversion = %ld\n",
- (long)strlen(rfc822));
return msg;
}
* 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;
+ char *end_of_headers;
+ char *field_start;
+ char *ptr;
+ char *cont;
+ char fieldhdr[SIZ];
/* Should never happen, but sometimes we get stupid */
if (rfc822 == NULL) return(NULL);
if (fieldname == NULL) return(NULL);
- while (!done) {
+ snprintf(fieldhdr, sizeof fieldhdr, "%s:", fieldname);
- /* 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;
- }
+ /* Locate the end of the headers, so we don't run past that point */
+ end_of_headers = bmstrstr(rfc822, "\n\r\n", strncmp);
+ if (end_of_headers == NULL) {
+ end_of_headers = bmstrstr(rfc822, "\n\n", strncmp);
+ }
+ if (end_of_headers == NULL) return (NULL);
+
+ field_start = bmstrstr(rfc822, fieldhdr, strncasecmp);
+ if (field_start == NULL) return(NULL);
+ if (field_start > end_of_headers) return(NULL);
+
+ fieldbuf = malloc(SIZ);
+ strcpy(fieldbuf, "");
+
+ ptr = field_start;
+ ptr = memreadline(ptr, fieldbuf, SIZ-strlen(fieldbuf) );
+ while ( (isspace(ptr[0])) && (ptr < end_of_headers) ) {
+ strcat(fieldbuf, " ");
+ cont = &fieldbuf[strlen(fieldbuf)];
+ ptr = memreadline(ptr, cont, SIZ-strlen(fieldbuf) );
+ striplt(cont);
+ }
- }
+ strcpy(fieldbuf, &fieldbuf[strlen(fieldhdr)]);
+ striplt(fieldbuf);
- /* 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);
+ return(fieldbuf);
}
}
key[keylen++] = 0;
- lprintf(9, "Directory key is <%s>\n", key);
+ lprintf(CTDL_DEBUG, "Directory key is <%s>\n", key);
}
* the directory
*/
int IsDirectory(char *addr) {
- char domain[SIZ];
+ char domain[256];
int h;
- extract_token(domain, addr, 1, '@');
+ extract_token(domain, addr, 1, '@', sizeof domain);
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) {
- /* FIXME ... write this */
+ cdb_trunc(CDB_DIRECTORY);
}
void CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
char key[SIZ];
- lprintf(9, "Dir: %s --> %s\n",
+ lprintf(CTDL_DEBUG, "Dir: %s --> %s\n",
internet_addr, citadel_addr);
if (IsDirectory(internet_addr) == 0) return;
/*
- * Delete an Internet e-mail address from the directory
+ * 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) {
+void CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
char key[SIZ];
directory_key(key, internet_addr);
* On success: returns 0, and Citadel address stored in 'target'
* On failure: returns nonzero
*/
-int CtdlDirectoryLookup(char *target, char *internet_addr) {
+int CtdlDirectoryLookup(char *target, char *internet_addr, size_t targbuflen) {
struct cdbdata *cdbrec;
char key[SIZ];
- lprintf(9, "CtdlDirectoryLookup(%s)\n", internet_addr);
+ /* Dump it in there unchanged, just for kicks */
+ safestrncpy(target, internet_addr, targbuflen);
+
+ /* Only do lookups for addresses with hostnames in them */
+ if (num_tokens(internet_addr, '@') != 2) return(-1);
+ /* Only do lookups for domains in the directory */
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);
+ safestrncpy(target, cdbrec->ptr, targbuflen);
cdb_free(cdbrec);
- lprintf(9, "Looked up as <%s>\n", target);
return(0);
}
- lprintf(9, "Lookup failed\n");
return(-1);
}
projects / citadel.git / blobdiff