X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=4a1070b23563876a03ca5b84c10951497888665f;hb=88c52d18e496b38205b30eff94c14eef59558f51;hp=d4bb9cc66969f76fc30b9357f1d4768a257d44e5;hpb=479282938ffe1a1b975643837655995cf7f058f8;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index d4bb9cc66..4a1070b23 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,81 +1,41 @@ /* - * $Id$ - * * Main source module for the Citadel server * + * Copyright (c) 1987-2014 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 -#include #include -#include -#include -#include -#include - - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - +#include "sysdep.h" +#include #if HAVE_BACKTRACE #include #endif - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include "citadel.h" -#include "server.h" -#include "sysdep_decls.h" -#include "threads.h" -#include "citserver.h" -#include "config.h" -#include "database.h" + +#include "ctdl_module.h" #include "housekeeping.h" -#include "user_ops.h" -#include "msgbase.h" -#include "support.h" #include "locate_host.h" -#include "room_ops.h" -#include "file_ops.h" -#include "policy.h" +#include "citserver.h" +#include "user_ops.h" #include "control.h" -#include "euidindex.h" -#include "svn_revision.h" - -#ifndef HAVE_SNPRINTF -#include "snprintf.h" -#endif - -#include "ctdl_module.h" - +#include "config.h" -struct CitContext *ContextList = NULL; -struct CitContext* next_session = NULL; char *unique_session_numbers; int ScheduledShutdown = 0; time_t server_startup_time; int panic_fd; +int openid_level_supported = 0; -/** - * \brief print the actual stack frame. +/* + * print the actual stack frame. */ void cit_backtrace(void) { @@ -84,21 +44,48 @@ void cit_backtrace(void) size_t size, i; char **strings; - + const char *p = IOSTR; + if (p == NULL) p = ""; size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*)); strings = backtrace_symbols(stack_frames, size); for (i = 0; i < size; i++) { if (strings != NULL) - CtdlLogPrintf(1, "%s\n", strings[i]); + syslog(LOG_ALERT, "%s %s\n", p, strings[i]); else - CtdlLogPrintf(1, "%p\n", stack_frames[i]); + syslog(LOG_ALERT, "%s %p\n", p, stack_frames[i]); } free(strings); #endif } -/** - * \brief print the actual stack frame. +void cit_oneline_backtrace(void) +{ +#ifdef HAVE_BACKTRACE + void *stack_frames[50]; + size_t size, i; + char **strings; + StrBuf *Buf; + + size = backtrace(stack_frames, sizeof(stack_frames) / sizeof(void*)); + strings = backtrace_symbols(stack_frames, size); + if (size > 0) + { + Buf = NewStrBuf(); + for (i = 1; i < size; i++) { + if (strings != NULL) + StrBufAppendPrintf(Buf, "%s : ", strings[i]); + else + StrBufAppendPrintf(Buf, "%p : ", stack_frames[i]); + } + free(strings); + syslog(LOG_ALERT, "%s %s\n", IOSTR, ChrPtr(Buf)); + FreeStrBuf(&Buf); + } +#endif +} + +/* + * print the actual stack frame. */ void cit_panic_backtrace(int SigNum) { @@ -112,9 +99,9 @@ void cit_panic_backtrace(int SigNum) strings = backtrace_symbols(stack_frames, size); for (i = 0; i < size; i++) { if (strings != NULL) - CtdlLogPrintf(1, "%s\n", strings[i]); + syslog(LOG_ALERT, "%s\n", strings[i]); else - CtdlLogPrintf(1, "%p\n", stack_frames[i]); + syslog(LOG_ALERT, "%p\n", stack_frames[i]); } free(strings); #endif @@ -129,41 +116,55 @@ void master_startup(void) { unsigned int seed; FILE *urandom; struct ctdlroom qrbuf; + int rv; + struct passwd *pw; + gid_t gid; - CtdlLogPrintf(CTDL_DEBUG, "master_startup() started\n"); + syslog(LOG_DEBUG, "master_startup() started\n"); time(&server_startup_time); + get_config(); + validate_config(); - CtdlLogPrintf(CTDL_INFO, "Opening databases\n"); - open_databases(); + syslog(LOG_INFO, "Checking directory access"); + if ((pw = getpwuid(CTDLUID)) == NULL) { + gid = getgid(); + } else { + gid = pw->pw_gid; + } - ctdl_thread_internal_init_tsd(); - - CtdlThreadAllocTSD(); - + if (create_run_directories(CTDLUID, gid) != 0) { + syslog(LOG_EMERG, "failed to access & create directories"); + exit(1); + } + syslog(LOG_INFO, "Opening databases"); + open_databases(); check_ref_counts(); - CtdlLogPrintf(CTDL_INFO, "Creating base rooms (if necessary)\n"); - create_room(config.c_baseroom, 0, "", 0, 1, 0, VIEW_BBS); - create_room(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); - create_room(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); - create_room(config.c_twitroom, 0, "", 0, 1, 0, VIEW_BBS); + syslog(LOG_INFO, "Creating base rooms (if necessary)\n"); + CtdlCreateRoom(config.c_baseroom, 0, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(AIDEROOM, 3, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(SYSCONFIGROOM, 3, "", 0, 1, 0, VIEW_BBS); + CtdlCreateRoom(config.c_twitroom, 0, "", 0, 1, 0, VIEW_BBS); /* The "Local System Configuration" room doesn't need to be visible */ - if (lgetroom(&qrbuf, SYSCONFIGROOM) == 0) { + if (CtdlGetRoomLock(&qrbuf, SYSCONFIGROOM) == 0) { qrbuf.QRflags2 |= QR2_SYSTEM; - lputroom(&qrbuf); + CtdlPutRoomLock(&qrbuf); } /* Aide needs to be public postable, else we're not RFC conformant. */ - if (lgetroom(&qrbuf, AIDEROOM) == 0) { + if (CtdlGetRoomLock(&qrbuf, AIDEROOM) == 0) { qrbuf.QRflags2 |= QR2_SMTP_PUBLIC; - lputroom(&qrbuf); + CtdlPutRoomLock(&qrbuf); } - CtdlLogPrintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n"); + syslog(LOG_INFO, "Seeding the pseudo-random number generator...\n"); urandom = fopen("/dev/urandom", "r"); if (urandom != NULL) { - fread(&seed, sizeof seed, 1, urandom); + rv = fread(&seed, sizeof seed, 1, urandom); + if (rv == -1) + syslog(LOG_EMERG, "failed to read random seed: %s\n", + strerror(errno)); fclose(urandom); } else { @@ -173,12 +174,9 @@ void master_startup(void) { srand(seed); srandom(seed); - CtdlLogPrintf(CTDL_INFO, "Initializing ipgm secret\n"); - get_config(); - config.c_ipgm_secret = rand(); put_config(); - CtdlLogPrintf(CTDL_DEBUG, "master_startup() finished\n"); + syslog(LOG_DEBUG, "master_startup() finished\n"); } @@ -189,7 +187,7 @@ void master_cleanup(int exitcode) { struct CleanupFunctionHook *fcn; static int already_cleaning_up = 0; - if (already_cleaning_up) while(1) sleep(1); + if (already_cleaning_up) while(1) usleep(1000000); already_cleaning_up = 1; /* Run any cleanup routines registered by loadable modules */ @@ -204,16 +202,12 @@ void master_cleanup(int exitcode) { sysdep_master_cleanup(); /* Close databases */ - CtdlLogPrintf(CTDL_INFO, "Closing databases\n"); + syslog(LOG_INFO, "Closing databases\n"); close_databases(); -#ifdef DEBUG_MEMORY_LEAKS - dump_heap(); -#endif - /* If the operator requested a halt but not an exit, halt here. */ if (shutdown_and_halt) { - CtdlLogPrintf(CTDL_NOTICE, "citserver: Halting server without exiting.\n"); + syslog(LOG_NOTICE, "citserver: Halting server without exiting.\n"); fflush(stdout); fflush(stderr); while(1) { sleep(32767); @@ -223,113 +217,18 @@ void master_cleanup(int exitcode) { release_control(); /* Now go away. */ - CtdlLogPrintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode); + syslog(LOG_NOTICE, "citserver: Exiting with status %d\n", exitcode); fflush(stdout); fflush(stderr); if (restart_server != 0) exit(1); - if ((running_as_daemon != 0) && (exitcode == 0)) + if ((running_as_daemon != 0) && ((exitcode == 0) )) exitcode = CTDLEXIT_SHUTDOWN; exit(exitcode); } -/* - * Terminate a session. - */ -void RemoveContext (struct CitContext *con) -{ - if (con==NULL) { - CtdlLogPrintf(CTDL_ERR, - "WARNING: RemoveContext() called with NULL!\n"); - return; - } - CtdlLogPrintf(CTDL_DEBUG, "RemoveContext() session %d\n", con->cs_pid); - - /* Run any cleanup routines registered by loadable modules. - * Note: We have to "become_session()" because the cleanup functions - * might make references to "CC" assuming it's the right one. - */ - become_session(con); - logout(); - PerformSessionHooks(EVT_STOP); - become_session(NULL); - - CtdlLogPrintf(CTDL_NOTICE, "[%3d] Session ended.\n", con->cs_pid); - - /* If the client is still connected, blow 'em away. */ - CtdlLogPrintf(CTDL_DEBUG, "Closing socket %d\n", con->client_socket); - close(con->client_socket); - - /* If using AUTHMODE_LDAP, free the DN */ - if (con->ldap_dn) { - free(con->ldap_dn); - con->ldap_dn = NULL; - } - - CtdlLogPrintf(CTDL_DEBUG, "Done with RemoveContext()\n"); -} - - - - - -/* - * cmd_info() - tell the client about this server - */ -void cmd_info(char *cmdbuf) { - cprintf("%d Server info:\n", LISTING_FOLLOWS); - cprintf("%d\n", CC->cs_pid); - cprintf("%s\n", config.c_nodename); - cprintf("%s\n", config.c_humannode); - cprintf("%s\n", config.c_fqdn); - cprintf("%s\n", CITADEL); - cprintf("%d\n", REV_LEVEL); - cprintf("%s\n", config.c_site_location); - cprintf("%s\n", config.c_sysadm); - cprintf("%d\n", SERVER_TYPE); - cprintf("%s\n", config.c_moreprompt); - cprintf("1\n"); /* 1 = yes, this system supports floors */ - cprintf("1\n"); /* 1 = we support the extended paging options */ - cprintf("%s\n", CC->cs_nonce); - cprintf("1\n"); /* 1 = yes, this system supports the QNOP command */ - -#ifdef HAVE_LDAP - cprintf("1\n"); /* 1 = yes, this server is LDAP-enabled */ -#else - cprintf("0\n"); /* 1 = no, this server is not LDAP-enabled */ -#endif - - if (config.c_auth_mode == AUTHMODE_NATIVE) { - cprintf("%d\n", config.c_disable_newu); - } - else { - cprintf("1\n"); /* "create new user" does not work with non-native auth modes */ - } - - cprintf("%s\n", config.c_default_cal_zone); - - /* Output load averages */ - cprintf("%f\n", CtdlThreadLoadAvg); - cprintf("%f\n", CtdlThreadWorkerAvg); - cprintf("%d\n", CtdlThreadGetCount()); - - cprintf("1\n"); /* yes, Sieve mail filtering is supported */ - cprintf("%d\n", config.c_enable_fulltext); - cprintf("%s\n", svn_revision()); - - if (config.c_auth_mode == AUTHMODE_NATIVE) { - cprintf("1\n"); /* OpenID is enabled when using native auth */ - } - else { - cprintf("0\n"); /* OpenID is disabled when using non-native auth */ - } - - cprintf("000\n"); -} - - /* * returns an asterisk if there are any instant messages waiting, * space otherwise. @@ -343,22 +242,6 @@ char CtdlCheckExpress(void) { } } -void cmd_time(void) -{ - time_t tv; - struct tm tmp; - - tv = time(NULL); - localtime_r(&tv, &tmp); - - /* timezone and daylight global variables are not portable. */ -#ifdef HAVE_STRUCT_TM_TM_GMTOFF - cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst); -#else - cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst); -#endif -} - /* * Check originating host against the public_clients file. This determines @@ -366,7 +249,7 @@ void cmd_time(void) * (for example, to show the location of the user rather than the location * of the client). */ -int is_public_client(void) +int CtdlIsPublicClient(void) { char buf[1024]; char addrbuf[1024]; @@ -382,10 +265,7 @@ int is_public_client(void) #define LOCALHOSTSTR "127.0.0.1" - snprintf(public_clients_file, - sizeof public_clients_file, - "%s/public_clients", - ctdl_etc_dir); + snprintf(public_clients_file, sizeof public_clients_file, "%s/public_clients", ctdl_etc_dir); /* * Check the time stamp on the public_clients file. If it's been @@ -395,14 +275,14 @@ int is_public_client(void) */ if (stat(public_clients_file, &statbuf) != 0) { /* No public_clients file exists, so bail out */ - CtdlLogPrintf(CTDL_WARNING, "Warning: '%s' does not exist\n", + syslog(LOG_WARNING, "Warning: '%s' does not exist\n", public_clients_file); return(0); } if (statbuf.st_mtime > pc_timestamp) { begin_critical_section(S_PUBLIC_CLIENTS); - CtdlLogPrintf(CTDL_INFO, "Loading %s\n", public_clients_file); + syslog(LOG_INFO, "Loading %s\n", public_clients_file); public_clientspos = &public_clients[0]; public_clientsend = public_clientspos + SIZ; @@ -443,561 +323,28 @@ int is_public_client(void) } } } - fclose(fp); + if (fp != NULL) fclose(fp); pc_timestamp = time(NULL); end_critical_section(S_PUBLIC_CLIENTS); } - CtdlLogPrintf(CTDL_DEBUG, "Checking whether %s is a local or public client\n", + syslog(LOG_DEBUG, "Checking whether %s is a local or public client\n", CC->cs_addr); for (i=0; ics_addr, addrbuf)) { - CtdlLogPrintf(CTDL_DEBUG, "... yes it is.\n"); + syslog(LOG_DEBUG, "... yes its local.\n"); return(1); } } /* No hits. This is not a public client. */ - CtdlLogPrintf(CTDL_DEBUG, "... no it isn't.\n"); - return(0); -} - - -/* - * the client is identifying itself to the server - */ -void cmd_iden(char *argbuf) -{ - int dev_code; - int cli_code; - int rev_level; - char desc[128]; - char from_host[128]; - struct in_addr addr; - int do_lookup = 0; - - if (num_parms(argbuf)<4) { - cprintf("%d usage error\n", ERROR + ILLEGAL_VALUE); - return; - } - - dev_code = extract_int(argbuf,0); - cli_code = extract_int(argbuf,1); - rev_level = extract_int(argbuf,2); - extract_token(desc, argbuf, 3, '|', sizeof desc); - - safestrncpy(from_host, config.c_fqdn, sizeof from_host); - from_host[sizeof from_host - 1] = 0; - if (num_parms(argbuf)>=5) extract_token(from_host, argbuf, 4, '|', sizeof from_host); - - CC->cs_clientdev = dev_code; - CC->cs_clienttyp = cli_code; - CC->cs_clientver = rev_level; - safestrncpy(CC->cs_clientname, desc, sizeof CC->cs_clientname); - CC->cs_clientname[31] = 0; - - if (!IsEmptyStr(from_host)) { - if (CC->is_local_socket) do_lookup = 1; - else if (is_public_client()) do_lookup = 1; - } - - if (do_lookup) { - CtdlLogPrintf(CTDL_DEBUG, "Looking up hostname '%s'\n", from_host); - if ((addr.s_addr = inet_addr(from_host)) != -1) { - locate_host(CC->cs_host, sizeof CC->cs_host, - CC->cs_addr, sizeof CC->cs_addr, - &addr); - } - else { - safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host); - CC->cs_host[sizeof CC->cs_host - 1] = 0; - } - } - - CtdlLogPrintf(CTDL_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n", - dev_code, - cli_code, - (rev_level / 100), - (rev_level % 100), - desc, - CC->cs_host); - cprintf("%d Ok\n",CIT_OK); -} - - -/* - * display system messages or help - */ -void cmd_mesg(char *mname) -{ - FILE *mfp; - char targ[256]; - char buf[256]; - char buf2[256]; - char *dirs[2]; - DIR *dp; - struct dirent *d; - - extract_token(buf, mname, 0, '|', sizeof buf); - - dirs[0] = strdup(ctdl_message_dir); - dirs[1] = strdup(ctdl_hlp_dir); - - snprintf(buf2, sizeof buf2, "%s.%d.%d", - buf, CC->cs_clientdev, CC->cs_clienttyp); - - /* If the client requested "?" then produce a listing */ - if (!strcmp(buf, "?")) { - cprintf("%d %s\n", LISTING_FOLLOWS, buf); - dp = opendir(dirs[1]); - if (dp != NULL) { - while (d = readdir(dp), d != NULL) { - if (d->d_name[0] != '.') { - cprintf(" %s\n", d->d_name); - } - } - closedir(dp); - } - cprintf("000\n"); - free(dirs[0]); - free(dirs[1]); - return; - } - - /* Otherwise, look for the requested file by name. */ - else { - mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs); - if (IsEmptyStr(targ)) { - snprintf(buf2, sizeof buf2, "%s.%d", - buf, CC->cs_clientdev); - mesg_locate(targ, sizeof targ, buf2, 2, - (const char **)dirs); - if (IsEmptyStr(targ)) { - mesg_locate(targ, sizeof targ, buf, 2, - (const char **)dirs); - } - } - } - - free(dirs[0]); - free(dirs[1]); - - if (IsEmptyStr(targ)) { - cprintf("%d '%s' not found. (Searching in %s and %s)\n", - ERROR + FILE_NOT_FOUND, - mname, - ctdl_message_dir, - ctdl_hlp_dir - ); - return; - } - - mfp = fopen(targ, "r"); - if (mfp==NULL) { - cprintf("%d Cannot open '%s': %s\n", - ERROR + INTERNAL_ERROR, targ, strerror(errno)); - return; - } - cprintf("%d %s\n", LISTING_FOLLOWS,buf); - - while (fgets(buf, (sizeof buf - 1), mfp) != NULL) { - buf[strlen(buf)-1] = 0; - do_help_subst(buf); - cprintf("%s\n",buf); - } - - fclose(mfp); - cprintf("000\n"); -} - - -/* - * enter system messages or help - */ -void cmd_emsg(char *mname) -{ - FILE *mfp; - char targ[256]; - char buf[256]; - char *dirs[2]; - int a; - - unbuffer_output(); - - if (CtdlAccessCheck(ac_aide)) return; - - extract_token(buf, mname, 0, '|', sizeof buf); - for (a=0; !IsEmptyStr(&buf[a]); ++a) { /* security measure */ - if (buf[a] == '/') buf[a] = '.'; - } - - dirs[0] = strdup(ctdl_message_dir); - dirs[1] = strdup(ctdl_hlp_dir); - - mesg_locate(targ, sizeof targ, buf, 2, (const char**)dirs); - free(dirs[0]); - free(dirs[1]); - - if (IsEmptyStr(targ)) { - snprintf(targ, sizeof targ, - "%s/%s", - ctdl_hlp_dir, buf); - } - - mfp = fopen(targ,"w"); - if (mfp==NULL) { - cprintf("%d Cannot open '%s': %s\n", - ERROR + INTERNAL_ERROR, targ, strerror(errno)); - return; - } - cprintf("%d %s\n", SEND_LISTING, targ); - - while (client_getln(buf, sizeof buf) >=0 && strcmp(buf, "000")) { - fprintf(mfp, "%s\n", buf); - } - - fclose(mfp); -} - - -/* Don't show the names of private rooms unless the viewing - * user also knows the rooms. - */ -void GenerateRoomDisplay(char *real_room, - struct CitContext *viewed, - struct CitContext *viewer) { - - int ra; - - strcpy(real_room, viewed->room.QRname); - if (viewed->room.QRflags & QR_MAILBOX) { - strcpy(real_room, &real_room[11]); - } - if (viewed->room.QRflags & QR_PRIVATE) { - CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL); - if ( (ra & UA_KNOWN) == 0) { - strcpy(real_room, ""); - } - } - - if (viewed->cs_flags & CS_CHAT) { - while (strlen(real_room) < 14) { - strcat(real_room, " "); - } - strcpy(&real_room[14], ""); - } - -} - -/* - * Convenience function. - */ -int CtdlAccessCheck(int required_level) { - - if (CC->internal_pgm) return(0); - if (required_level >= ac_internal) { - cprintf("%d This is not a user-level command.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return(-1); - } - - if ((required_level >= ac_logged_in) && (CC->logged_in == 0)) { - cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); - return(-1); - } - - if (CC->user.axlevel >= 6) return(0); - if (required_level >= ac_aide) { - cprintf("%d This command requires Aide access.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return(-1); - } - - if (is_room_aide()) return(0); - if (required_level >= ac_room_aide) { - cprintf("%d This command requires Aide or Room Aide access.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return(-1); - } - - /* shhh ... succeed quietly */ + syslog(LOG_DEBUG, "... no it isn't.\n"); return(0); } -/* - * Terminate another running session - */ -void cmd_term(char *cmdbuf) -{ - int session_num; - struct CitContext *ccptr; - int found_it = 0; - int allowed = 0; - - session_num = extract_int(cmdbuf, 0); - if (session_num == CC->cs_pid) { - cprintf("%d You can't kill your own session.\n", ERROR + ILLEGAL_VALUE); - return; - } - - CtdlLogPrintf(CTDL_DEBUG, "Locating session to kill\n"); - begin_critical_section(S_SESSION_TABLE); - for (ccptr = ContextList; ccptr != NULL; ccptr = ccptr->next) { - if (session_num == ccptr->cs_pid) { - found_it = 1; - if ((ccptr->user.usernum == CC->user.usernum) - || (CC->user.axlevel >= 6)) { - allowed = 1; - ccptr->kill_me = 1; - } - else { - allowed = 0; - } - } - } - end_critical_section(S_SESSION_TABLE); - - if (found_it) { - if (allowed) { - cprintf("%d Session terminated.\n", CIT_OK); - } - else { - cprintf("%d You are not allowed to do that.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - } - } - else { - cprintf("%d No such session.\n", ERROR + ILLEGAL_VALUE); - } -} - - - - - -/* - * get the paginator prompt - */ -void cmd_more(void) { - cprintf("%d %s\n", CIT_OK, config.c_moreprompt); -} - -/* - * echo - */ -void cmd_echo(char *etext) -{ - cprintf("%d %s\n", CIT_OK, etext); -} - - - -/* - * identify as internal program - */ -void cmd_ipgm(char *argbuf) -{ - int secret; - - secret = extract_int(argbuf, 0); - - /* For security reasons, we do NOT allow this command to run - * over the network. Local sockets only. - */ - if (!CC->is_local_socket) { - sleep(5); - cprintf("%d Authentication failed.\n", - ERROR + PASSWORD_REQUIRED); - } - else if (secret == config.c_ipgm_secret) { - CC->internal_pgm = 1; - strcpy(CC->curr_user, ""); - CC->cs_flags = CC->cs_flags|CS_STEALTH; - cprintf("%d Authenticated as an internal program.\n", CIT_OK); - } - else { - sleep(5); - cprintf("%d Authentication failed.\n", - ERROR + PASSWORD_REQUIRED); - CtdlLogPrintf(CTDL_ERR, "Warning: ipgm authentication failed.\n"); - CC->kill_me = 1; - } -} - - -/* - * Shut down the server - */ -void cmd_down(char *argbuf) { - char *Reply ="%d Shutting down server. Goodbye.\n"; - - if (CtdlAccessCheck(ac_aide)) return; - - if (!IsEmptyStr(argbuf)) - { - int state = CIT_OK; - restart_server = extract_int(argbuf, 0); - - if (restart_server > 0) - { - Reply = "%d citserver will now shut down and automatically restart.\n"; - } - if ((restart_server > 0) && !running_as_daemon) - { - CtdlLogPrintf(CTDL_ERR, "The user requested restart, but not running as daemon! Geronimooooooo!\n"); - Reply = "%d Warning: citserver is not running in daemon mode and is therefore unlikely to restart automatically.\n"; - state = ERROR; - } - cprintf(Reply, state); - } - else - { - cprintf(Reply, CIT_OK + SERVER_SHUTTING_DOWN); - } - CtdlThreadStopAll(); -} - -/* - * Halt the server without exiting the server process. - */ -void cmd_halt(void) { - - if (CtdlAccessCheck(ac_aide)) return; - - cprintf("%d Halting server. Goodbye.\n", CIT_OK); - CtdlThreadStopAll(); - shutdown_and_halt = 1; -} - -/* - * Schedule or cancel a server shutdown - */ -void cmd_scdn(char *argbuf) -{ - int new_state; - int state = CIT_OK; - char *Reply = "%d %d\n"; - - if (CtdlAccessCheck(ac_aide)) return; - - new_state = extract_int(argbuf, 0); - if ((new_state == 2) || (new_state == 3)) - { - restart_server = 1; - if (!running_as_daemon) - { - CtdlLogPrintf(CTDL_ERR, "The user requested restart, but not running as deamon! Geronimooooooo!\n"); - Reply = "%d %d Warning, not running in deamon mode. maybe we will come up again, but don't lean on it.\n"; - state = ERROR; - } - - restart_server = extract_int(argbuf, 0); - new_state -= 2; - } - if ((new_state == 0) || (new_state == 1)) { - ScheduledShutdown = new_state; - } - cprintf(Reply, state, ScheduledShutdown); -} - - -/* - * Set or unset asynchronous protocol mode - */ -void cmd_asyn(char *argbuf) -{ - int new_state; - - new_state = extract_int(argbuf, 0); - if ((new_state == 0) || (new_state == 1)) { - CC->is_async = new_state; - } - cprintf("%d %d\n", CIT_OK, CC->is_async); -} - - -/* - * Generate a "nonce" for APOP-style authentication. - * - * RFC 1725 et al specify a PID to be placed in front of the nonce. - * Quoth BTX: That would be stupid. - */ -void generate_nonce(struct CitContext *con) { - struct timeval tv; - - memset(con->cs_nonce, NONCE_SIZE, 0); - gettimeofday(&tv, NULL); - memset(con->cs_nonce, NONCE_SIZE, 0); - snprintf(con->cs_nonce, NONCE_SIZE, "<%d%ld@%s>", - rand(), (long)tv.tv_usec, config.c_fqdn); -} - - - - -/* - * Back-end function for starting a session - */ -void begin_session(struct CitContext *con) -{ - socklen_t len; - struct sockaddr_in sin; - - /* - * Initialize some variables specific to our context. - */ - con->logged_in = 0; - con->internal_pgm = 0; - con->download_fp = NULL; - con->upload_fp = NULL; - con->FirstExpressMessage = NULL; - time(&con->lastcmd); - time(&con->lastidle); - strcpy(con->lastcmdname, " "); - strcpy(con->cs_clientname, "(unknown)"); - strcpy(con->curr_user, NLI); - *con->net_node = '\0'; - *con->fake_username = '\0'; - *con->fake_hostname = '\0'; - *con->fake_roomname = '\0'; - generate_nonce(con); - safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host); - safestrncpy(con->cs_addr, "", sizeof con->cs_addr); - con->cs_host[sizeof con->cs_host - 1] = 0; - len = sizeof sin; - if (!CC->is_local_socket) { - if (!getpeername(con->client_socket, (struct sockaddr *) &sin, &len)) { - locate_host(con->cs_host, sizeof con->cs_host, - con->cs_addr, sizeof con->cs_addr, - &sin.sin_addr - ); - } - } - else { - strcpy(con->cs_host, ""); - } - con->cs_flags = 0; - con->upload_type = UPL_FILE; - con->dl_is_net = 0; - - con->nologin = 0; - if (((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) || CtdlWantSingleUser()) { - con->nologin = 1; - } - - if (!CC->is_local_socket) { - CtdlLogPrintf(CTDL_NOTICE, "Session started from %s [%s].\n", con->cs_host, con->cs_addr); - } - else { - CtdlLogPrintf(CTDL_NOTICE, "Session started via local socket.\n"); - } - - /* Run any session startup routines registered by loadable modules */ - PerformSessionHooks(EVT_START); -} void citproto_begin_session() { @@ -1006,15 +353,21 @@ void citproto_begin_session() { ERROR + MAX_SESSIONS_EXCEEDED, config.c_nodename, config.c_maxsessions ); - CC->kill_me = 1; + CC->kill_me = KILLME_MAX_SESSIONS_EXCEEDED; } else { - cprintf("%d %s Citadel server ready.\n", - CIT_OK, config.c_nodename); + cprintf("%d %s Citadel server ready.\n", CIT_OK, config.c_nodename); + CC->can_receive_im = 1; } } +void citproto_begin_admin_session() { + CC->internal_pgm = 1; + cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, config.c_nodename); +} + + /* @@ -1022,26 +375,25 @@ void citproto_begin_session() { */ void do_command_loop(void) { char cmdbuf[SIZ]; - const char *old_name = NULL; - - old_name = CtdlThreadName("do_command_loop"); time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - CtdlLogPrintf(CTDL_ERR, "Client disconnected: ending session.\n"); - CC->kill_me = 1; - CtdlThreadName(old_name); + syslog(LOG_ERR, "Citadel client disconnected: ending session.\n"); + CC->kill_me = KILLME_CLIENT_DISCONNECTED; return; } /* Log the server command, but don't show passwords... */ - if ( (strncasecmp(cmdbuf, "PASS", 4)) - && (strncasecmp(cmdbuf, "SETP", 4)) ) { - CtdlLogPrintf(CTDL_INFO, "%s\n", cmdbuf); + if ( (strncasecmp(cmdbuf, "PASS", 4)) && (strncasecmp(cmdbuf, "SETP", 4)) ) { + syslog(LOG_INFO, "[%d][%s(%ld)] %s", + CC->cs_pid, CC->curr_user, CC->user.usernum, cmdbuf + ); } else { - CtdlLogPrintf(CTDL_INFO, "\n"); + syslog(LOG_INFO, "[%d][%s(%ld)]