* to users on the Citadel system.
*/
+#ifdef DLL_EXPORT
+#define IN_LIBCIT
+#endif
+
#include "sysdep.h"
#include <stdlib.h>
#include <unistd.h>
#include <limits.h>
#include "citadel.h"
#include "server.h"
+#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.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 *inetcfg = NULL;
-
+struct spamstrings_t *spamstrings = NULL;
/*
char buf[SIZ];
char host[SIZ], type[SIZ];
+ if (fqdn == NULL) return(hostalias_nomatch);
+ if (strlen(fqdn) == 0) return(hostalias_nomatch);
if (!strcasecmp(fqdn, config.c_fqdn)) return(hostalias_localhost);
if (!strcasecmp(fqdn, config.c_nodename)) return(hostalias_localhost);
if (inetcfg == NULL) return(hostalias_nomatch);
&& (!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);
*
* 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;
/* 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, '<', '>');
}
/* If no node specified, tack ours on instead */
-/*
- * 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 (!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);
- 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 (!strcasecmp(key, "Date")) {
parsed_date = parsedate(value);
if (parsed_date < 0L) parsed_date = time(NULL);
- snprintf(buf, sizeof buf, "%ld", parsed_date );
+ snprintf(buf, sizeof buf, "%ld", (long)parsed_date );
if (msg->cm_fields['T'] == NULL)
msg->cm_fields['T'] = strdoop(buf);
processed = 1;
msg->cm_format_type = FMT_RFC822; /* internet message */
msg->cm_fields['M'] = rfc822;
- lprintf(9, "Unconverted RFC822 message length = %d\n", strlen(rfc822));
+ lprintf(9, "Unconverted RFC822 message length = %ld\n", (long)strlen(rfc822));
pos = 0;
done = 0;
end = pos;
}
- /* done with headers? */
+ /* done with headers? (commented out; see below)
if ( ((rfc822[pos]=='\n')
||(rfc822[pos]=='\r') )
&& ( (rfc822[pos+1]=='\n')
end = pos;
done = 1;
}
+ */
+
+ /* done with headers? (try this way instead) */
+ if ( (rfc822[pos]=='\n')
+ && ( (rfc822[pos+1]=='\n')
+ ||(rfc822[pos+1]=='\r')) ) {
+ end = pos;
+ done = 1;
+ }
if (pos >= (msglen-1) ) {
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", time(NULL));
+ snprintf(buf, sizeof buf, "%ld", (long)time(NULL));
msg->cm_fields['T'] = strdoop(buf);
}
- lprintf(9, "RFC822 length remaining after conversion = %d\n",
- strlen(rfc822));
+ lprintf(9, "RFC822 length remaining after conversion = %ld\n",
+ (long)strlen(rfc822));
return msg;
}
}
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];
+
+ /* Dump it in there unchanged, just for kicks */
+ strcpy(target, internet_addr);
+
+ /* 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);
+ cdb_free(cdbrec);
+ return(0);
+ }
+
+ return(-1);
+}
projects / citadel.git / blobdiff