-/*
- * This file contains functions which handle the mapping of Internet addresses
- * to users on the Citadel system.
- *
- * Copyright (c) 1987-2021 by the citadel.org team
- *
- * This program is open source software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 3.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
+// 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
+//
+// This program is open source software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
#include "sysdep.h"
#include <stdlib.h>
#ifdef HAVE_ICONV
#include <iconv.h>
+// This is the non-define version in case it is needed for debugging
#if 0
-/* This is the non-define version in case it is needed for debugging */
inline void FindNextEnd (char *bptr, char *end)
{
/* Find the next ?Q? */
} \
}
-/*
- * Handle subjects with RFC2047 encoding such as:
- * =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
- */
+// Handle subjects with RFC2047 encoding such as:
+// =?koi8-r?B?78bP0s3Mxc7JxSDXz9rE1dvO2c3JINvB0sHNySDP?=
void utf8ify_rfc822_string(char *buf) {
char *start, *end, *next, *nextend, *ptr;
char newbuf[1024];
int i, len, delta;
int illegal_non_rfc2047_encoding = 0;
- /* Sometimes, badly formed messages contain strings which were simply
- * written out directly in some foreign character set instead of
- * using RFC2047 encoding. This is illegal but we will attempt to
- * handle it anyway by converting from a user-specified default
- * charset to UTF-8 if we see any nonprintable characters.
- */
+ // Sometimes, badly formed messages contain strings which were simply
+ // written out directly in some foreign character set instead of
+ // using RFC2047 encoding. This is illegal but we will attempt to
+ // handle it anyway by converting from a user-specified default
+ // charset to UTF-8 if we see any nonprintable characters.
len = strlen(buf);
for (i=0; i<len; ++i) {
if ((buf[i] < 32) || (buf[i] > 126)) {
}
}
- /* pre evaluate the first pair */
+ // pre evaluate the first pair
nextend = end = NULL;
len = strlen(buf);
start = strstr(buf, "=?");
if (nextend == NULL)
next = NULL;
- /* did we find two partitions */
+ // did we find two partitions
if ((next != NULL) && ((next - end) > 2)) {
ptr = end + 2;
while ((ptr < next) &&
(*ptr == '\n') ||
(*ptr == '\t')))
ptr ++;
- /* did we find a gab just filled with blanks? */
- if (ptr == next)
- {
- memmove (end + 2,
- next,
- len - (next - start));
+ // did we find a gab just filled with blanks?
+ if (ptr == next) {
+ memmove(end + 2, next, len - (next - start));
- /* now terminate the gab at the end */
+ // now terminate the gab at the end
delta = (next - end) - 2;
len -= delta;
buf[len] = '\0';
- /* move next to its new location. */
+ // move next to its new location.
next -= delta;
nextend -= delta;
}
}
- /* our next-pair is our new first pair now. */
+ // our next-pair is our new first pair now.
start = next;
end = nextend;
}
free(isav);
- /*
- * Since spammers will go to all sorts of absurd lengths to get their
- * messages through, there are LOTS of corrupt headers out there.
- * So, prevent a really badly formed RFC2047 header from throwing
- * this function into an infinite loop.
- */
+ // Since spammers will go to all sorts of absurd lengths to get their
+ // messages through, there are LOTS of corrupt headers out there.
+ // So, prevent a really badly formed RFC2047 header from throwing
+ // this function into an infinite loop.
++passes;
if (passes > 20) return;
char *inetcfg = NULL;
-/*
- * Return nonzero if the supplied name is an alias for this host.
- */
+// Return nonzero if the supplied name is an alias for this host.
int CtdlHostAlias(char *fqdn) {
int config_lines;
int i;
found = 0;
- /* Process these in a specific order, in case there are multiple matches.
- * We want localhost to override masq, for example.
- */
+ // Process these in a specific order, in case there are multiple matches.
+ // We want localhost to override masq, for example.
if ( (!strcasecmp(type, "masqdomain")) && (!strcasecmp(fqdn, host))) {
found = hostalias_masq;
}
-/*
- * Determine whether a given Internet address belongs to the current user
- */
-int CtdlIsMe(char *addr, int addr_buf_len)
-{
+// Determine whether a given Internet address belongs to the current user
+int CtdlIsMe(char *addr, int addr_buf_len) {
struct recptypes *recp;
int i;
}
-/* If the last item in a list of recipients was truncated to a partial address,
- * remove it completely in order to avoid choking library functions.
- */
-void sanitize_truncated_recipient(char *str)
-{
+// If the last item in a list of recipients was truncated to a partial address,
+// remove it completely in order to avoid choking library functions.
+void sanitize_truncated_recipient(char *str) {
if (!str) return;
if (num_tokens(str, ',') < 2) return;
}
-/*
- * This function is self explanatory.
- * (What can I say, I'm in a weird mood today...)
- */
+// This function is self explanatory.
+// (What can I say, I'm in a weird mood today...)
void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) {
char *ptr;
if (!name) return;
EA_ERROR, // Can't send message due to bad address
EA_MULTIPLE, // Alias expanded into multiple recipients -- run me again!
EA_LOCAL, // Local message, do no network processing
- EA_INTERNET // Convert msg and send as Internet mail
-};
-char *killo[] = { // FIXME remove this when diags are complete
- "error",
- "multiple",
- "local",
- "internet"
+ EA_INTERNET, // Convert msg and send as Internet mail
+ EA_SKIP // This recipient has been invalidated -- skip it!
};
-/*
- * Aliasing for network mail.
- */
-int expand_aliases(char *name) { /* process alias and routing info for mail */
+// Process alias and routing info for email addresses
+int expand_aliases(char *name, char *aliases) {
int a;
char aaa[SIZ];
int at = 0;
- char node[64];
-
-
-
-
- // FIXME write a "real" alias table here
-
- // temporary test of expansion
- if (!strcasecmp(name, "root")) {
- strcpy(name, "root");
- return(EA_MULTIPLE);
- }
- if (!strcasecmp(name, "qux")) {
- strcpy(name, "eggroll,blat,fun@eek.boop");
- return(EA_MULTIPLE);
+ if (aliases) {
+ int num_aliases = num_tokens(aliases, '\n');
+ for (a=0; a<num_aliases; ++a) {
+ extract_token(aaa, aliases, a, '\n', sizeof aaa);
+ char *bar = strchr(aaa, '|');
+ if (bar) {
+ bar[0] = 0;
+ ++bar;
+ striplt(aaa);
+ striplt(bar);
+ if ( (!IsEmptyStr(aaa)) && (!strcasecmp(name, aaa)) ) {
+ syslog(LOG_DEBUG, "internet_addressing: global alias <%s> to <%s>", name, bar);
+ strcpy(name, bar);
+ }
+ }
+ }
+ if (strchr(name, ',')) {
+ return(EA_MULTIPLE);
+ }
}
-
-
-
-
- char original_name[256];
+ char original_name[256]; // Now go for the regular aliases
safestrncpy(original_name, name, sizeof original_name);
// should these checks still be here, or maybe move them to split_recps() ?
remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
stripallbut(name, '<', '>');
- /* Hit the email address directory */
+ // Hit the email address directory
if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) {
strcpy(name, aaa);
}
if (strcasecmp(original_name, name)) {
- syslog(LOG_INFO, "internet_addressing: %s is being forwarded to %s", original_name, name);
+ syslog(LOG_INFO, "internet_addressing: directory alias <%s> to <%s>", original_name, name);
}
- /* Change "user @ xxx" to "user" if xxx is an alias for this host */
+ // Change "user @ xxx" to "user" if xxx is an alias for this host
for (a=0; name[a] != '\0'; ++a) {
if (name[a] == '@') {
if (CtdlHostAlias(&name[a+1]) == hostalias_localhost) {
name[a] = 0;
- syslog(LOG_DEBUG, "internet_addressing: changed to <%s>", name);
+ syslog(LOG_DEBUG, "internet_addressing: host is local, recipient is <%s>", name);
break;
}
}
}
- /* determine local or remote type, see citadel.h */
+ // Is this a local or remote recipient?
at = haschar(name, '@');
- if (at == 0) return(EA_LOCAL); /* no @'s - local address */
- if (at > 1) return(EA_ERROR); /* >1 @'s - invalid address */
- remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
-
- /* figure out the delivery mode */
- extract_token(node, name, 1, '@', sizeof node);
-
- /* If there are one or more dots in the nodename, we assume that it
- * is an FQDN and will attempt SMTP delivery to the Internet.
- */
- if (haschar(node, '.') > 0) {
- return(EA_INTERNET);
+ if (at == 0) {
+ return(EA_LOCAL); // no @'s = local address
+ }
+ else if (at == 1) {
+ return(EA_INTERNET); // one @ = internet address
+ }
+ else {
+ return(EA_ERROR); // more than one @ = badly formed address
}
-
- /* If we get to this point it's an invalid node name */
- return (EA_ERROR);
}
// Return a supplied list of email addresses as an array, removing superfluous information and syntax.
-Array *split_recps(char *addresses) {
+// If an existing Array is supplied as "append_to" it will do so; otherwise a new Array is allocated.
+Array *split_recps(char *addresses, Array *append_to) {
+
+ if (IsEmptyStr(addresses)) { // nothing supplied, nothing returned
+ return(NULL);
+ }
- // Copy the supplied address list into our own memory space, because we are going to mangle it.
- char *a = malloc(strlen(addresses));
- a[0] = 0;
+ // Copy the supplied address list into our own memory space, because we are going to modify it.
+ char *a = strdup(addresses);
+ if (a == NULL) {
+ syslog(LOG_ERR, "internet_addressing: malloc() failed: %m");
+ return(NULL);
+ }
// Strip out anything in double quotes
- int toggle = 0;
- int pos = 0;
- char *t;
- for (t=addresses; t[0]; ++t) {
- if (t[0] == '\"') {
- toggle = 1 - toggle;
- }
- else if (!toggle) {
- a[pos++] = t[0];
- a[pos] = 0;
+ char *l = NULL;
+ char *r = NULL;
+ do {
+ l = strchr(a, '\"');
+ r = strrchr(a, '\"');
+ if (r > l) {
+ strcpy(l, r+1);
}
- }
+ } while (r > l);
// Transform all qualifying delimiters to commas
+ char *t;
for (t=a; t[0]; ++t) {
if ((t[0]==';') || (t[0]=='|')) {
t[0]=',';
}
}
- // Tokenize the recipients into an array
- Array *recipients_array = array_new(256); // no single recipient should be bigger than 256 bytes
- char *r = a;
- while ((t = strtok_r(r, ",", &r))) {
- striplt(t); // strip leading and trailing whitespace
- stripout(t, '(', ')'); // remove any portion in parentheses
- stripallbut(t, '<', '>'); // if angle brackets are present, keep only what is inside them
- array_append(recipients_array, t);
+ // Tokenize the recipients into an array. No single recipient should be larger than 256 bytes.
+ Array *recipients_array = NULL;
+ if (append_to) {
+ recipients_array = append_to; // Append to an existing array of recipients
+ }
+ else {
+ recipients_array = array_new(256); // This is a new array of recipients
+ }
+
+ int num_addresses = num_tokens(a, ',');
+ int i;
+ 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
+ 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)) {
+ array_append(recipients_array, this_address);
+ }
}
free(a); // We don't need this buffer anymore.
// Validate recipients, count delivery types and errors, and handle aliasing
-// FIXME check for dupes!!!!!
//
// Returns 0 if all addresses are ok, ret->num_error = -1 if no addresses
// were specified, or the number of addresses found invalid.
int mailtype;
int invalid;
struct ctdluser tempUS;
- struct ctdlroom tempQR;
- struct ctdlroom tempQR2;
+ struct ctdlroom original_room;
int err = 0;
char errmsg[SIZ];
char *org_recp;
ret->display_recp[0] = 0;
ret->recptypes_magic = RECPTYPES_MAGIC;
- Array *recp_array = split_recps(supplied_recipients);
- int original_array_len = array_len(recp_array);
- for (int r=0; r<array_len(recp_array); ++r) {
+ Array *recp_array = split_recps(supplied_recipients, NULL);
+
+ char *aliases = CtdlGetSysConfig(GLOBAL_ALIASES); // First hit the Global Alias Table
+
+ int r;
+ for (r=0; (recp_array && r<array_len(recp_array)); ++r) {
org_recp = (char *)array_get_element_at(recp_array, r);
strncpy(this_recp, org_recp, sizeof this_recp);
- mailtype = expand_aliases(this_recp);
-
- // If an alias expanded to multiple recipients, strip off those recipients and append them
- // to the end of the array. This loop will hit those again when it gets there.
- // Note that we don't do this after we get past the *original* array length, to avoid aliasing loops.
- if (mailtype == EA_MULTIPLE) {
- if (r < original_array_len) {
- char *comma;
- while ((comma = strrchr(this_recp, ','))) {
- comma[0] = 0;
- array_append(recp_array, &comma[1]);
- strcpy(org_recp, this_recp);
- }
- }
- else {
- mailtype = EA_ERROR;
+ int i;
+ 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
+ // to the end of the array. This loop will hit those again when it gets there.
+ if (mailtype == EA_MULTIPLE) {
+ recp_array = split_recps(this_recp, recp_array);
}
}
- mailtype = expand_aliases(this_recp); // do it ONCE again to handle alias expansions
- if (mailtype == EA_MULTIPLE) {
- mailtype = EA_ERROR; // and fail if it wants to expand a second time
+ // This loop searches for duplicate recipients in the final list and marks them to be skipped.
+ int j;
+ for (j=0; j<r; ++j) {
+ if (!strcasecmp(this_recp, (char *)array_get_element_at(recp_array, j) )) {
+ mailtype = EA_SKIP;
+ }
}
+ syslog(LOG_DEBUG, "Recipient #%d of type %d is <%s>", r, mailtype, this_recp);
invalid = 0;
errmsg[0] = 0;
switch(mailtype) {
- case EA_LOCAL:
+ case EA_LOCAL: // There are several types of "local" recipients.
+
+ // Old BBS conventions require mail to "sysop" to go somewhere. Send it to the admin room.
if (!strcasecmp(this_recp, "sysop")) {
++ret->num_room;
strcpy(this_recp, CtdlGetConfigStr("c_aideroom"));
}
strcat(ret->recp_room, this_recp);
}
- else if ( (!strncasecmp(this_recp, "room_", 5)) && (!CtdlGetRoom(&tempQR, &this_recp[5])) ) {
- // FIXME -- handle the underscores here, strip them out for a room search.
+ // This handles rooms which can receive posts via email.
+ else if (!strncasecmp(this_recp, "room_", 5)) {
+ original_room = CC->room; // Remember where we parked
- tempQR2 = CC->room; // Remember where we parked
- CC->room = tempQR;
-
- err = CtdlDoIHavePermissionToPostInThisRoom( // check for write permissions to room
- errmsg,
- sizeof errmsg,
- RemoteIdentifier,
- Flags,
- 0 // 0 means "not a reply"
- );
- if (err) {
+ char mail_to_room[ROOMNAMELEN];
+ char *m;
+ strncpy(mail_to_room, &this_recp[5], sizeof mail_to_room);
+ for (m = mail_to_room; *m; ++m) {
+ if (m[0] == '_') m[0]=' ';
+ }
+ if (!CtdlGetRoom(&CC->room, mail_to_room)) { // Find the room they asked for
+
+ err = CtdlDoIHavePermissionToPostInThisRoom( // check for write permissions to room
+ errmsg,
+ sizeof errmsg,
+ RemoteIdentifier,
+ Flags,
+ 0 // 0 means "this is not a reply"
+ );
+ if (err) {
+ ++ret->num_error;
+ invalid = 1;
+ }
+ else {
+ ++ret->num_room;
+ if (!IsEmptyStr(ret->recp_room)) {
+ strcat(ret->recp_room, "|");
+ }
+ strcat(ret->recp_room, CC->room.QRname);
+
+ if (!IsEmptyStr(ret->recp_orgroom)) {
+ strcat(ret->recp_orgroom, "|");
+ }
+ strcat(ret->recp_orgroom, this_recp);
+
+ }
+ }
+ else { // no such room exists
++ret->num_error;
invalid = 1;
- }
- else {
- ++ret->num_room;
- if (!IsEmptyStr(ret->recp_room)) {
- strcat(ret->recp_room, "|");
- }
- strcat(ret->recp_room, &this_recp[5]);
-
- if (!IsEmptyStr(ret->recp_orgroom)) {
- strcat(ret->recp_orgroom, "|");
- }
- strcat(ret->recp_orgroom, org_recp);
-
}
-
- /* Restore room in case something needs it */
- CC->room = tempQR2;
+
+ // Restore this session's original room location.
+ CC->room = original_room;
}
+
+ // This handles the most common case, which is mail to a user's inbox.
else if (CtdlGetUser(&tempUS, this_recp) == 0) {
++ret->num_local;
strcpy(this_recp, tempUS.fullname);
}
strcat(ret->recp_local, this_recp);
}
+
+ // No match for this recipient
else {
++ret->num_error;
invalid = 1;
strcat(ret->recp_internet, this_recp);
}
break;
+ case EA_MULTIPLE:
+ case EA_SKIP:
+ // no action required, anything in this slot has already been processed elsewhere
+ break;
case EA_ERROR:
++ret->num_error;
invalid = 1;
strcat(ret->display_recp, append);
}
}
- syslog(LOG_DEBUG, "org_recp: \033[31m%-30s\033[0m this_recp: \033[32m%-30s\033[0m mailtype: %s", org_recp, this_recp, killo[mailtype]);
+ }
+
+ if (aliases != NULL) { // ok, we're done with the global alias list now
+ free(aliases);
}
if ( (ret->num_local + ret->num_internet + ret->num_room + ret->num_error) == 0) {
);
free(recipients);
- array_free(recp_array);
+ if (recp_array) {
+ array_free(recp_array);
+ }
return(ret);
}
-/*
- * Destructor for recptypes
- */
+// Destructor for recptypes
void free_recipients(struct recptypes *valid) {
if (valid == NULL) {
for (i = 0; i < nColons; i++) {
source[AddrPtr[i]++] = '\0';
}
- /* TODO: if libidn, this might get larger*/
+ // TODO: if libidn, this might get larger
user = malloc(SourceLen + 1);
node = malloc(SourceLen + 1);
name = malloc(SourceLen + 1);
nmax = EncodedMaxLen - (nPtr - Encoded);
if (AddrUtf8[i]) {
process_rfc822_addr(&source[AddrPtr[i]], user, node, name);
- /* TODO: libIDN here ! */
+ // TODO: libIDN here !
if (IsEmptyStr(name)) {
n = snprintf(nPtr, nmax, (i==0)?"%s@%s" : ",%s@%s", user, node);
}
nnPtr = ptr + (nPtr - Encoded), nPtr = nnPtr;
free(Encoded), Encoded = ptr;
EncodedMaxLen *= 2;
- i--; /* do it once more with properly lengthened buffer */
+ i--; // do it once more with properly lengthened buffer
}
}
for (i = 0; i < nColons; i++)
}
-/*
- * Unfold a multi-line field into a single line, removing multi-whitespaces
- */
+// Unfold a multi-line field into a single line, removing multi-whitespaces
void unfold_rfc822_field(char **field, char **FieldEnd)
{
int quote = 0;
while (isspace(*pField))
pField++;
- /* remove leading/trailing whitespace */
+ // remove leading/trailing whitespace
;
while (isspace(*pFieldEnd))
pFieldEnd --;
*FieldEnd = pFieldEnd;
- /* convert non-space whitespace to spaces, and remove double blanks */
+ // convert non-space whitespace to spaces, and remove double blanks
for (sField = *field = pField;
sField < pFieldEnd;
pField++, sField++)
}
-/*
- * Split an RFC822-style address into userid, host, and full name
- *
- */
+// 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;
if (rfc822 == NULL) return;
- /* extract full name - first, it's From minus <userid> */
+ // extract full name - first, it's From minus <userid>
strcpy(name, rfc822);
stripout(name, '<', '>');
- /* strip anything to the left of a bang */
+ // 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 @ or %
for (a = 0; name[a] != '\0'; ++a) {
if (name[a] == '@') {
name[a] = 0;
}
}
- /* but if there are parentheses, that changes the rules... */
+ // but if there are parentheses, that changes the rules...
if ((haschar(rfc822, '(') == 1) && (haschar(rfc822, ')') == 1)) {
strcpy(name, rfc822);
stripallbut(name, '(', ')');
}
- /* but if there are a set of quotes, that supersedes everything */
+ // but if there are a set of quotes, that supersedes everything
if (haschar(rfc822, 34) == 2) {
strcpy(name, rfc822);
while ((!IsEmptyStr(name)) && (name[0] != 34)) {
break;
}
}
- /* extract user id */
+ // extract user id
strcpy(user, rfc822);
- /* first get rid of anything in parens */
+ // first get rid of anything in parens
stripout(user, '(', ')');
- /* if there's a set of angle brackets, strip it down to that */
+ // if there's a set of angle brackets, strip it down to that
if ((haschar(user, '<') == 1) && (haschar(user, '>') == 1)) {
stripallbut(user, '<', '>');
}
- /* strip anything to the left of a bang */
+ // 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 @ or %
for (a = 0; user[a] != '\0'; ++a) {
if (user[a] == '@') {
user[a] = 0;
}
- /* extract node name */
+ // extract node name
strcpy(node, rfc822);
- /* first get rid of anything in parens */
+ // first get rid of anything in parens
stripout(node, '(', ')');
- /* if there's a set of angle brackets, strip it down to that */
+ // if there's a set of angle brackets, strip it down to that
if ((haschar(node, '<') == 1) && (haschar(node, '>') == 1)) {
stripallbut(node, '<', '>');
}
- /* If no node specified, tack ours on instead */
+ // If no node specified, tack ours on instead
if (
(haschar(node, '@')==0)
&& (haschar(node, '%')==0)
}
else {
- /* strip anything to the left of a @ */
+ // strip anything to the left of a @
while ((!IsEmptyStr(node)) && (haschar(node, '@') > 0))
strcpy(node, &node[1]);
- /* strip anything to the left of a % */
+ // 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 */
+ // 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 */
+ // 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;
}
}
- /* strip leading and trailing spaces in all strings */
+ // strip leading and trailing spaces in all strings
striplt(user);
striplt(node);
striplt(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
- * this case, use the user portion of the address as the 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
+ // this case, use the user portion of the address as the name.
if ((IsEmptyStr(name)) && (!IsEmptyStr(user))) {
strcpy(name, user);
}
}
-/*
- * convert_field() is a helper function for convert_internet_message().
- * Given start/end positions for an rfc822 field, it converts it to a Citadel
- * field if it wants to, and unfolds it if necessary.
- *
- * Returns 1 if the field was converted and inserted into the Citadel message
- * structure, implying that the source field should be removed from the
- * message text.
- */
+// convert_field() is a helper function for convert_internet_message().
+// Given start/end positions for an rfc822 field, it converts it to a Citadel
+// field if it wants to, and unfolds it if necessary.
+//
+// Returns 1 if the field was converted and inserted into the Citadel message
+// structure, implying that the source field should be removed from the
+// message text.
int convert_field(struct CtdlMessage *msg, const char *beg, const char *end) {
char *key, *value, *valueend;
long len;
valueend = key + len;
* ( key + (colonpos - beg) ) = '\0';
value = &key[(colonpos - beg) + 1];
-/* printf("Header: [%s]\nValue: [%s]\n", key, value); */
+ // printf("Header: [%s]\nValue: [%s]\n", key, value);
unfold_rfc822_field(&value, &valueend);
valuelen = valueend - value + 1;
-/* printf("UnfoldedValue: [%s]\n", value); */
+ // printf("UnfoldedValue: [%s]\n", 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.
- */
+ // 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")) {
parsed_date = parsedate(value);
if (parsed_date < 0L) parsed_date = time(NULL);
pValue = value;
pValueLen = valuelen;
- /* Strip angle brackets */
+ // Strip angle brackets
while (haschar(pValue, '<') > 0) {
pValue ++;
pValueLen --;
}
else if (!strcasecmp(key, "In-reply-to")) {
- if (CM_IsEmpty(msg, eWeferences)) /* References: supersedes In-reply-to: */
+ if (CM_IsEmpty(msg, eWeferences)) // References: supersedes In-reply-to:
CM_SetField(msg, eWeferences, value, valuelen);
processed = 1;
}
- /* Clean up and move on. */
- free(key); /* Don't free 'value', it's actually the same buffer */
+ // Clean up and move on.
+ free(key); // Don't free 'value', it's actually the same buffer
return processed;
}
-/*
- * Convert RFC822 references format (References) to Citadel references format (Weferences)
- */
+// Convert RFC822 references format (References) to Citadel references format (Weferences)
void convert_references_to_wefewences(char *str) {
int bracket_nesting = 0;
char *ptr = str;
}
-/*
- * Convert an RFC822 message (headers + body) to a CtdlMessage structure.
- * NOTE: the supplied buffer becomes part of the CtdlMessage structure, and
- * will be deallocated when CM_Free() is called. Therefore, the
- * supplied buffer should be DEREFERENCED. It should not be freed or used
- * again.
- */
+// Convert an RFC822 message (headers + body) to a CtdlMessage structure.
+// NOTE: the supplied buffer becomes part of the CtdlMessage structure, and
+// will be deallocated when CM_Free() is called. Therefore, the
+// supplied buffer should be DEREFERENCED. It should not be freed or used
+// again.
struct CtdlMessage *convert_internet_message(char *rfc822) {
StrBuf *RFCBuf = NewStrBufPlain(rfc822, -1);
free (rfc822);
if (msg == NULL) return msg;
memset(msg, 0, sizeof(struct CtdlMessage));
- msg->cm_magic = CTDLMESSAGE_MAGIC; /* self check */
- msg->cm_anon_type = 0; /* never anonymous */
- msg->cm_format_type = FMT_RFC822; /* internet message */
+ msg->cm_magic = CTDLMESSAGE_MAGIC; // self check
+ msg->cm_anon_type = 0; // never anonymous
+ msg->cm_format_type = FMT_RFC822; // internet message
pos = ChrPtr(*rfc822);
totalend = pos + StrLength(*rfc822);
/*
* Auto-generate an Internet email address for a user account
*/
-void AutoGenerateEmailAddressForUser(struct ctdluser *user)
-{
+void AutoGenerateEmailAddressForUser(struct ctdluser *user) {
char synthetic_email_addr[1024];
int i, j;
int u = 0;
strncpy(CC->user.emailaddrs, synthetic_email_addr, sizeof(user->emailaddrs));
syslog(LOG_DEBUG, "user_ops: auto-generated email address <%s> for <%s>", synthetic_email_addr, user->fullname);
}
+
+
+// Determine whether the supplied email address is subscribed to the supplied room's mailing list service.
+int is_email_subscribed_to_list(char *email, char *room_name) {
+ struct ctdlroom room;
+ long roomnum;
+ char *roomnetconfig;
+ int found_it = 0;
+
+ if (CtdlGetRoom(&room, room_name)) {
+ return(0); // room not found, so definitely not subscribed
+ }
+
+ // If this room has the QR2_SMTP_PUBLIC flag set, anyone may email a post to this room, even non-subscribers.
+ if (room.QRflags2 & QR2_SMTP_PUBLIC) {
+ return(1);
+ }
+
+ roomnum = room.QRnumber;
+ roomnetconfig = LoadRoomNetConfigFile(roomnum);
+ if (roomnetconfig == NULL) {
+ return(0);
+ }
+
+ // We're going to do a very sloppy match here and simply search for the specified email address
+ // anywhere in the room's netconfig. If you don't like this, fix it yourself.
+ if (bmstrcasestr(roomnetconfig, email)) {
+ found_it = 1;
+ }
+ else {
+ found_it = 0;
+ }
+
+ free(roomnetconfig);
+ return(found_it);
+}
projects / citadel.git / blobdiff