From 1144dcb5c82e4360bc9dfd59d3125914ef5a4b6e Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Wed, 8 Sep 2021 15:21:36 +0000 Subject: [PATCH] Well, it doesn't crash anymore, but it also doesn't work at all. Is that an improvement? --- citadel/database.c | 50 +++++++++++-------------- citadel/internet_addressing.c | 59 +++++++++++++++++++----------- citadel/ipcdef.h | 1 - citadel/modules/vcard/serv_vcard.c | 2 +- citadel/room_ops.c | 10 +---- citadel/room_ops.h | 2 +- 6 files changed, 63 insertions(+), 61 deletions(-) diff --git a/citadel/database.c b/citadel/database.c index 37a9d7974..45b5d2734 100644 --- a/citadel/database.c +++ b/citadel/database.c @@ -1,16 +1,14 @@ -/* - * This is a data store backend for the Citadel server which uses Berkeley DB. - * - * 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 is a data store backend for the Citadel server which uses Berkeley DB. +// +// 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. /***************************************************************************** Tunable configuration parameters for the Berkeley DB back end @@ -39,7 +37,6 @@ #endif #include - #include "ctdl_module.h" #include "control.h" #include "citserver.h" @@ -548,10 +545,8 @@ static DBC *localcursor(int cdb) { */ struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen) { - syslog(LOG_DEBUG, "\x1b[35mdatabase: fetch from db %d a key of length %d\x1b[0m", cdb, keylen); - - if (keylen == 0) { - abort(); + if (keylen == 0) { // key length zero is impossible + return(NULL); } struct cdbdata *tempcdb; @@ -576,8 +571,7 @@ struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen) { curs = localcursor(cdb); ret = curs->c_get(curs, &dkey, &dret, DB_SET); cclose(curs); - } - while (ret == DB_LOCK_DEADLOCK); + } while (ret == DB_LOCK_DEADLOCK); } if ((ret != 0) && (ret != DB_NOTFOUND)) { @@ -590,9 +584,8 @@ struct cdbdata *cdb_fetch(int cdb, const void *key, int keylen) { } tempcdb = (struct cdbdata *) malloc(sizeof(struct cdbdata)); - if (tempcdb == NULL) { - syslog(LOG_ERR, "db: cdb_fetch: Cannot allocate memory for tempcdb"); + syslog(LOG_ERR, "db: cdb_fetch() cannot allocate memory for tempcdb: %m"); cdb_abort(); return NULL; /* make it easier for static analysis... */ } @@ -707,17 +700,19 @@ void cdb_begin_transaction(void) { void cdb_end_transaction(void) { int i; - for (i = 0; i < MAXCDB; i++) + for (i = 0; i < MAXCDB; i++) { if (TSD->cursors[i] != NULL) { syslog(LOG_WARNING, "db: cdb_end_transaction: WARNING: cursor %d still open at transaction end", i); cclose(TSD->cursors[i]); TSD->cursors[i] = NULL; } + } if (TSD->tid == NULL) { syslog(LOG_ERR, "db: cdb_end_transaction: ERROR: txcommit(NULL) !!"); cdb_abort(); - } else { + } + else { txcommit(TSD->tid); } @@ -757,16 +752,15 @@ void cdb_trunc(int cdb) { } exit(CTDLEXIT_DB); } - } else { + } + else { /* txcommit(tid); */ } } } -/* - * compact (defragment) the database , possibly returning space back to the underlying filesystem - */ +// compact (defragment) the database, possibly returning space back to the underlying filesystem void cdb_compact(void) { int ret; int i; diff --git a/citadel/internet_addressing.c b/citadel/internet_addressing.c index db9e776ad..c19c4f82c 100644 --- a/citadel/internet_addressing.c +++ b/citadel/internet_addressing.c @@ -44,8 +44,8 @@ #ifdef HAVE_ICONV #include -#if 0 /* This is the non-define version in case it is needed for debugging */ +#if 0 inline void FindNextEnd (char *bptr, char *end) { /* Find the next ?Q? */ @@ -392,31 +392,30 @@ enum { // Process alias and routing info for email addresses -int expand_aliases(char *name) { +int expand_aliases(char *name, char *aliases) { int a; char aaa[SIZ]; int at = 0; char node[64]; - char *t; syslog(LOG_DEBUG, "internet_addressing: \x1b[34mexpand_aliases(%s)\x1b[0m", name); - - char *aliases = CtdlGetSysConfig(GLOBAL_ALIASES); // First hit the Global Alias Table if (aliases) { - char *aptr = aliases; - while ((t = strtok_r(aptr, "\n", &aptr))) { - char *bar = strchr(t, '|'); + int num_aliases = num_tokens(aliases, '\n'); + for (a=0; a to <%s>\x1b[0m", a, name, aaa); + if (!strcasecmp(name, aaa)) { syslog(LOG_DEBUG, "internet_addressing: global alias <%s> to <%s>", name, bar); strcpy(name, bar); } } } - - free(aliases); if (strchr(name, ',')) { return(EA_MULTIPLE); } @@ -476,9 +475,13 @@ Array *split_recps(char *addresses) { // 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; + if (a == NULL) { + syslog(LOG_ERR, "internet_addressing: malloc() failed: %m"); + return(NULL); + } // Strip out anything in double quotes + a[0] = 0; int toggle = 0; int pos = 0; char *t; @@ -501,12 +504,18 @@ Array *split_recps(char *addresses) { // 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); + + int num_addresses = num_tokens(a, ','); + syslog(LOG_DEBUG, "\x1b[35mEXTRACING: %d addresses from <%s>\x1b[0m", num_addresses, a); + for (int i=0; i\x1b[0m", 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 + syslog(LOG_DEBUG, "\x1b[35mPROCESSED: <%s>\x1b[0m", this_address); + array_append(recipients_array, this_address); } free(a); // We don't need this buffer anymore. @@ -565,13 +574,17 @@ struct recptypes *validate_recipients(char *supplied_recipients, const char *Rem ret->display_recp[0] = 0; ret->recptypes_magic = RECPTYPES_MAGIC; + //char *aliases = CtdlGetSysConfig(GLOBAL_ALIASES); // First hit the Global Alias Table + char *aliases = strdup("root|admin,ajc@citadel.org,artcancro@gmail.com\n abuse|admin\n ajc|ajc@citadel.org\n"); + Array *recp_array = split_recps(supplied_recipients); int original_array_len = array_len(recp_array); + syslog(LOG_DEBUG, "\x1b[32moriginal_array_len=%d\x1b[0m", original_array_len); for (int r=0; rnum_local + ret->num_internet + ret->num_room + ret->num_error) == 0) { ret->num_error = (-1); strcpy(ret->errormsg, "No recipients specified."); diff --git a/citadel/ipcdef.h b/citadel/ipcdef.h index f155a6e97..23897e455 100644 --- a/citadel/ipcdef.h +++ b/citadel/ipcdef.h @@ -57,7 +57,6 @@ extern "C" { #define QR2_COLLABDEL 4 /* Anyone who can post can delete */ #define QR2_SUBJECTREQ 8 /* Subject strongly recommended */ #define QR2_SMTP_PUBLIC 16 /* Listservice Subscribers may post */ -#define QR2_MODERATED 32 /* Listservice aide has to permit posts */ #define US_NEEDVALID 1 /* User needs to be validated */ #define US_EXTEDIT 2 /* Always use external editor */ diff --git a/citadel/modules/vcard/serv_vcard.c b/citadel/modules/vcard/serv_vcard.c index d828dc73c..9b30840a1 100644 --- a/citadel/modules/vcard/serv_vcard.c +++ b/citadel/modules/vcard/serv_vcard.c @@ -927,7 +927,7 @@ void check_get(void) { char *argbuf = &cmdbuf[4]; extract_token(internet_addr, argbuf, 0, '|', sizeof internet_addr); - rcpt = validate_recipients(internet_addr, NULL, CHECK_EXISTANCE); + rcpt = validate_recipients(internet_addr, NULL, CHECK_EXIST); if ( (rcpt != NULL) && ( (*rcpt->recp_local != '\0') || diff --git a/citadel/room_ops.c b/citadel/room_ops.c index 9adc4d69e..29bb1231b 100644 --- a/citadel/room_ops.c +++ b/citadel/room_ops.c @@ -57,7 +57,7 @@ int CtdlDoIHavePermissionToPostInThisRoom( snprintf(errmsgbuf, n, "Not logged in."); return (ERROR + NOT_LOGGED_IN); } - else if (PostPublic == CHECK_EXISTANCE) { + else if (PostPublic == CHECK_EXIST) { return (0); // evaluate whether a recipient exists } else if (!(CC->logged_in)) { @@ -65,14 +65,6 @@ int CtdlDoIHavePermissionToPostInThisRoom( snprintf(errmsgbuf, n, "Not logged in."); return (ERROR + NOT_LOGGED_IN); } - if (CC->room.QRflags2 & QR2_MODERATED) { - snprintf(errmsgbuf, n, "Not logged in Moderation feature not yet implemented!"); - return (ERROR + NOT_LOGGED_IN); - } - // FIXME what was this? AJC 2021 - //if ((PostPublic != POST_LMTP) && (CC->room.QRflags2 & QR2_SMTP_PUBLIC) == 0) { - //return CtdlNetconfigCheckRoomaccess(errmsgbuf, n, RemoteIdentifier); - //} return (0); } diff --git a/citadel/room_ops.h b/citadel/room_ops.h index a9a77f9e7..d72300b76 100644 --- a/citadel/room_ops.h +++ b/citadel/room_ops.h @@ -12,7 +12,7 @@ void convert_room_name_macros(char *towhere, size_t maxlen); typedef enum _POST_TYPE{ POST_LOGGED_IN, POST_EXTERNAL, - CHECK_EXISTANCE, + CHECK_EXIST, POST_LMTP } PostType; -- 2.30.2