* This file contains functions which handle the mapping of Internet addresses
* to users on the Citadel system.
*
- * Copyright (c) 1987-2018 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.
if (start != NULL)
FindNextEnd (start, end);
- while ((start != NULL) && (end != NULL))
- {
+ while ((start != NULL) && (end != NULL)) {
next = strstr(end, "=?");
if (next != NULL)
FindNextEnd(next, nextend);
next = NULL;
/* did we find two partitions */
- if ((next != NULL) &&
- ((next - end) > 2))
- {
+ if ((next != NULL) && ((next - end) > 2)) {
ptr = end + 2;
while ((ptr < next) &&
(isspace(*ptr) ||
*/
start = strstr(buf, "=?");
FindNextEnd((start != NULL)? start : buf, end);
- while (start != NULL && end != NULL && end > start)
- {
+ while (start != NULL && end != NULL && end > start) {
extract_token(charset, start, 1, '?', sizeof charset);
extract_token(encoding, start, 2, '?', sizeof encoding);
extract_token(istr, start, 3, '?', sizeof istr);
len = strlen(istr);
pos = 0;
- while (pos < len)
- {
+ while (pos < len) {
if (istr[pos] == '_') istr[pos] = ' ';
pos++;
}
-
ibuflen = CtdlDecodeQuotedPrintable(ibuf, istr, len);
}
else {
*/
int CtdlIsMe(char *addr, int addr_buf_len)
{
- recptypes *recp;
+ struct recptypes *recp;
int i;
recp = validate_recipients(addr, NULL, 0);
/* If the last item in a list of recipients was truncated to a partial address,
- * remove it completely in order to avoid choking libSieve
+ * remove it completely in order to avoid choking library functions.
*/
void sanitize_truncated_recipient(char *str)
{
* 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)
-{
- unsigned int i;
-
- 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]);
- }
+void remove_any_whitespace_to_the_left_or_right_of_at_symbol(char *name) {
+ char *ptr;
+ if (!name) return;
+
+ 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);
}
}
}
/*
* Aliasing for network mail.
*/
-int alias(char *name)
-{ /* process alias and routing info for mail */
- FILE *fp;
+int alias(char *name) { /* process alias and routing info for mail */
int a;
- char aaa[SIZ], bbb[SIZ];
+ char aaa[SIZ];
int at = 0;
char node[64];
remove_any_whitespace_to_the_left_or_right_of_at_symbol(name);
stripallbut(name, '<', '>');
- fp = fopen(file_mail_aliases, "r"); // when are we going to get rid of this?
- if (fp == NULL) {
- fp = fopen("/dev/null", "r");
- }
- if (fp == NULL) {
- return (MES_ERROR);
- }
- strcpy(aaa, "");
- strcpy(bbb, "");
- while (fgets(aaa, sizeof aaa, fp) != NULL) {
- while (isspace(name[0]))
- strcpy(name, &name[1]);
- aaa[strlen(aaa) - 1] = 0;
- strcpy(bbb, "");
- for (a = 0; aaa[a] != '\0'; ++a) {
- if (aaa[a] == ',') {
- strcpy(bbb, &aaa[a + 1]);
- aaa[a] = 0;
- break;
- }
- }
- if (!strcasecmp(name, aaa))
- strcpy(name, bbb);
- }
- fclose(fp);
-
/* Hit the email address directory */
if (CtdlDirectoryLookup(aaa, name, sizeof aaa) == 0) {
strcpy(name, aaa);
*
* Caller needs to free the result using free_recipients()
*/
-recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags)
-{
+struct recptypes *validate_recipients(const char *supplied_recipients, const char *RemoteIdentifier, int Flags) {
struct CitContext *CCC = CC;
- recptypes *ret;
+ struct recptypes *ret;
char *recipients = NULL;
char *org_recp;
char this_recp[256];
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("");
}
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;
Flags,
0 /* 0 = not a reply */
);
- if (err)
- {
+ if (err) {
++ret->num_error;
invalid = 1;
}
}
free(org_recp);
- if ( (ret->num_local + ret->num_internet + ret->num_room + ret->num_error) == 0)
- {
+ if ( (ret->num_local + ret->num_internet + ret->num_room + ret->num_error) == 0) {
ret->num_error = (-1);
strcpy(ret->errormsg, "No recipients specified.");
}
/*
* 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;
{
if ((*sField=='\r') || (*sField=='\n'))
{
- int Offset = 1;
- while (((*(sField + Offset) == '\r') ||
- (*(sField + Offset) == '\n') ||
- (isspace(*(sField + Offset)))) &&
- (sField + Offset < pFieldEnd))
- Offset ++;
- sField += Offset;
+ int offset = 1;
+ while ( ( (*(sField + offset) == '\r') || (*(sField + offset) == '\n' )) && (sField + offset < pFieldEnd) ) {
+ offset ++;
+ }
+ sField += offset;
*pField = *sField;
}
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 @ */
process_rfc822_addr(value, user, node, name);
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, strlen(name));
- if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr))
- CM_SetField(msg, erFc822Addr, addr, strlen(addr));
+ if (CM_IsEmpty(msg, eAuthor) && !IsEmptyStr(name)) {
+ CM_SetField(msg, eAuthor, name, -1);
+ }
+ if (CM_IsEmpty(msg, erFc822Addr) && !IsEmptyStr(addr)) {
+ CM_SetField(msg, erFc822Addr, addr, -1);
+ }
processed = 1;
}
}
-/* 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];
char key[SIZ];
/* Dump it in there unchanged, just for kicks */
- safestrncpy(target, internet_addr, targbuflen);
+ if (target != NULL) {
+ safestrncpy(target, internet_addr, targbuflen);
+ }
/* Only do lookups for addresses with hostnames in them */
if (num_tokens(internet_addr, '@') != 2) return(-1);
directory_key(key, internet_addr);
cdbrec = cdb_fetch(CDB_DIRECTORY, key, strlen(key) );
if (cdbrec != NULL) {
- safestrncpy(target, cdbrec->ptr, targbuflen);
+ if (target != NULL) {
+ safestrncpy(target, cdbrec->ptr, targbuflen);
+ }
cdb_free(cdbrec);
return(0);
}
/*
* Helper function for CtdlRebuildDirectoryIndex()
- *
- * Call this function as a ForEachUser backend in order to queue up
- * user names, or call it with a null user to make it do the processing.
- * This allows us to maintain the list as a static instead of passing
- * pointers around.
*/
-void CtdlRebuildDirectoryIndex_backend(struct ctdluser *usbuf, void *data) {
-
- struct crdib {
- char name[64];
- char emails[512];
- };
+void CtdlRebuildDirectoryIndex_backend(char *username, void *data) {
- static struct crdib *e = NULL;
- static int num_e = 0;
- static int alloc_e = 0;
-
- /* this is the calling mode where we add a user */
+ int j = 0;
+ struct ctdluser usbuf;
- if (usbuf != NULL) {
- if (num_e >= alloc_e) {
- if (alloc_e == 0) {
- alloc_e = 100;
- e = malloc(sizeof(struct crdib) * alloc_e);
- }
- else {
- alloc_e *= 2;
- e = realloc(e, (sizeof(struct crdib) * alloc_e));
- }
- }
- strcpy(e[num_e].name, usbuf->fullname);
- strcpy(e[num_e].emails, usbuf->emailaddrs);
- ++num_e;
+ if (CtdlGetUser(&usbuf, username) != 0) {
return;
}
- /* this is the calling mode where we do the processing */
-
- int i, j;
- for (i=0; i<num_e; ++i) {
- if ( (!IsEmptyStr(e[i].name)) && (!IsEmptyStr(e[i].emails)) ) {
- for (j=0; j<num_tokens(e[i].emails, '|'); ++j) {
- char one_email[512];
- extract_token(one_email, e[i].emails, j, '|', sizeof one_email);
- CtdlDirectoryAddUser(one_email, e[i].name);
- }
+ if ( (!IsEmptyStr(usbuf.fullname)) && (!IsEmptyStr(usbuf.emailaddrs)) ) {
+ for (j=0; j<num_tokens(usbuf.emailaddrs, '|'); ++j) {
+ char one_email[512];
+ extract_token(one_email, usbuf.emailaddrs, j, '|', sizeof one_email);
+ CtdlDirectoryAddUser(one_email, usbuf.fullname);
}
}
- free(e);
- num_e = 0;
- alloc_e = 0;
- return;
}
syslog(LOG_INFO, "internet_addressing: rebuilding email address directory index");
cdb_trunc(CDB_DIRECTORY);
ForEachUser(CtdlRebuildDirectoryIndex_backend, NULL);
- CtdlRebuildDirectoryIndex_backend(NULL, NULL);
}
void AutoGenerateEmailAddressForUser(struct ctdluser *user)
{
char synthetic_email_addr[1024];
- snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08lx@%s", user->usernum, CtdlGetConfigStr("c_fqdn"));
+ int i, j;
+ int u = 0;
+
+ for (i=0; u==0; ++i) {
+ if (i == 0) {
+ // first try just converting the user name to lowercase and replacing spaces with underscores
+ snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "%s@%s", user->fullname, CtdlGetConfigStr("c_fqdn"));
+ for (j=0; ((synthetic_email_addr[j] != '\0')&&(synthetic_email_addr[j] != '@')); j++) {
+ synthetic_email_addr[j] = tolower(synthetic_email_addr[j]);
+ if (!isalnum(synthetic_email_addr[j])) {
+ synthetic_email_addr[j] = '_';
+ }
+ }
+ }
+ else if (i == 1) {
+ // then try 'ctdl' followed by the user number
+ snprintf(synthetic_email_addr, sizeof synthetic_email_addr, "ctdl%08lx@%s", user->usernum, CtdlGetConfigStr("c_fqdn"));
+ }
+ else if (i > 1) {
+ // oof. just keep trying other numbers until we find one
+ 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);
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);
projects / citadel.git / blobdiff