* This file contains functions which handle the mapping of Internet addresses
* to users on the Citadel system.
*
- * Copyright (c) 1987-2020 by the citadel.org team
+ * 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.
end = nextend;
}
- /* Now we handle foreign character sets properly encoded
- * in RFC2047 format.
- */
+ // Now we handle foreign character sets properly encoded in RFC2047 format.
start = strstr(buf, "=?");
FindNextEnd((start != NULL)? start : buf, end);
while (start != NULL && end != NULL && end > start) {
*/
int CtdlIsMe(char *addr, int addr_buf_len)
{
- recptypes *recp;
+ struct recptypes *recp;
int i;
recp = validate_recipients(addr, NULL, 0);
* (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) {
- unsigned int i;
+ char *ptr;
+ if (!name) return;
- for (i = 0; i < strlen(name); ++i) {
- if (name[i] == '@') {
- while (isspace(name[i - 1]) && i > 0) {
- strcpy(&name[i - 1], &name[i]);
- --i;
- }
- while (isspace(name[i + 1])) {
- strcpy(&name[i + 1], &name[i + 2]);
- }
+ for (ptr=name; *ptr; ++ptr) {
+ while ( (isspace(*ptr)) && (*(ptr+1)=='@') ) {
+ strcpy(ptr, ptr+1);
+ if (ptr > name) --ptr;
+ }
+ while ( (*ptr=='@') && (*(ptr+1)!=0) && (isspace(*(ptr+1))) ) {
+ strcpy(ptr+1, ptr+2);
}
}
}
+// values that can be returned by expand_aliases()
+enum {
+ EA_ERROR, // Can't send message due to bad address
+ EA_LOCAL, // Local message, do no network processing
+ EA_INTERNET // Convert msg and send as Internet mail
+};
+
+
/*
* Aliasing for network mail.
*/
-int alias(char *name)
-{ /* process alias and routing info for mail */
+int expand_aliases(char *name) { /* process alias and routing info for mail */
int a;
char aaa[SIZ];
int at = 0;
strcpy(name, aaa);
}
- if (strcasecmp(original_name, name)) {
+ //if (strcasecmp(original_name, name)) {
syslog(LOG_INFO, "internet_addressing: %s is being forwarded to %s", original_name, name);
- }
+ //}
/* Change "user @ xxx" to "user" if xxx is an alias for this host */
for (a=0; name[a] != '\0'; ++a) {
/* determine local or remote type, see citadel.h */
at = haschar(name, '@');
- if (at == 0) return(MES_LOCAL); /* no @'s - local address */
- if (at > 1) return(MES_ERROR); /* >1 @'s - invalid address */
+ 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 */
* is an FQDN and will attempt SMTP delivery to the Internet.
*/
if (haschar(node, '.') > 0) {
- return(MES_INTERNET);
+ return(EA_INTERNET);
}
/* If we get to this point it's an invalid node name */
- return (MES_ERROR);
+ return (EA_ERROR);
}
*
* Caller needs to free the result using free_recipients()
*/
-recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) {
- struct CitContext *CCC = CC;
- recptypes *ret;
+struct recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) {
+ struct recptypes *ret;
char *recipients = NULL;
char *org_recp;
char this_recp[256];
char this_recp_cooked[256];
char append[SIZ];
long len;
- int num_recps = 0;
int i, j;
int mailtype;
int invalid;
int in_quotes = 0;
/* Initialize */
- ret = (recptypes *) malloc(sizeof(recptypes));
+ ret = (struct recptypes *) malloc(sizeof(struct recptypes));
if (ret == NULL) return(NULL);
/* Set all strings to null and numeric values to zero */
- memset(ret, 0, sizeof(recptypes));
+ memset(ret, 0, sizeof(struct recptypes));
if (supplied_recipients == NULL) {
recipients = strdup("");
}
/* Now start extracting recipients... */
-
+ Array *recp_array = array_new(1024);
while (!IsEmptyStr(recipients)) {
for (i=0; i<=strlen(recipients); ++i) {
if (recipients[i] == '\"') in_quotes = 1 - in_quotes;
}
striplt(this_recp);
- if (IsEmptyStr(this_recp))
- break;
- syslog(LOG_DEBUG, "internet_addressing: evaluating recipient #%d: %s", num_recps, this_recp);
- ++num_recps;
+ if (!IsEmptyStr(this_recp)) {
+ syslog(LOG_DEBUG, "internet_addressing: evaluating recipient: %s", this_recp);
+ array_append(recp_array, this_recp);
+ }
+ }
+
+ for (int r=0; r<array_len(recp_array); ++r) {
+ strcpy(this_recp, (char *)array_get_element_at(recp_array, r));
strcpy(org_recp, this_recp);
- alias(this_recp);
- alias(this_recp);
- mailtype = alias(this_recp);
+
+
+ // To prevent endless aliasing loops, we will only do this three times.
+ for (int alias_loop=0; alias_loop<3; ++alias_loop) {
+ mailtype = expand_aliases(this_recp);
+ }
+
+
+
+ // Hmm. Is this still needed? It changes underscores to spaces, but maybe we don't
+ // need it anymore now that we index local user names without alphanumerics.
for (j = 0; !IsEmptyStr(&this_recp[j]); ++j) {
if (this_recp[j]=='_') {
this_recp_cooked[j] = ' ';
}
}
this_recp_cooked[j] = '\0';
+
+
invalid = 0;
errmsg[0] = 0;
switch(mailtype) {
- case MES_LOCAL:
+ case EA_LOCAL:
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_cooked[5])) ) {
+ else if ( (!strncasecmp(this_recp, "room_", 5)) && (!CtdlGetRoom(&tempQR, &this_recp_cooked[5])) ) {
/* Save room so we can restore it later */
- tempQR2 = CCC->room;
- CCC->room = tempQR;
+ tempQR2 = CC->room;
+ CC->room = tempQR;
/* Check permissions to send mail to this room */
err = CtdlDoIHavePermissionToPostInThisRoom(
RemoteIdentifier,
Flags,
0 /* 0 = not a reply */
- );
+ );
if (err) {
++ret->num_error;
invalid = 1;
}
/* Restore room in case something needs it */
- CCC->room = tempQR2;
+ CC->room = tempQR2;
}
else if (CtdlGetUser(&tempUS, this_recp) == 0) {
invalid = 1;
}
break;
- case MES_INTERNET:
+ case EA_INTERNET:
/* Yes, you're reading this correctly: if the target
* domain points back to the local system,
* the address is invalid. That's
strcat(ret->recp_internet, this_recp);
}
break;
- case MES_ERROR:
+ case EA_ERROR:
++ret->num_error;
invalid = 1;
break;
);
free(recipients);
+ array_free(recp_array);
+
return(ret);
}
/*
* Destructor for recptypes
*/
-void free_recipients(recptypes *valid) {
+void free_recipients(struct recptypes *valid) {
if (valid == NULL) {
return;
}
-char *qp_encode_email_addrs(char *source)
-{
+char *qp_encode_email_addrs(char *source) {
char *user, *node, *name;
const char headerStr[] = "=?UTF-8?Q?";
char *Encoded;
free (AddrPtr), AddrPtr = ptr;
ptr = (long *) malloc(sizeof (long) * nAddrPtrMax * 2);
- memset(&ptr[nAddrPtrMax], 0,
- sizeof (long) * nAddrPtrMax);
+ memset(&ptr[nAddrPtrMax], 0, sizeof (long) * nAddrPtrMax);
memcpy (ptr, AddrUtf8, sizeof (long) * nAddrPtrMax);
free (AddrUtf8), AddrUtf8 = ptr;
nAddrPtrMax *= 2;
}
- if (((unsigned char) source[i] < 32) ||
- ((unsigned char) source[i] > 126)) {
+ if (((unsigned char) source[i] < 32) || ((unsigned char) source[i] > 126)) {
need_to_encode = 1;
AddrUtf8[nColons] = 1;
}
- if (source[i] == '"')
+ if (source[i] == '"') {
InQuotes = !InQuotes;
+ }
if (!InQuotes && source[i] == ',') {
AddrPtr[nColons] = i;
nColons++;
for (i = 0; i < nColons && nPtr != NULL; i++) {
nmax = EncodedMaxLen - (nPtr - Encoded);
if (AddrUtf8[i]) {
- process_rfc822_addr(&source[AddrPtr[i]],
- user,
- node,
- name);
+ process_rfc822_addr(&source[AddrPtr[i]], user, node, name);
/* TODO: libIDN here ! */
if (IsEmptyStr(name)) {
- n = snprintf(nPtr, nmax,
- (i==0)?"%s@%s" : ",%s@%s",
- user, node);
+ n = snprintf(nPtr, nmax, (i==0)?"%s@%s" : ",%s@%s", user, node);
}
else {
EncodedName = rfc2047encode(name, strlen(name));
- n = snprintf(nPtr, nmax,
- (i==0)?"%s <%s@%s>" : ",%s <%s@%s>",
- EncodedName, user, node);
+ n = snprintf(nPtr, nmax, (i==0)?"%s <%s@%s>" : ",%s <%s@%s>", EncodedName, user, node);
free(EncodedName);
}
}
else {
- n = snprintf(nPtr, nmax,
- (i==0)?"%s" : ",%s",
- &source[AddrPtr[i]]);
+ n = snprintf(nPtr, nmax, (i==0)?"%s" : ",%s", &source[AddrPtr[i]]);
}
if (n > 0 )
nPtr += n;
else {
if (*sField=='\"') quote = 1 - quote;
if (!quote) {
- if (isspace(*sField))
- {
+ if (isspace(*sField)) {
*pField = ' ';
pField++;
sField++;
* Split an RFC822-style address into userid, host, and full name
*
*/
-void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name)
-{
+void process_rfc822_addr(const char *rfc822, char *user, char *node, char *name) {
int a;
strcpy(user, "");
) {
strcpy(node, CtdlGetConfigStr("c_nodename"));
}
-
else {
/* strip anything to the left of a @ */
}
-/* 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];
snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08x@%s", i, CtdlGetConfigStr("c_fqdn"));
}
u = CtdlDirectoryLookup(NULL, synthetic_email_addr, 0);
+ syslog(LOG_DEBUG, "user_ops: address <%s> lookup returned <%d>", synthetic_email_addr, u);
}
CtdlSetEmailAddressesForUser(user->fullname, synthetic_email_addr);