X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=95eab2fc673ceac0d2c6cf8a8d0b238effdedc88;hb=ce5289f43bedd953d1ccede7be18fd5bf39a2648;hp=f9161690ea413a373a3940de56e1eeb731617fb8;hpb=fc53f3605ec13f9d4cb6ce103badf346a553d74b;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index f9161690e..95eab2fc6 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -5,16 +5,15 @@ * */ -#ifdef DLL_EXPORT -#define IN_LIBCIT -#endif - #include "sysdep.h" #include #include #include #include #include +#include +#include + #if TIME_WITH_SYS_TIME # include @@ -29,10 +28,9 @@ #include #include +#include #include #include -#include -/* #include */ #include #include #include @@ -40,14 +38,13 @@ #include #include "citadel.h" #include "server.h" -#include "dynloader.h" +#include "serv_extensions.h" #include "sysdep_decls.h" #include "citserver.h" #include "config.h" #include "database.h" #include "housekeeping.h" #include "user_ops.h" -#include "logging.h" #include "msgbase.h" #include "support.h" #include "locate_host.h" @@ -56,30 +53,42 @@ #include "policy.h" #include "control.h" #include "tools.h" +#include "euidindex.h" #ifndef HAVE_SNPRINTF #include "snprintf.h" #endif struct CitContext *ContextList = NULL; +struct CitContext* next_session = NULL; char *unique_session_numbers; int ScheduledShutdown = 0; int do_defrag = 0; - -/* These are commented out. Why do we need them? They're defined in time.h - * anyway, and declaring them again here makes FreeBSD barf on it. -extern long int timezone; -extern int daylight; - */ +time_t server_startup_time; +char pid_file_name[PATH_MAX]; /* * Various things that need to be initialized at startup */ void master_startup(void) { struct timeval tv; + unsigned int seed; + FILE *urandom; + struct ctdlroom qrbuf; + FILE *pidfile_fp; - lprintf(9, "master_startup() started\n"); - lprintf(7, "Opening databases\n"); + lprintf(CTDL_DEBUG, "master_startup() started\n"); + time(&server_startup_time); + + /* pid file. If we go FSSTND this should end up in 'localstatedir' */ + snprintf(pid_file_name, sizeof pid_file_name, "./citadel.pid"); + pidfile_fp = fopen(pid_file_name, "w"); + if (pidfile_fp != NULL) { + fprintf(pidfile_fp, "%d\n", (int)getpid()); + fclose(pidfile_fp); + } + + lprintf(CTDL_INFO, "Opening databases\n"); open_databases(); if (do_defrag) { @@ -88,233 +97,147 @@ void master_startup(void) { check_ref_counts(); - lprintf(7, "Creating base rooms (if necessary)\n"); - create_room(BASEROOM, 0, "", 0, 1); - create_room(AIDEROOM, 3, "", 0, 1); - create_room(SYSCONFIGROOM, 3, "", 0, 1); - create_room(config.c_twitroom, 0, "", 0, 1); + lprintf(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); - lprintf(7, "Seeding the pseudo-random number generator...\n"); - gettimeofday(&tv, NULL); - srand(tv.tv_usec); - lprintf(9, "master_startup() finished\n"); -} + /* The "Local System Configuration" room doesn't need to be visible */ + if (lgetroom(&qrbuf, SYSCONFIGROOM) == 0) { + qrbuf.QRflags2 |= QR2_SYSTEM; + lputroom(&qrbuf); + } + + /* + * Create a room in which we can deposit "deleted" messages for + * deferred deletion. This will silently fail if the room already + * exists, and that's perfectly ok, because we want it to exist. + */ + create_room(DELETED_MSGS_ROOM, 3, "", 0, 1, 0, VIEW_MAILBOX); + /* + * Make sure it's set to be a "system room" so it doesn't show up + * in the nown rooms list for Aides. Also set the message expire + * policy to "by count, 1 message" so everything gets deleted all + * the time (we can't set it to 0 because that's invalid, so we keep + * a single message around). + */ + if (lgetroom(&qrbuf, DELETED_MSGS_ROOM) == 0) { + qrbuf.QRflags2 |= QR2_SYSTEM; + qrbuf.QRep.expire_mode = EXPIRE_NUMMSGS; + qrbuf.QRep.expire_value = 1; + lputroom(&qrbuf); + } + + lprintf(CTDL_INFO, "Seeding the pseudo-random number generator...\n"); + urandom = fopen("/dev/urandom", "r"); + if (urandom != NULL) { + fread(&seed, sizeof seed, 1, urandom); + fclose(urandom); + } + else { + gettimeofday(&tv, NULL); + seed = tv.tv_usec; + } + srandom(seed); + + lprintf(CTDL_INFO, "Initializing ipgm secret\n"); + get_config(); + config.c_ipgm_secret = rand(); + put_config(); + + lprintf(CTDL_DEBUG, "master_startup() finished\n"); +} /* * Cleanup routine to be called when the server is shutting down. - * WARNING: It's no longer safe to call this function to force a shutdown. - * Instead, set time_to_die = 1. */ -void master_cleanup(void) { +void master_cleanup(int exitcode) { struct CleanupFunctionHook *fcn; + static int already_cleaning_up = 0; + + if (already_cleaning_up) while(1) sleep(1); + already_cleaning_up = 1; /* Run any cleanup routines registered by loadable modules */ for (fcn = CleanupHookTable; fcn != NULL; fcn = fcn->next) { (*fcn->h_function_pointer)(); } + /* Shut down the indexer thread */ + lprintf(CTDL_INFO, "Waiting for the indexer thread to shut down\n"); + pthread_join(indexer_thread_tid, NULL); + + /* Shut down the checkpoint thread */ + lprintf(CTDL_INFO, "Waiting for the checkpoint thread to shut down\n"); + pthread_join(checkpoint_thread_tid, NULL); + /* Close databases */ - lprintf(7, "Closing databases\n"); + lprintf(CTDL_INFO, "Closing databases\n"); close_databases(); /* Do system-dependent stuff */ sysdep_master_cleanup(); - /* Now go away. */ - lprintf(3, "citserver: exiting.\n"); - fflush(stdout); fflush(stderr); - exit(0); -} +#ifdef DEBUG_MEMORY_LEAKS + dump_heap(); +#endif + /* If the operator requested a halt but not an exit, halt here. */ + if (shutdown_and_halt) { + lprintf(CTDL_NOTICE, "citserver: Halting server without exiting.\n"); + fflush(stdout); fflush(stderr); + while(1) { + sleep(32767); + } + } -/* - * Free any per-session data allocated by modules or whatever - */ -void deallocate_user_data(struct CitContext *con) -{ - struct CtdlSessData *ptr; + /* Now go away. */ + lprintf(CTDL_NOTICE, "citserver: Exiting with status %d\n", exitcode); + fflush(stdout); fflush(stderr); - begin_critical_section(S_SESSION_TABLE); - while (con->FirstSessData != NULL) { - lprintf(9, "Deallocating user data symbol %ld\n", - con->FirstSessData->sym_id); - if (con->FirstSessData->sym_data != NULL) - phree(con->FirstSessData->sym_data); - ptr = con->FirstSessData->next; - phree(con->FirstSessData); - con->FirstSessData = ptr; - } - end_critical_section(S_SESSION_TABLE); + unlink(pid_file_name); + exit(exitcode); } - /* - * Terminate a session and remove its context data structure. + * Terminate a session. */ void RemoveContext (struct CitContext *con) { - struct CitContext *ptr = NULL; - struct CitContext *ToFree = NULL; - - lprintf(9, "RemoveContext() called\n"); if (con==NULL) { - lprintf(5, "WARNING: RemoveContext() called with NULL!\n"); - return; - } - - /* Remove the context from the global context list. This needs - * to get done FIRST to avoid concurrency problems. It is *vitally* - * important to keep num_sessions accurate!! - */ - lprintf(7, "Removing context for session %d\n", con->cs_pid); - begin_critical_section(S_SESSION_TABLE); - if (ContextList == con) { - ToFree = ContextList; - ContextList = ContextList->next; - --num_sessions; - } - else { - for (ptr = ContextList; ptr != NULL; ptr = ptr->next) { - if (ptr->next == con) { - ToFree = ptr->next; - ptr->next = ptr->next->next; - --num_sessions; - } - } - } - end_critical_section(S_SESSION_TABLE); - - if (ToFree == NULL) { - lprintf(9, "RemoveContext() found nothing to remove\n"); + lprintf(CTDL_ERR, + "WARNING: RemoveContext() called with NULL!\n"); return; } + lprintf(CTDL_DEBUG, "RemoveContext() session %d\n", con->cs_pid); /* Run any cleanup routines registered by loadable modules. - * Note 1: This must occur *before* deallocate_user_data() because the - * cleanup functions might touch dynamic session data. - * Note 2: We have to "become_session()" because the cleanup functions - * might make references to "CC" assuming it's the right one. + * Note: We have to "become_session()" because the cleanup functions + * might make references to "CC" assuming it's the right one. */ become_session(con); PerformSessionHooks(EVT_STOP); become_session(NULL); /* Now handle all of the administrivia. */ - lprintf(7, "Calling logout(%d)\n", con->cs_pid); + lprintf(CTDL_DEBUG, "Calling logout(%d)\n", con->cs_pid); logout(con); - rec_log(CL_TERMINATE, con->curr_user); - unlink(con->temp); - lprintf(3, "[%3d] Session ended.\n", con->cs_pid); - - - syslog(LOG_NOTICE,"session %d: ended", con->cs_pid); - - /* Deallocate any user-data attached to this session */ - deallocate_user_data(con); + lprintf(CTDL_NOTICE, "[%3d] Session ended.\n", con->cs_pid); /* If the client is still connected, blow 'em away. */ - lprintf(7, "Closing socket %d\n", con->client_socket); + lprintf(CTDL_DEBUG, "Closing socket %d\n", con->client_socket); close(con->client_socket); - /* This is where we used to check for scheduled shutdowns. */ - - /* Free up the memory used by this context */ - phree(con); - - lprintf(7, "Done with RemoveContext()\n"); -} - - - -/* - * Get a dynamic symbol number for per-session user data. - * This API call should be made only ONCE per symbol per citserver run. - */ -int CtdlGetDynamicSymbol() -{ - static unsigned int next_symbol = SYM_MAX; - return ++next_symbol; -} - - - -/* - * Return a pointer to some generic per-session user data. - * (This function returns NULL if the requested symbol is not allocated.) - * - * NOTE: we use critical sections for allocating and de-allocating these, - * but not for locating one. - */ -void *CtdlGetUserData(unsigned long requested_sym) -{ - struct CtdlSessData *ptr; - - for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) - if (ptr->sym_id == requested_sym) - return(ptr->sym_data); - - lprintf(2, "ERROR! CtdlGetUserData(%ld) symbol not allocated\n", - requested_sym); - return NULL; + lprintf(CTDL_DEBUG, "Done with RemoveContext()\n"); } -/* - * Allocate some generic per-session user data. - */ -void CtdlAllocUserData(unsigned long requested_sym, size_t num_bytes) -{ - struct CtdlSessData *ptr; - - lprintf(9, "CtdlAllocUserData(%ld) called\n", requested_sym); - - /* Fail silently if the symbol is already registered. */ - for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) { - if (ptr->sym_id == requested_sym) { - return; - } - } - - /* Grab us some memory! Dem's good eatin' !! */ - ptr = mallok(sizeof(struct CtdlSessData)); - ptr->sym_id = requested_sym; - ptr->sym_data = mallok(num_bytes); - memset(ptr->sym_data, 0, num_bytes); - - begin_critical_section(S_SESSION_TABLE); - ptr->next = CC->FirstSessData; - CC->FirstSessData = ptr; - end_critical_section(S_SESSION_TABLE); - - lprintf(9, "CtdlAllocUserData(%ld) finished\n", requested_sym); -} - - -/* - * Change the size of a buffer allocated with CtdlAllocUserData() - */ -void CtdlReallocUserData(unsigned long requested_sym, size_t num_bytes) -{ - struct CtdlSessData *ptr; - - for (ptr = CC->FirstSessData; ptr != NULL; ptr = ptr->next) { - if (ptr->sym_id == requested_sym) { - ptr->sym_data = reallok(ptr->sym_data, num_bytes); - return; - } - } - - lprintf(2, "CtdlReallocUserData() ERROR: symbol %ld not found!\n", - requested_sym); -} - - - @@ -329,98 +252,144 @@ void cmd_info(void) { cprintf("%s\n", config.c_fqdn); cprintf("%s\n", CITADEL); cprintf("%d\n", REV_LEVEL); - cprintf("%s\n", config.c_bbs_city); + 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 + +#ifdef ENABLE_AUTOLOGIN + cprintf("1\n"); /* "create new user" never works with autologin */ +#else + cprintf("%d\n", config.c_disable_newu); /* otherwise, site defined */ +#endif + + cprintf("%s\n", config.c_default_cal_zone); + cprintf("000\n"); } /* - * returns an asterisk if there are any express messages waiting, + * returns an asterisk if there are any instant messages waiting, * space otherwise. */ char CtdlCheckExpress(void) { if (CC->FirstExpressMessage == NULL) { return(' '); - } + } else { return('*'); - } } +} void cmd_time(void) { time_t tv; + struct tm tmp; tv = time(NULL); - localtime(&tv); + localtime_r(&tv, &tmp); - cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, daylight); -} - -/* - * Check whether two hostnames match. - * "Realname" should be an actual name of a client that is trying to connect; - * "testname" should be the value we are comparing it with. The idea is that we - * want to compare with both the abbreviated and fully-qualified versions of - * "testname;" some people define "localhost" as "localhost.foo.com," etc. - */ -static int hostnames_match(const char *realname, const char *testname) { - struct hostent *he; - int retval = 0; - - if (!strcasecmp(realname, testname)) - return 1; - -#ifdef HAVE_NONREENTRANT_NETDB - begin_critical_section(S_NETDB); -#endif - - if ((he = gethostbyname(testname)) != NULL) - if (!strcasecmp(realname, he->h_name)) - retval = 1; - -#ifdef HAVE_NONREENTRANT_NETDB - end_critical_section(S_NETDB); + /* 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 +} - return retval; - } /* - * check a hostname against the public_clients file + * Check originating host against the public_clients file. This determines + * whether the client is allowed to change the hostname for this session + * (for example, to show the location of the user rather than the location + * of the client). */ -int is_public_client(char *where) +int is_public_client(void) { - char buf[SIZ]; + char buf[1024]; + char addrbuf[1024]; FILE *fp; + int i; + struct stat statbuf; + static time_t pc_timestamp = 0; + static char public_clients[SIZ]; + static char public_clients_file[SIZ]; - lprintf(9, "Checking whether %s is a public client\n", where); + snprintf(public_clients_file, + sizeof public_clients_file, + "%s/public_clients", + ctdl_etc_dir); - if (hostnames_match(where, "localhost")) return(1); - if (hostnames_match(where, config.c_fqdn)) return(1); + /* + * Check the time stamp on the public_clients file. If it's been + * updated since the last time we were here (or if this is the first + * time we've been through the loop), read its contents and learn + * the IP addresses of the listed hosts. + */ + if (stat(public_clients_file, &statbuf) != 0) { + /* No public_clients file exists, so bail out */ + lprintf(CTDL_WARNING, "Warning: '%s' does not exist\n", + public_clients_file); + return(0); + } - fp = fopen("public_clients","r"); - if (fp == NULL) return(0); + if (statbuf.st_mtime > pc_timestamp) { + begin_critical_section(S_PUBLIC_CLIENTS); + lprintf(CTDL_INFO, "Loading %s\n", public_clients_file); - while (fgets(buf, sizeof buf, fp)!=NULL) { - while (isspace((buf[strlen(buf)-1]))) - buf[strlen(buf)-1] = 0; - if (hostnames_match(where,buf)) { - fclose(fp); - return(1); + safestrncpy(public_clients, "127.0.0.1", sizeof public_clients); + if (hostname_to_dotted_quad(addrbuf, config.c_fqdn) == 0) { + strcat(public_clients, "|"); + strcat(public_clients, addrbuf); + } + + fp = fopen(public_clients_file, "r"); + if (fp != NULL) while (fgets(buf, sizeof buf, fp)!=NULL) { + for (i=0; ics_addr); + for (i=0; ics_addr, addrbuf)) { + lprintf(CTDL_DEBUG, "... yes it is.\n"); + return(1); + } } + /* No hits. This is not a public client. */ + lprintf(CTDL_DEBUG, "... no it isn't.\n"); + return(0); +} + /* * the client is identifying itself to the server @@ -430,24 +399,24 @@ void cmd_iden(char *argbuf) int dev_code; int cli_code; int rev_level; - char desc[SIZ]; - char from_host[SIZ]; + 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); + 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(desc,argbuf,3); + 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(from_host,argbuf,4); + if (num_parms(argbuf)>=5) extract_token(from_host, argbuf, 4, '|', sizeof from_host); CC->cs_clientdev = dev_code; CC->cs_clienttyp = cli_code; @@ -457,13 +426,15 @@ void cmd_iden(char *argbuf) if (strlen(from_host) > 0) { if (CC->is_local_socket) do_lookup = 1; - else if (is_public_client(CC->cs_host)) do_lookup = 1; + else if (is_public_client()) do_lookup = 1; } if (do_lookup) { - lprintf(9, "Looking up hostname '%s'\n", from_host); + lprintf(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, &addr); + locate_host(CC->cs_host, sizeof CC->cs_host, + NULL, 0, + &addr); } else { safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host); @@ -471,15 +442,7 @@ void cmd_iden(char *argbuf) } } - lprintf(7, "client %d/%d/%01d.%02d (%s)\n", - dev_code, - cli_code, - (rev_level / 100), - (rev_level % 100), - desc); - - syslog(LOG_NOTICE,"session %d: client %d/%d/%01d.%02d (%s) from %s\n", - CC->cs_pid, + lprintf(CTDL_NOTICE, "Client %d/%d/%01d.%02d (%s) from %s\n", dev_code, cli_code, (rev_level / 100), @@ -496,44 +459,84 @@ void cmd_iden(char *argbuf) void cmd_mesg(char *mname) { FILE *mfp; - char targ[SIZ]; - char buf[SIZ]; + char targ[256]; + char buf[256]; + char buf2[256]; char *dirs[2]; + DIR *dp; + struct dirent *d; - extract(buf,mname,0); + 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; + } - dirs[0]=mallok(64); - dirs[1]=mallok(64); - strcpy(dirs[0],"messages"); - strcpy(dirs[1],"help"); - mesg_locate(targ,sizeof targ,buf,2,(const char **)dirs); - phree(dirs[0]); - phree(dirs[1]); + /* Otherwise, look for the requested file by name. */ + else { + mesg_locate(targ, sizeof targ, buf2, 2, (const char **)dirs); + if (strlen(targ) == 0) { + snprintf(buf2, sizeof buf2, "%s.%d", + buf, CC->cs_clientdev); + mesg_locate(targ, sizeof targ, buf2, 2, + (const char **)dirs); + if (strlen(targ) == 0) { + mesg_locate(targ, sizeof targ, buf, 2, + (const char **)dirs); + } + } + } + free(dirs[0]); + free(dirs[1]); if (strlen(targ)==0) { - cprintf("%d '%s' not found.\n",ERROR,mname); + 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"); + mfp = fopen(targ, "r"); if (mfp==NULL) { cprintf("%d Cannot open '%s': %s\n", - ERROR,targ,strerror(errno)); + ERROR + INTERNAL_ERROR, targ, strerror(errno)); return; - } - cprintf("%d %s\n",LISTING_FOLLOWS,buf); + } + cprintf("%d %s\n", LISTING_FOLLOWS,buf); - while (fgets(buf, (SIZ-1), mfp)!=NULL) { + 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"); - } +} /* @@ -542,44 +545,47 @@ void cmd_mesg(char *mname) void cmd_emsg(char *mname) { FILE *mfp; - char targ[SIZ]; - char buf[SIZ]; + char targ[256]; + char buf[256]; char *dirs[2]; int a; + unbuffer_output(); + if (CtdlAccessCheck(ac_aide)) return; - extract(buf,mname,0); + extract_token(buf, mname, 0, '|', sizeof buf); for (a=0; aquickroom.QRname); - if (viewed->quickroom.QRflags & QR_MAILBOX) { + int ra; + + strcpy(real_room, viewed->room.QRname); + if (viewed->room.QRflags & QR_MAILBOX) { strcpy(real_room, &real_room[11]); } - if (viewed->quickroom.QRflags & QR_PRIVATE) { - if ( (CtdlRoomAccess(&viewed->quickroom, &viewer->usersupp) - & UA_KNOWN) == 0) { + if (viewed->room.QRflags & QR_PRIVATE) { + CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL); + if ( (ra & UA_KNOWN) == 0) { strcpy(real_room, ""); } } @@ -617,14 +625,19 @@ 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); + ERROR + HIGHER_ACCESS_REQUIRED); return(-1); } - if (CC->usersupp.axlevel >= 6) return(0); + 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); + ERROR + HIGHER_ACCESS_REQUIRED); return(-1); } @@ -635,12 +648,6 @@ int CtdlAccessCheck(int required_level) { return(-1); } - if (CC->logged_in) return(0); - if (required_level >= ac_logged_in) { - cprintf("%d Not logged in.\n", ERROR+NOT_LOGGED_IN); - return(-1); - } - /* shhh ... succeed quietly */ return(0); } @@ -659,17 +666,17 @@ void cmd_term(char *cmdbuf) session_num = extract_int(cmdbuf, 0); if (session_num == CC->cs_pid) { - cprintf("%d You can't kill your own session.\n", ERROR); + cprintf("%d You can't kill your own session.\n", ERROR + ILLEGAL_VALUE); return; } - lprintf(9, "Locating session to kill\n"); + lprintf(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->usersupp.usernum == CC->usersupp.usernum) - || (CC->usersupp.axlevel >= 6)) { + if ((ccptr->user.usernum == CC->user.usernum) + || (CC->user.axlevel >= 6)) { allowed = 1; ccptr->kill_me = 1; } @@ -690,7 +697,7 @@ void cmd_term(char *cmdbuf) } } else { - cprintf("%d No such session.\n", ERROR); + cprintf("%d No such session.\n", ERROR + ILLEGAL_VALUE); } } @@ -702,16 +709,16 @@ void cmd_term(char *cmdbuf) * get the paginator prompt */ void cmd_more(void) { - cprintf("%d %s\n",CIT_OK,config.c_moreprompt); - } + cprintf("%d %s\n", CIT_OK, config.c_moreprompt); +} /* * echo */ void cmd_echo(char *etext) { - cprintf("%d %s\n",CIT_OK,etext); - } + cprintf("%d %s\n", CIT_OK, etext); +} @@ -723,18 +730,40 @@ void cmd_ipgm(char *argbuf) int secret; secret = extract_int(argbuf, 0); - if (secret == config.c_ipgm_secret) { + + /* 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); - } + cprintf("%d Authenticated as an internal program.\n", CIT_OK); + } else { - cprintf("%d Authentication failed.\n",ERROR); - lprintf(3, "Warning: ipgm authentication failed.\n"); - } + sleep(5); + cprintf("%d Authentication failed.\n", + ERROR + PASSWORD_REQUIRED); + lprintf(CTDL_ERR, "Warning: ipgm authentication failed.\n"); + CC->kill_me = 1; } + /* Now change the ipgm secret for the next round. + * (Disabled because it breaks concurrent scripts. The fact that + * we no longer accept IPGM over the network should be sufficient + * to prevent brute-force attacks. If you don't agree, uncomment + * this block.) + get_config(); + config.c_ipgm_secret = rand(); + put_config(); + */ +} + /* * Shut down the server @@ -745,7 +774,19 @@ void cmd_down(void) { cprintf("%d Shutting down server. Goodbye.\n", CIT_OK); time_to_die = 1; - } +} + +/* + * 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); + time_to_die = 1; + shutdown_and_halt = 1; +} /* * Schedule or cancel a server shutdown @@ -759,7 +800,7 @@ void cmd_scdn(char *argbuf) new_state = extract_int(argbuf, 0); if ((new_state == 0) || (new_state == 1)) { ScheduledShutdown = new_state; - } + } cprintf("%d %d\n", CIT_OK, ScheduledShutdown); } @@ -803,7 +844,7 @@ void generate_nonce(struct CitContext *con) { */ void begin_session(struct CitContext *con) { - int len; + socklen_t len; struct sockaddr_in sin; /* @@ -819,20 +860,23 @@ void begin_session(struct CitContext *con) strcpy(con->lastcmdname, " "); strcpy(con->cs_clientname, "(unknown)"); strcpy(con->curr_user, NLI); - strcpy(con->net_node,""); + strcpy(con->net_node, ""); strcpy(con->fake_username, ""); strcpy(con->fake_postname, ""); strcpy(con->fake_hostname, ""); strcpy(con->fake_roomname, ""); generate_nonce(con); - snprintf(con->temp, sizeof con->temp, tmpnam(NULL)); 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, &sin.sin_addr); + 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, ""); @@ -840,18 +884,15 @@ void begin_session(struct CitContext *con) con->cs_flags = 0; con->upload_type = UPL_FILE; con->dl_is_net = 0; - con->FirstSessData = NULL; con->nologin = 0; if ((config.c_maxsessions > 0)&&(num_sessions > config.c_maxsessions)) con->nologin = 1; - lprintf(3, "Session started.\n"); + lprintf(CTDL_NOTICE, "Session started.\n"); /* Run any session startup routines registered by loadable modules */ PerformSessionHooks(EVT_START); - - rec_log(CL_CONNECT, ""); } @@ -859,13 +900,13 @@ void citproto_begin_session() { if (CC->nologin==1) { cprintf("%d %s: Too many users are already online " "(maximum is %d)\n", - ERROR+MAX_SESSIONS_EXCEEDED, + ERROR + MAX_SESSIONS_EXCEEDED, config.c_nodename, config.c_maxsessions); - } + } else { - cprintf("%d %s Citadel/UX server ready.\n", + cprintf("%d %s Citadel server ready.\n", CIT_OK, config.c_nodename); - } + } } @@ -879,25 +920,37 @@ void do_command_loop(void) { time(&CC->lastcmd); memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ - if (client_gets(cmdbuf) < 1) { - lprintf(3, "Client socket is broken. Ending session.\n"); + if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { + lprintf(CTDL_ERR, "Client disconnected: ending session.\n"); CC->kill_me = 1; return; } - lprintf(5, "Citadel: %s\n", cmdbuf); + + /* Log the server command, but don't show passwords... */ + if ( (strncasecmp(cmdbuf, "PASS", 4)) + && (strncasecmp(cmdbuf, "SETP", 4)) ) { + lprintf(CTDL_INFO, "%s\n", cmdbuf); + } + else { + lprintf(CTDL_INFO, "\n"); + } + + buffer_output(); /* * Let other clients see the last command we executed, and - * update the idle time, but not NOOP, PEXP, or GEXP. + * update the idle time, but not NOOP, QNOP, PEXP, GEXP, RWHO, or TIME. */ if ( (strncasecmp(cmdbuf, "NOOP", 4)) + && (strncasecmp(cmdbuf, "QNOP", 4)) && (strncasecmp(cmdbuf, "PEXP", 4)) - && (strncasecmp(cmdbuf, "GEXP", 4)) ) { + && (strncasecmp(cmdbuf, "GEXP", 4)) + && (strncasecmp(cmdbuf, "RWHO", 4)) + && (strncasecmp(cmdbuf, "TIME", 4)) ) { strcpy(CC->lastcmdname, " "); - safestrncpy(CC->lastcmdname, cmdbuf, - sizeof(CC->lastcmdname) ); + safestrncpy(CC->lastcmdname, cmdbuf, sizeof(CC->lastcmdname)); time(&CC->lastidle); - } + } if ((strncasecmp(cmdbuf, "ENT0", 4)) && (strncasecmp(cmdbuf, "MESG", 4)) @@ -906,336 +959,375 @@ void do_command_loop(void) { CC->cs_flags &= ~CS_POSTING; } - if (!strncasecmp(cmdbuf,"NOOP",4)) { - cprintf("%d%cok\n",CIT_OK,CtdlCheckExpress()); - } + if (!strncasecmp(cmdbuf, "NOOP", 4)) { + cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() ); + } + + else if (!strncasecmp(cmdbuf, "QNOP", 4)) { + /* do nothing, this command returns no response */ + } else if (!strncasecmp(cmdbuf,"QUIT",4)) { - cprintf("%d Goodbye.\n",CIT_OK); + cprintf("%d Goodbye.\n", CIT_OK); CC->kill_me = 1; - } + } else if (!strncasecmp(cmdbuf,"ASYN",4)) { cmd_asyn(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"LOUT",4)) { if (CC->logged_in) logout(CC); - cprintf("%d logged out.\n",CIT_OK); - } + cprintf("%d logged out.\n", CIT_OK); + } else if (!strncasecmp(cmdbuf,"USER",4)) { cmd_user(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"PASS",4)) { cmd_pass(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"NEWU",4)) { cmd_newu(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"CREU",4)) { cmd_creu(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"SETP",4)) { cmd_setp(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"LRMS",4)) { cmd_lrms(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"LKRA",4)) { cmd_lkra(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"LKRN",4)) { cmd_lkrn(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"LKRO",4)) { cmd_lkro(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"LZRM",4)) { cmd_lzrm(&cmdbuf[5]); - } + } + + else if (!strncasecmp(cmdbuf,"LPRM",4)) { + cmd_lprm(&cmdbuf[5]); + } else if (!strncasecmp(cmdbuf,"GETU",4)) { cmd_getu(); - } + } else if (!strncasecmp(cmdbuf,"SETU",4)) { cmd_setu(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"GOTO",4)) { cmd_goto(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"MSGS",4)) { cmd_msgs(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"WHOK",4)) { cmd_whok(); - } + } else if (!strncasecmp(cmdbuf,"RDIR",4)) { cmd_rdir(); - } + } + + else if (!strncasecmp(cmdbuf,"EUID",4)) { + cmd_euid(&cmdbuf[5]); + } else if (!strncasecmp(cmdbuf,"MSG0",4)) { cmd_msg0(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"MSG2",4)) { cmd_msg2(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"MSG3",4)) { cmd_msg3(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"MSG4",4)) { cmd_msg4(&cmdbuf[5]); - } + } + + else if (!strncasecmp(cmdbuf,"MSGP",4)) { + cmd_msgp(&cmdbuf[5]); + } else if (!strncasecmp(cmdbuf,"OPNA",4)) { cmd_opna(&cmdbuf[5]); - } + } + + else if (!strncasecmp(cmdbuf,"DLAT",4)) { + cmd_dlat(&cmdbuf[5]); + } else if (!strncasecmp(cmdbuf,"INFO",4)) { cmd_info(); - } + } else if (!strncasecmp(cmdbuf,"SLRP",4)) { cmd_slrp(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"INVT",4)) { cmd_invt_kick(&cmdbuf[5],1); - } + } else if (!strncasecmp(cmdbuf,"KICK",4)) { cmd_invt_kick(&cmdbuf[5],0); - } + } else if (!strncasecmp(cmdbuf,"GETR",4)) { cmd_getr(); - } + } else if (!strncasecmp(cmdbuf,"SETR",4)) { cmd_setr(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"GETA",4)) { cmd_geta(); - } + } else if (!strncasecmp(cmdbuf,"SETA",4)) { cmd_seta(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"ENT0",4)) { cmd_ent0(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"RINF",4)) { cmd_rinf(); - } + } else if (!strncasecmp(cmdbuf,"DELE",4)) { cmd_dele(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"KILL",4)) { cmd_kill(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"CRE8",4)) { cmd_cre8(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"MOVE",4)) { cmd_move(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"FORG",4)) { cmd_forg(); - } + } else if (!strncasecmp(cmdbuf,"MESG",4)) { cmd_mesg(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"EMSG",4)) { cmd_emsg(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"GNUR",4)) { cmd_gnur(); - } + } else if (!strncasecmp(cmdbuf,"VALI",4)) { cmd_vali(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"EINF",4)) { cmd_einf(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"LIST",4)) { - cmd_list(); - } + cmd_list(&cmdbuf[5]); + } else if (!strncasecmp(cmdbuf,"CHEK",4)) { cmd_chek(); - } + } else if (!strncasecmp(cmdbuf,"DELF",4)) { cmd_delf(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"MOVF",4)) { cmd_movf(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"NETF",4)) { cmd_netf(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"OPEN",4)) { cmd_open(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"CLOS",4)) { cmd_clos(); - } + } else if (!strncasecmp(cmdbuf,"UOPN",4)) { cmd_uopn(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"UCLS",4)) { cmd_ucls(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"READ",4)) { cmd_read(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"WRIT",4)) { cmd_writ(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"QUSR",4)) { cmd_qusr(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"ECHO",4)) { cmd_echo(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"OIMG",4)) { cmd_oimg(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"MORE",4)) { cmd_more(); - } + } else if (!strncasecmp(cmdbuf,"NDOP",4)) { cmd_ndop(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"NUOP",4)) { cmd_nuop(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"LFLR",4)) { cmd_lflr(); - } + } else if (!strncasecmp(cmdbuf,"CFLR",4)) { cmd_cflr(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"KFLR",4)) { cmd_kflr(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"EFLR",4)) { cmd_eflr(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"IDEN",4)) { cmd_iden(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"IPGM",4)) { cmd_ipgm(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"TERM",4)) { cmd_term(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf,"DOWN",4)) { cmd_down(); - } + } + + else if (!strncasecmp(cmdbuf,"HALT",4)) { + cmd_halt(); + } else if (!strncasecmp(cmdbuf,"SCDN",4)) { cmd_scdn(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf, "UIMG", 4)) { cmd_uimg(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf, "TIME", 4)) { cmd_time(); - } + } else if (!strncasecmp(cmdbuf, "AGUP", 4)) { cmd_agup(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf, "ASUP", 4)) { cmd_asup(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf, "GPEX", 4)) { cmd_gpex(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf, "SPEX", 4)) { cmd_spex(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf, "CONF", 4)) { cmd_conf(&cmdbuf[5]); - } + } else if (!strncasecmp(cmdbuf, "SEEN", 4)) { cmd_seen(&cmdbuf[5]); - } + } -#ifdef DEBUG_MEMORY_LEAKS - else if (!strncasecmp(cmdbuf, "LEAK", 4)) { - dump_tracked(); - } -#endif + else if (!strncasecmp(cmdbuf, "GTSN", 4)) { + cmd_gtsn(&cmdbuf[5]); + } + + else if (!strncasecmp(cmdbuf, "VIEW", 4)) { + cmd_view(&cmdbuf[5]); + } + + else if (!strncasecmp(cmdbuf, "ISME", 4)) { + cmd_isme(&cmdbuf[5]); + } - else if (!DLoader_Exec_Cmd(cmdbuf)) - { - cprintf("%d Unrecognized or unsupported command.\n", - ERROR); - } + else if (!DLoader_Exec_Cmd(cmdbuf)) { + cprintf("%d Unrecognized or unsupported command.\n", + ERROR + CMD_NOT_SUPPORTED); + } - /* Run any after-each-command outines registered by modules */ + unbuffer_output(); + + /* Run any after-each-command routines registered by modules */ PerformSessionHooks(EVT_CMD); } + + +/* + * This loop performs all asynchronous functions. + */ +void do_async_loop(void) { + PerformSessionHooks(EVT_ASYNC); +}