// This file contains functions which handle the mapping of Internet addresses
// to users on the Citadel system.
//
-// Copyright (c) 1987-2022 by the citadel.org team
+// Copyright (c) 1987-2024 by the citadel.org team
//
-// This program is open source software. Use, duplication, or disclosure
-// is subject to the terms of the GNU General Public License, version 3.
+// This program is open source software. Use, duplication, or disclosure is subject to the GNU General Public License version 3.
#include "sysdep.h"
#include <stdlib.h>
#include <string.h>
#include <limits.h>
#include <libcitadel.h>
-#include "citadel.h"
+#include "citadel_defs.h"
#include "server.h"
#include "sysdep_decls.h"
#include "citserver.h"
#include "ctdl_module.h"
-
char *inetcfg = NULL;
// Return nonzero if the supplied name is an alias for this host.
struct recptypes *recp;
int i;
- recp = validate_recipients(addr, NULL, 0);
+ recp = validate_recipients(addr, 0);
if (recp == NULL) return(0);
if (recp->num_local == 0) {
if (bar) {
bar[0] = 0;
++bar;
- striplt(aaa);
- striplt(bar);
+ string_trim(aaa);
+ string_trim(bar);
if ( (!IsEmptyStr(aaa)) && (!strcasecmp(name, aaa)) ) {
syslog(LOG_DEBUG, "internet_addressing: global alias <%s> to <%s>", name, bar);
strcpy(name, bar);
safestrncpy(original_name, name, sizeof original_name);
// should these checks still be here, or maybe move them to split_recps() ?
- striplt(name);
+ string_trim(name);
remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
stripallbut(name, '<', '>');
for (i=0; i<num_addresses; ++i) {
char this_address[256];
extract_token(this_address, a, i, ',', sizeof this_address);
- striplt(this_address); // strip leading and trailing whitespace
+ string_trim(this_address); // strip leading and trailing whitespace
stripout(this_address, '(', ')'); // remove any portion in parentheses
stripallbut(this_address, '<', '>'); // if angle brackets are present, keep only what is inside them
if (!IsEmptyStr(this_address)) {
//
// Caller needs to free the result using free_recipients()
//
-struct recptypes *validate_recipients(char *supplied_recipients, const char *RemoteIdentifier, int Flags) {
+struct recptypes *validate_recipients(char *recipients_in, int Flags) {
struct recptypes *ret;
- char *recipients = NULL;
char append[SIZ];
long len;
int mailtype;
if (ret == NULL) return(NULL);
memset(ret, 0, sizeof(struct recptypes)); // set all values to null/zero
- if (supplied_recipients == NULL) {
- recipients = strdup("");
- }
- else {
- recipients = strdup(supplied_recipients);
- }
-
- len = strlen(recipients) + 1024; // allocate memory
+ len = strlen(recipients_in) + 1024; // allocate memory
ret->errormsg = malloc(len);
ret->recp_local = malloc(len);
ret->recp_internet = malloc(len);
ret->display_recp[0] = 0;
ret->recptypes_magic = RECPTYPES_MAGIC;
- Array *recp_array = split_recps(supplied_recipients, NULL);
+ Array *recp_array = split_recps(recipients_in, NULL);
char *aliases = CtdlGetSysConfig(GLOBAL_ALIASES); // First hit the Global Alias Table
strncpy(this_recp, org_recp, sizeof this_recp);
int i;
- for (i=0; i<3; ++i) { // pass three times through the aliaser
+ for (i=0; i<3; ++i) { // pass three times through the aliaser
mailtype = expand_aliases(this_recp, aliases);
// If an alias expanded to multiple recipients, strip off those recipients and append them
}
// This handles the most common case, which is mail to a user's inbox.
- else if (CtdlGetUser(&tempUS, this_recp) == 0) {
+ // (the next line depends on left-to-right evaluation)
+ else if ((CtdlGetUser(&tempUS, this_recp) == 0) && (tempUS.usernum > 0)) {
++ret->num_local;
strcpy(this_recp, tempUS.fullname);
if (!IsEmptyStr(ret->recp_local)) {
ret->num_local, ret->num_room, ret->num_internet, ret->num_error
);
- free(recipients);
if (recp_array) {
array_free(recp_array);
}
if (valid->recptypes_magic != RECPTYPES_MAGIC) {
syslog(LOG_ERR, "internet_addressing: attempt to call free_recipients() on some other data type!");
- abort();
+ exit(CTDLEXIT_BAD_MAGIC);
}
if (valid->errormsg != NULL) free(valid->errormsg);
*FieldEnd = pFieldEnd;
// convert non-space whitespace to spaces, and remove double blanks
- for (sField = *field = pField;
- sField < pFieldEnd;
- pField++, sField++)
- {
- if ((*sField=='\r') || (*sField=='\n'))
- {
+ for (sField = *field = pField; sField < pFieldEnd; pField++, sField++) {
+ if ((*sField=='\r') || (*sField=='\n')) {
int offset = 1;
while ( ( (*(sField + offset) == '\r') || (*(sField + offset) == '\n' )) && (sField + offset < pFieldEnd) ) {
offset ++;
pField++;
sField++;
- while ((sField < pFieldEnd) &&
- isspace(*sField))
+ while ((sField < pFieldEnd) && isspace(*sField))
sField++;
*pField = *sField;
}
// Split an RFC822-style address into userid, host, and full name
-//
-// Note: This still handles obsolete address syntaxes such as user%node@node and ...node!user
-// We should probably remove that.
void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) {
int a;
strcpy(name, rfc822);
stripout(name, '<', '>');
- // strip anything to the left of a bang
- while ((!IsEmptyStr(name)) && (haschar(name, '!') > 0))
- strcpy(name, &name[1]);
-
- // and anything to the right of a @ or %
+ // and anything to the right of a @
for (a = 0; name[a] != '\0'; ++a) {
if (name[a] == '@') {
name[a] = 0;
break;
}
- if (name[a] == '%') {
- name[a] = 0;
- break;
- }
}
// but if there are parentheses, that changes the rules...
stripallbut(user, '<', '>');
}
- // strip anything to the left of a bang
- while ((!IsEmptyStr(user)) && (haschar(user, '!') > 0))
- strcpy(user, &user[1]);
-
- // and anything to the right of a @ or %
+ // and anything to the right of a @
for (a = 0; user[a] != '\0'; ++a) {
if (user[a] == '@') {
user[a] = 0;
break;
}
- if (user[a] == '%') {
- user[a] = 0;
- break;
- }
}
-
// extract node name
strcpy(node, rfc822);
}
// If no node specified, tack ours on instead
- if (
- (haschar(node, '@')==0)
- && (haschar(node, '%')==0)
- && (haschar(node, '!')==0)
- ) {
+ if (haschar(node, '@') == 0) {
strcpy(node, CtdlGetConfigStr("c_nodename"));
}
else {
-
// strip anything to the left of a @
- while ((!IsEmptyStr(node)) && (haschar(node, '@') > 0))
+ while ((!IsEmptyStr(node)) && (haschar(node, '@') > 0)) {
strcpy(node, &node[1]);
-
- // strip anything to the left of a %
- while ((!IsEmptyStr(node)) && (haschar(node, '%') > 0))
- strcpy(node, &node[1]);
-
- // reduce multiple system bang paths to node!user
- while ((!IsEmptyStr(node)) && (haschar(node, '!') > 1))
- strcpy(node, &node[1]);
-
- // now get rid of the user portion of a node!user string
- for (a = 0; node[a] != '\0'; ++a)
- if (node[a] == '!') {
- node[a] = 0;
- break;
- }
+ }
}
// strip leading and trailing spaces in all strings
- striplt(user);
- striplt(node);
- striplt(name);
+ string_trim(user);
+ string_trim(node);
+ string_trim(name);
// 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
if (*pos == ':') colonpos = pos;
}
- if (colonpos == NULL) return(0); /* no colon? not a valid header line */
+ if (colonpos == NULL) return(0); // no colon? not a valid header line
len = end - beg;
key = malloc(len + 2);
syslog(LOG_DEBUG, "internet_addressing: converted to <%s@%s> (%s)", user, node, name);
snprintf(addr, sizeof(addr), "%s@%s", user, node);
if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name)) {
- CM_SetField(msg, eAuthor, name, -1);
+ CM_SetField(msg, eAuthor, name);
}
if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr)) {
- CM_SetField(msg, erFc822Addr, addr, -1);
+ CM_SetField(msg, erFc822Addr, addr);
}
processed = 1;
}
else if (!strcasecmp(key, "Subject")) {
if (CM_IsEmpty(msg, eMsgSubject))
- CM_SetField(msg, eMsgSubject, value, valuelen);
+ CM_SetField(msg, eMsgSubject, value);
processed = 1;
}
else if (!strcasecmp(key, "List-ID")) {
if (CM_IsEmpty(msg, eListID))
- CM_SetField(msg, eListID, value, valuelen);
+ CM_SetField(msg, eListID, value);
processed = 1;
}
else if (!strcasecmp(key, "To")) {
if (CM_IsEmpty(msg, eRecipient))
- CM_SetField(msg, eRecipient, value, valuelen);
+ CM_SetField(msg, eRecipient, value);
processed = 1;
}
else if (!strcasecmp(key, "CC")) {
if (CM_IsEmpty(msg, eCarbonCopY))
- CM_SetField(msg, eCarbonCopY, value, valuelen);
+ CM_SetField(msg, eCarbonCopY, value);
processed = 1;
}
break;
}
- CM_SetField(msg, emessageId, pValue, pValueLen);
+ CM_SetField(msg, emessageId, pValue);
}
processed = 1;
else if (!strcasecmp(key, "Return-Path")) {
if (CM_IsEmpty(msg, eMessagePath))
- CM_SetField(msg, eMessagePath, value, valuelen);
+ CM_SetField(msg, eMessagePath, value);
processed = 1;
}
else if (!strcasecmp(key, "Envelope-To")) {
if (CM_IsEmpty(msg, eenVelopeTo))
- CM_SetField(msg, eenVelopeTo, value, valuelen);
+ CM_SetField(msg, eenVelopeTo, value);
processed = 1;
}
else if (!strcasecmp(key, "References")) {
- CM_SetField(msg, eWeferences, value, valuelen);
+ CM_SetField(msg, eWeferences, value);
processed = 1;
}
else if (!strcasecmp(key, "Reply-To")) {
- CM_SetField(msg, eReplyTo, value, valuelen);
+ CM_SetField(msg, eReplyTo, value);
processed = 1;
}
else if (!strcasecmp(key, "In-reply-to")) {
if (CM_IsEmpty(msg, eWeferences)) // References: supersedes In-reply-to:
- CM_SetField(msg, eWeferences, value, valuelen);
+ CM_SetField(msg, eWeferences, value);
processed = 1;
}
-
-
// Clean up and move on.
free(key); // Don't free 'value', it's actually the same buffer
return processed;
}
-struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822)
-{
+struct CtdlMessage *convert_internet_message_buf(StrBuf **rfc822) {
struct CtdlMessage *msg;
const char *pos, *beg, *end, *totalend;
int done, alldone = 0;
while (!alldone) {
- /* Locate beginning and end of field, keeping in mind that
- * some fields might be multiline
- */
+ // Locate beginning and end of field, keeping in mind that
+ // some fields might be multiline
end = beg = pos;
- while ((end < totalend) &&
- (end == beg) &&
- (done == 0) )
- {
+ while ((end < totalend) && (end == beg) && (done == 0) ) {
- if ( (*pos=='\n') && ((*(pos+1))!=0x20) && ((*(pos+1))!=0x09) )
- {
+ if ( (*pos=='\n') && ((*(pos+1))!=0x20) && ((*(pos+1))!=0x09) ) {
end = pos;
}
- /* done with headers? */
- if ((*pos=='\n') &&
- ( (*(pos+1)=='\n') ||
- (*(pos+1)=='\r')) )
- {
+ // done with headers?
+ if ((*pos=='\n') && ( (*(pos+1)=='\n') || (*(pos+1)=='\r')) ) {
alldone = 1;
}
- if (pos >= (totalend - 1) )
- {
+ if (pos >= (totalend - 1) ) {
end = pos;
done = 1;
}
++pos;
-
}
- /* At this point we have a field. Are we interested in it? */
+ // 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 */
+ // Strip the field out of the RFC822 header if we used it
if (!converted) {
StrBufAppendBufPlain(OtherHeaders, beg, end - beg, 0);
StrBufAppendBufPlain(OtherHeaders, HKEY("\n"), 0);
}
- /* If we've hit the end of the message, bail out */
+ // If we've hit the end of the message, bail out
if (pos >= totalend)
alldone = 1;
}
StrBufAppendBufPlain(OtherHeaders, HKEY("\n"), 0);
- if (pos < totalend)
+ if (pos < totalend) {
StrBufAppendBufPlain(OtherHeaders, pos, totalend - pos, 0);
+ }
FreeStrBuf(rfc822);
- CM_SetAsFieldSB(msg, eMesageText, &OtherHeaders);
+ CM_SetAsFieldSB(msg, eMessageText, &OtherHeaders);
- /* Follow-up sanity checks... */
+ // Follow-up sanity checks...
- /* If there's no timestamp on this message, set it to now. */
+ // If there's no timestamp on this message, set it to now.
if (CM_IsEmpty(msg, eTimestamp)) {
CM_SetFieldLONG(msg, eTimestamp, time(NULL));
}
- /* If a W (references, or rather, Wefewences) field is present, we
- * have to convert it from RFC822 format to Citadel format.
- */
+ // If a W (references, or rather, Wefewences) field is present, we
+ // have to convert it from RFC822 format to Citadel format.
if (!CM_IsEmpty(msg, eWeferences)) {
/// todo: API!
convert_references_to_wefewences(msg->cm_fields[eWeferences]);
}
-/*
- * 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.
- */
+// 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(const char *rfc822, const char *fieldname) {
char *fieldbuf = NULL;
const char *end_of_headers;
char *cont;
char fieldhdr[SIZ];
- /* Should never happen, but sometimes we get stupid */
+ // Should never happen, but sometimes we get stupid
if (rfc822 == NULL) return(NULL);
if (fieldname == NULL) return(NULL);
snprintf(fieldhdr, sizeof fieldhdr, "%s:", fieldname);
- /* Locate the end of the headers, so we don't run past that point */
+ // Locate the end of the headers, so we don't run past that point
end_of_headers = cbmstrcasestr(rfc822, "\n\r\n");
if (end_of_headers == NULL) {
end_of_headers = cbmstrcasestr(rfc822, "\n\n");
strcat(fieldbuf, " ");
cont = &fieldbuf[strlen(fieldbuf)];
ptr = cmemreadline(ptr, cont, SIZ-strlen(fieldbuf) );
- striplt(cont);
+ string_trim(cont);
}
strcpy(fieldbuf, &fieldbuf[strlen(fieldhdr)]);
- striplt(fieldbuf);
+ string_trim(fieldbuf);
return(fieldbuf);
}
-/*****************************************************************************
- * DIRECTORY MANAGEMENT FUNCTIONS *
- *****************************************************************************/
+// *****************************************************************************
+// DIRECTORY MANAGEMENT FUNCTIONS
+// *****************************************************************************
-/*
- * Generate the index key for an Internet e-mail address to be looked up
- * in the database.
- */
+// 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;
}
}
key[keylen++] = 0;
-
syslog(LOG_DEBUG, "internet_addressing: directory key is <%s>", key);
}
-/*
- * Return nonzero if the supplied address is in one of "our" domains
- */
+// Return nonzero if the supplied address is in one of "our" domains
int IsDirectory(char *addr, int allow_masq_domains) {
char domain[256];
int h;
extract_token(domain, addr, 1, '@', sizeof domain);
- striplt(domain);
+ string_trim(domain);
h = CtdlHostAlias(domain);
}
-/*
- * Add an Internet e-mail address to the directory for a user
- */
+// Add an Internet e-mail address to the directory for a user
int CtdlDirectoryAddUser(char *internet_addr, char *citadel_addr) {
char key[SIZ];
}
-/*
- * 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.)
- */
+// 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.)
int CtdlDirectoryDelUser(char *internet_addr, char *citadel_addr) {
char key[SIZ];
}
-/*
- * Look up an Internet e-mail address in the directory.
- * On success: returns 0, and Citadel address stored in 'target'
- * On failure: returns nonzero
- */
+// 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, size_t targbuflen) {
- struct cdbdata *cdbrec;
+ struct cdbdata cdbrec;
char key[SIZ];
- /* Dump it in there unchanged, just for kicks */
+ // Dump it in there unchanged, just for kicks
if (target != NULL) {
safestrncpy(target, internet_addr, targbuflen);
}
- /* Only do lookups for addresses with hostnames in them */
+ // 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 */
+ // Only do lookups for domains in the directory
if (IsDirectory(internet_addr, 0) == 0) return(-1);
directory_key(key, internet_addr);
- cdbrec = cdb_fetch(CDB_DIRECTORY, key, strlen(key) );
- if (cdbrec != NULL) {
+ cdbrec = cdb_fetch(CDB_DIRECTORY, key, strlen(key));
+ if (cdbrec.ptr != NULL) {
if (target != NULL) {
- safestrncpy(target, cdbrec->ptr, targbuflen);
+ safestrncpy(target, cdbrec.ptr, targbuflen);
}
- cdb_free(cdbrec);
return(0);
}
}
-/*
- * Harvest any email addresses that someone might want to have in their
- * "collected addresses" book.
- */
+// Harvest any email addresses that someone might want to have in their "collected addresses" book.
char *harvest_collected_addresses(struct CtdlMessage *msg) {
char *coll = NULL;
char addr[256];
if (coll == NULL) return(NULL);
- /* Scan both the R (To) and Y (CC) fields */
+ // Scan both the R (To) and Y (CC) fields
for (i = 0; i < 2; ++i) {
if (i == 0) field = eRecipient;
if (i == 1) field = eCarbonCopY;
if (!CM_IsEmpty(msg, field)) {
for (j=0; j<num_tokens(msg->cm_fields[field], ','); ++j) {
extract_token(addr, msg->cm_fields[field], j, ',', sizeof addr);
- if (strstr(addr, "=?") != NULL)
+ if (strstr(addr, "=?") != NULL) {
utf8ify_rfc822_string(addr);
+ }
process_rfc822_addr(addr, user, node, name);
h = CtdlHostAlias(node);
if (h != hostalias_localhost) {
if (!IsEmptyStr(coll)) {
strcat(coll, ",");
}
- striplt(addr);
+ string_trim(addr);
strcat(coll, addr);
}
}
}
-/*
- * Helper function for CtdlRebuildDirectoryIndex()
- */
+// Helper function for CtdlRebuildDirectoryIndex()
void CtdlRebuildDirectoryIndex_backend(char *username, void *data) {
int j = 0;
}
-/*
- * Initialize the directory database (erasing anything already there)
- */
+// Initialize the directory database (erasing anything already there)
void CtdlRebuildDirectoryIndex(void) {
syslog(LOG_INFO, "internet_addressing: rebuilding email address directory index");
cdb_trunc(CDB_DIRECTORY);
}
-/*
- * Auto-generate an Internet email address for a user account
- */
+// Auto-generate an Internet email address for a user account
void AutoGenerateEmailAddressForUser(struct ctdluser *user) {
char synthetic_email_addr[1024];
int i, j;
projects / citadel.git / blobdiff