#include <string.h>
#include <limits.h>
#include <ctype.h>
+#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
#include "serv_extensions.h"
#include "sysdep_decls.h"
#include "msgbase.h"
-#include "tools.h"
#include "config.h"
+#include "modules/crypto/serv_crypto.h" /* Needed until a universal crypto startup hook is implimented for CtdlStartTLS */
+
+#include "ctdl_module.h"
+
#ifndef HAVE_SNPRINTF
#include <stdarg.h>
#include "snprintf.h"
struct ServiceFunctionHook *ServiceHookTable = NULL;
struct FixedOutputHook *FixedOutputTable = NULL;
struct RoomFunctionHook *RoomHookTable = NULL;
-
+struct SearchFunctionHook *SearchFunctionHookTable = NULL;
struct ProtoFunctionHook {
void (*handler) (char *cmdbuf);
- char *cmd;
- char *desc;
- struct ProtoFunctionHook *next;
-} *ProtoHookList = NULL;
+ const char *cmd;
+ const char *desc;
+};
+
+HashList *ProtoHookList = NULL;
#define ERR_PORT (1 << 1)
static size_t nSizPort = 0;
static char *errormessages = NULL;
-static size_t nSizErrmsg = 0;
+size_t nSizErrmsg = 0;
-static long DetailErrorFlags;
+long DetailErrorFlags;
char *ErrSubject = "Startup Problems";
char *ErrGeneral = "Citadel had trouble on starting up. %s This means, citadel won't be the service provider for a specific service you configured it to.\n\n"
char *ErrPortWhere = "Admin->System Preferences->Network.\n\nThe failed ports and sockets are: ";
char *ErrPortHint = "If you want citadel to provide you with that functionality, "
"check the output of \"netstat -lnp\" on linux Servers or \"netstat -na\" on *BSD"
-" and stop the programm, that binds these ports. You should eventually remove "
-" their initscripts in /etc/init.d so that you won't get this trouble once more.\n";
+" and stop the programm, that binds these ports.\n You should eventually remove "
+" their initscripts in /etc/init.d so that you won't get this trouble once more.\n"
+" After that goto Administration -> Shutdown Citadel to make Citadel retry to bind this port.\n";
void LogPrintMessages(long err)
int n = nSizPort + nSizErrmsg + 5;
Message = (char*) malloc(n * SIZ);
+
+ DetailErrorFlags = DetailErrorFlags & ~err;
switch (err)
{
snprintf(Message, n * SIZ, ErrGeneral, Short, Where, List, Hint, DetailList);
+ CtdlLogPrintf(0,Message);
+ CtdlLogPrintf(0,ErrSubject);
quickie_message("Citadel", NULL, NULL, AIDEROOM, Message, FMT_FIXED, ErrSubject);
if (errormessages!=NULL) free (errormessages);
errormessages = NULL;
}
+int DLoader_Exec_Cmd(char *cmdbuf)
+{
+ void *vP;
+ struct ProtoFunctionHook *p;
+
+ if (GetHash(ProtoHookList, cmdbuf, 4, &vP) && (vP != NULL)) {
+ p = (struct ProtoFunctionHook*) vP;
+ p->handler(&cmdbuf[5]);
+ return 1;
+ }
+ return 0;
+}
+
+int FourHash(const char *key, long length)
+{
+ int i;
+ int ret = 0;
+ const unsigned char *ptr = (const unsigned char*)key;
+
+ for (i = 0; i < 4; i++, ptr ++)
+ ret = (ret << 8) |
+ ( ((*ptr >= 'a') &&
+ (*ptr <= 'z'))?
+ *ptr - 'a' + 'A':
+ *ptr);
+
+ return ret;
+}
+
void CtdlRegisterProtoHook(void (*handler) (char *), char *cmd, char *desc)
{
struct ProtoFunctionHook *p;
+ if (ProtoHookList == NULL)
+ ProtoHookList = NewHash (1, FourHash);
+
+
p = (struct ProtoFunctionHook *)
malloc(sizeof(struct ProtoFunctionHook));
p->handler = handler;
p->cmd = cmd;
p->desc = desc;
- p->next = ProtoHookList;
- ProtoHookList = p;
- lprintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
-}
-
-void CtdlUnregisterProtoHook(void (*handler) (char *), char *cmd)
-{
- struct ProtoFunctionHook *cur = NULL;
- struct ProtoFunctionHook *p = NULL;
- struct ProtoFunctionHook *lastcur = NULL;
-
- for (cur = ProtoHookList;
- cur != NULL;
- cur = (cur != NULL)? cur->next: NULL) {
- /* This will also remove duplicates if any */
- while (cur != NULL &&
- handler == cur->handler &&
- !strcmp(cmd, cur->cmd)) {
- lprintf(CTDL_INFO, "Unregistered server command %s (%s)\n",
- cmd, cur->desc);
- p = cur->next;
- if (cur == ProtoHookList) {
- ProtoHookList = p;
- }
- else if (lastcur != NULL)
- {
- lastcur->next = p;
- }
- free(cur);
- cur = p;
- }
- lastcur = cur;
- }
+ Put(ProtoHookList, cmd, 4, p, NULL);
+ CtdlLogPrintf(CTDL_INFO, "Registered server command %s (%s)\n", cmd, desc);
}
void CtdlDestroyProtoHooks(void)
{
- struct ProtoFunctionHook *cur, *p;
- cur = ProtoHookList;
- while (cur != NULL)
- {
- lprintf(CTDL_INFO, "Destroyed server command %s (%s)\n",
- cur->cmd, cur->desc);
- p = cur->next;
- free(cur);
- cur = p;
- }
- ProtoHookList = NULL;
+ DeleteHash(&ProtoHookList);
}
-int DLoader_Exec_Cmd(char *cmdbuf)
-{
- struct ProtoFunctionHook *p;
-
- for (p = ProtoHookList; p; p = p->next) {
- if (!strncasecmp(cmdbuf, p->cmd, 4)) {
- p->handler(&cmdbuf[5]);
- return 1;
- }
- }
- return 0;
-}
-
-#if 0
-void initialize_server_extensions(void)
-{
- long filter;
-
- nSizErrmsg = 0;
-
- /*lprintf(CTDL_INFO, "%s\n", serv_bio_init());
- lprintf(CTDL_INFO, "%s\n", serv_calendar_init());
- lprintf(CTDL_INFO, "%s\n", serv_notes_init());
- lprintf(CTDL_INFO, "%s\n", serv_ldap_init());
- lprintf(CTDL_INFO, "%s\n", serv_chat_init());
- lprintf(CTDL_INFO, "%s\n", serv_expire_init());
- lprintf(CTDL_INFO, "%s\n", serv_imap_init());
- lprintf(CTDL_INFO, "%s\n", serv_upgrade_init());
- lprintf(CTDL_INFO, "%s\n", serv_inetcfg_init());
- lprintf(CTDL_INFO, "%s\n", serv_listsub_init());
- lprintf(CTDL_INFO, "%s\n", serv_mrtg_init());
- lprintf(CTDL_INFO, "%s\n", serv_netfilter_init());
- lprintf(CTDL_INFO, "%s\n", serv_network_init());
- lprintf(CTDL_INFO, "%s\n", serv_newuser_init());
- lprintf(CTDL_INFO, "%s\n", serv_pas2_init());
- lprintf(CTDL_INFO, "%s\n", serv_smtp_init());
- lprintf(CTDL_INFO, "%s\n", serv_pop3_init());
- lprintf(CTDL_INFO, "%s\n", serv_rwho_init());
- lprintf(CTDL_INFO, "%s\n", serv_spam_init());*/
- /* lprintf(CTDL_INFO, "%s\n", serv_test_init()); */
- /*lprintf(CTDL_INFO, "%s\n", serv_vandelay_init());
- lprintf(CTDL_INFO, "%s\n", serv_vcard_init());
- lprintf(CTDL_INFO, "%s\n", serv_fulltext_init());
- lprintf(CTDL_INFO, "%s\n", serv_autocompletion_init());
- lprintf(CTDL_INFO, "%s\n", serv_postfix_tcpdict());
- lprintf(CTDL_INFO, "%s\n", serv_sieve_init());
- lprintf(CTDL_INFO, "%s\n", serv_managesieve_init());
- lprintf(CTDL_INFO, "%s\n", serv_funambol_init());*/
- for (filter = 1; filter != 0; filter = filter << 1)
- if ((filter & DetailErrorFlags) != 0)
- LogPrintMessages(filter);
-}
-
-#endif
-
void CtdlRegisterCleanupHook(void (*fcn_ptr) (void))
{
newfcn->h_function_pointer = fcn_ptr;
CleanupHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new cleanup function\n");
+ CtdlLogPrintf(CTDL_INFO, "Registered a new cleanup function\n");
}
/* This will also remove duplicates if any */
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer) {
- lprintf(CTDL_INFO, "Unregistered cleanup function\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered cleanup function\n");
p = cur->next;
if (cur == CleanupHookTable) {
CleanupHookTable = p;
cur = CleanupHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed cleanup function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed cleanup function\n");
p = cur->next;
free(cur);
cur = p;
newfcn->eventtype = EventType;
SessionHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new session function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Registered a new session function (type %d)\n",
EventType);
}
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer &&
EventType == cur->eventtype) {
- lprintf(CTDL_INFO, "Unregistered session function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Unregistered session function (type %d)\n",
EventType);
p = cur->next;
if (cur == SessionHookTable) {
cur = SessionHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed session function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed session function\n");
p = cur->next;
free(cur);
cur = p;
newfcn->eventtype = EventType;
UserHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new user function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Registered a new user function (type %d)\n",
EventType);
}
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer &&
EventType == cur->eventtype) {
- lprintf(CTDL_INFO, "Unregistered user function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Unregistered user function (type %d)\n",
EventType);
p = cur->next;
if (cur == UserHookTable) {
cur = UserHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed user function \n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed user function \n");
p = cur->next;
free(cur);
cur = p;
newfcn->eventtype = EventType;
MessageHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new message function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Registered a new message function (type %d)\n",
EventType);
}
while (cur != NULL &&
handler == cur->h_function_pointer &&
EventType == cur->eventtype) {
- lprintf(CTDL_INFO, "Unregistered message function (type %d)\n",
+ CtdlLogPrintf(CTDL_INFO, "Unregistered message function (type %d)\n",
EventType);
p = cur->next;
if (cur == MessageHookTable) {
cur = MessageHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed message function \n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed message function (type %d)\n", cur->eventtype);
p = cur->next;
free(cur);
cur = p;
newfcn->fcn_ptr = fcn_ptr;
RoomHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new room function\n");
+ CtdlLogPrintf(CTDL_INFO, "Registered a new room function\n");
}
for (cur = RoomHookTable; cur != NULL; cur = cur->next) {
while (cur != NULL && fcn_ptr == cur->fcn_ptr) {
- lprintf(CTDL_INFO, "Unregistered room function\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered room function\n");
p = cur->next;
if (cur == RoomHookTable) {
RoomHookTable = p;
cur = RoomHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Unregistered room function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed room function\n");
p = cur->next;
free(cur);
cur = p;
newfcn->h_function_pointer = handler;
NetprocHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Registered a new netproc function\n");
}
/* This will also remove duplicates if any */
while (cur != NULL &&
handler == cur->h_function_pointer ) {
- lprintf(CTDL_INFO, "Unregistered netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered netproc function\n");
p = cur->next;
if (cur == NetprocHookTable) {
NetprocHookTable = p;
cur = NetprocHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Unregistered netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed netproc function\n");
p = cur->next;
free(cur);
cur = p;
newfcn->h_function_pointer = handler;
DeleteHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Registered a new delete function\n");
}
/* This will also remove duplicates if any */
while (cur != NULL &&
handler == cur->h_function_pointer ) {
- lprintf(CTDL_INFO, "Unregistered netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered delete function\n");
p = cur->next;
if (cur == DeleteHookTable) {
DeleteHookTable = p;
cur = DeleteHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed netproc function\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed delete function\n");
p = cur->next;
free(cur);
cur = p;
safestrncpy(newfcn->content_type, content_type, sizeof newfcn->content_type);
FixedOutputTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
+ CtdlLogPrintf(CTDL_INFO, "Registered a new fixed output function for %s\n", newfcn->content_type);
}
for (cur = FixedOutputTable; cur != NULL; cur = cur->next) {
/* This will also remove duplicates if any */
while (cur != NULL && (!strcasecmp(content_type, cur->content_type))) {
- lprintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
+ CtdlLogPrintf(CTDL_INFO, "Unregistered fixed output function for %s\n", content_type);
p = cur->next;
if (cur == FixedOutputTable) {
FixedOutputTable = p;
cur = FixedOutputTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
+ CtdlLogPrintf(CTDL_INFO, "Destroyed fixed output function for %s\n", cur->content_type);
p = cur->next;
free(cur);
cur = p;
-void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+void CtdlRegisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
{
struct XmsgFunctionHook *newfcn;
- newfcn = (struct XmsgFunctionHook *)
- malloc(sizeof(struct XmsgFunctionHook));
+ newfcn = (struct XmsgFunctionHook *) malloc(sizeof(struct XmsgFunctionHook));
newfcn->next = XmsgHookTable;
newfcn->order = order;
newfcn->h_function_pointer = fcn_ptr;
XmsgHookTable = newfcn;
- lprintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
+ CtdlLogPrintf(CTDL_INFO, "Registered a new x-msg function (priority %d)\n", order);
}
-void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *), int order)
+void CtdlUnregisterXmsgHook(int (*fcn_ptr) (char *, char *, char *, char *), int order)
{
struct XmsgFunctionHook *cur, *p;
while (cur != NULL &&
fcn_ptr == cur->h_function_pointer &&
order == cur->order) {
- lprintf(CTDL_INFO, "Unregistered x-msg function "
+ CtdlLogPrintf(CTDL_INFO, "Unregistered x-msg function "
"(priority %d)\n", order);
p = cur->next;
if (cur == XmsgHookTable) {
cur = XmsgHookTable;
while (cur != NULL)
{
- lprintf(CTDL_INFO, "Destroyed x-msg function "
+ CtdlLogPrintf(CTDL_INFO, "Destroyed x-msg function "
"(priority %d)\n", cur->order);
p = cur->next;
void CtdlRegisterServiceHook(int tcp_port,
- char *sockpath,
- void (*h_greeting_function) (void),
- void (*h_command_function) (void),
- void (*h_async_function) (void)
- )
+ char *sockpath,
+ void (*h_greeting_function) (void),
+ void (*h_command_function) (void),
+ void (*h_async_function) (void),
+ const char *ServiceName)
{
struct ServiceFunctionHook *newfcn;
char *message;
newfcn->h_greeting_function = h_greeting_function;
newfcn->h_command_function = h_command_function;
newfcn->h_async_function = h_async_function;
+ newfcn->ServiceName = ServiceName;
if (sockpath != NULL) {
newfcn->msock = ig_uds_server(sockpath, config.c_maxsessions, &error);
snprintf(message, SIZ, "Unix domain socket '%s': ", sockpath);
}
else if (tcp_port <= 0) { /* port -1 to disable */
- lprintf(CTDL_INFO, "Service has been manually disabled, skipping\n");
+ CtdlLogPrintf(CTDL_INFO, "Service %s has been manually disabled, skipping\n", ServiceName);
free (message);
free(newfcn);
return;
tcp_port,
config.c_maxsessions,
&error);
- snprintf(message, SIZ, "TCP port %s:%d: ",
- config.c_ip_addr, tcp_port);
+ snprintf(message, SIZ, "TCP port %s:%d: (%s) ",
+ config.c_ip_addr, tcp_port, ServiceName);
}
if (newfcn->msock > 0) {
ServiceHookTable = newfcn;
strcat(message, "registered.");
- lprintf(CTDL_INFO, "%s\n", message);
+ CtdlLogPrintf(CTDL_INFO, "%s\n", message);
}
else {
AddPortError(message, error);
strcat(message, "FAILED.");
- lprintf(CTDL_CRIT, "%s\n", message);
+ CtdlLogPrintf(CTDL_CRIT, "%s\n", message);
free(error);
free(newfcn);
}
tcp_port == cur->tcp_port) {
close(cur->msock);
if (sockpath) {
- lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+ CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
sockpath);
} else if (tcp_port) {
- lprintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
+ CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", tcp_port);
} else {
- lprintf(CTDL_INFO, "Unregistered unknown service\n");
+ CtdlLogPrintf(CTDL_INFO, "Unregistered service \"%s\"\n", cur->ServiceName);
}
p = cur->next;
if (cur == ServiceHookTable) {
{
close(cur->msock);
if (cur->sockpath) {
- lprintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
+ CtdlLogPrintf(CTDL_INFO, "Closed UNIX domain socket %s\n",
cur->sockpath);
} else if (cur->tcp_port) {
- lprintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
+ CtdlLogPrintf(CTDL_INFO, "Closed TCP port %d\n", cur->tcp_port);
} else {
- lprintf(CTDL_INFO, "Unregistered unknown service\n");
+ CtdlLogPrintf(CTDL_INFO, "Destroyed service \"%s\"\n", cur->ServiceName);
}
p = cur->next;
free(cur);
ServiceHookTable = NULL;
}
+void CtdlRegisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *name)
+{
+ struct SearchFunctionHook *newfcn;
+
+ if (!name || !fcn_ptr) {
+ return;
+ }
+
+ newfcn = (struct SearchFunctionHook *)
+ malloc(sizeof(struct SearchFunctionHook));
+ newfcn->next = SearchFunctionHookTable;
+ newfcn->name = name;
+ newfcn->fcn_ptr = fcn_ptr;
+ SearchFunctionHookTable = newfcn;
+
+ CtdlLogPrintf(CTDL_INFO, "Registered a new search function (%s)\n", name);
+}
+
+void CtdlUnregisterSearchFuncHook(void (*fcn_ptr)(int *, long **, char *), char *name)
+{
+ struct SearchFunctionHook *cur, *p;
+
+ for (cur = SearchFunctionHookTable; cur != NULL; cur = cur->next) {
+ while (fcn_ptr && (cur->fcn_ptr == fcn_ptr) && name && !strcmp(name, cur->name)) {
+ CtdlLogPrintf(CTDL_INFO, "Unregistered search function(%s)\n", name);
+ p = cur->next;
+ if (cur == SearchFunctionHookTable) {
+ SearchFunctionHookTable = p;
+ }
+ free (cur);
+ cur = p;
+ }
+ }
+}
+
+void CtdlModuleDoSearch(int *num_msgs, long **search_msgs, char *search_string, char *func_name)
+{
+ struct SearchFunctionHook *fcn = NULL;
+
+ for (fcn = SearchFunctionHookTable; fcn != NULL; fcn = fcn->next) {
+ if (!func_name || !strcmp(func_name, fcn->name)) {
+ (*fcn->fcn_ptr) (num_msgs, search_msgs, search_string);
+ return;
+ }
+ }
+ *num_msgs = 0;
+}
+
void PerformSessionHooks(int EventType)
{
/* Other code may elect to protect this message from server-side
* handlers; if this is the case, don't do anything.
- lprintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
+ CtdlLogPrintf(CTDL_DEBUG, "** Event type is %d, flags are %d\n",
EventType, msg->cm_flags);
*/
if (msg->cm_flags & CM_SKIP_HOOKS) {
- lprintf(CTDL_DEBUG, "Skipping hooks\n");
+ CtdlLogPrintf(CTDL_DEBUG, "Skipping hooks\n");
return(0);
}
struct RoomFunctionHook *fcn;
int total_retval = 0;
- lprintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
+ CtdlLogPrintf(CTDL_DEBUG, "Performing room hooks for <%s>\n", target_room->QRname);
for (fcn = RoomHookTable; fcn != NULL; fcn = fcn->next) {
total_retval = total_retval + (*fcn->fcn_ptr) (target_room);
-int PerformXmsgHooks(char *sender, char *recp, char *msg)
+int PerformXmsgHooks(char *sender, char *sender_email, char *recp, char *msg)
{
struct XmsgFunctionHook *fcn;
int total_sent = 0;
if (fcn->order == p) {
total_sent +=
(*fcn->h_function_pointer)
- (sender, recp, msg);
+ (sender, sender_email, recp, msg);
}
}
/* Break out of the loop if a higher-priority function
}
return total_sent;
}
+
+
+/*
+ * Dirty hack until we impliment a hook mechanism for this
+ */
+void CtdlModuleStartCryptoMsgs(char *ok_response, char *nosup_response, char *error_response)
+{
+#ifdef HAVE_OPENSSL
+ CtdlStartTLS (ok_response, nosup_response, error_response);
+#endif
+}