X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=f389ac9f020b303551e62769d12c4d9135ea9b6c;hb=e6499f44a49d449e41ba605a0c7476019da432b4;hp=666c9cb52aa783a772dce1fd67bc514db8f78bc4;hpb=8a4f888793f8b3e76b6647810ed0a3f79e3532c1;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index 666c9cb52..f389ac9f0 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,7 +1,7 @@ /* * Main source module for the Citadel server * - * Copyright (c) 1987-2011 by the citadel.org team + * Copyright (c) 1987-2015 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. @@ -12,58 +12,21 @@ * 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 "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 "citserver.h" +#include "user_ops.h" #include "control.h" -#include "euidindex.h" -#include "context.h" -#include "svn_revision.h" -#include "ctdl_module.h" +#include "config.h" char *unique_session_numbers; int ScheduledShutdown = 0; @@ -81,14 +44,15 @@ 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) - syslog(LOG_ALERT, "%s\n", strings[i]); + syslog(LOG_ALERT, "%s %s\n", p, strings[i]); else - syslog(LOG_ALERT, "%p\n", stack_frames[i]); + syslog(LOG_ALERT, "%s %p\n", p, stack_frames[i]); } free(strings); #endif @@ -114,7 +78,7 @@ void cit_oneline_backtrace(void) StrBufAppendPrintf(Buf, "%p : ", stack_frames[i]); } free(strings); - syslog(LOG_ALERT, "%s\n", ChrPtr(Buf)); + syslog(LOG_ALERT, "%s %s\n", IOSTR, ChrPtr(Buf)); FreeStrBuf(&Buf); } #endif @@ -153,20 +117,40 @@ void master_startup(void) { FILE *urandom; struct ctdlroom qrbuf; int rv; + struct passwd *pw; + gid_t gid; syslog(LOG_DEBUG, "master_startup() started\n"); time(&server_startup_time); - get_config(); - syslog(LOG_INFO, "Opening databases\n"); + syslog(LOG_INFO, "Checking directory access"); + if ((pw = getpwuid(ctdluid)) == NULL) { + gid = getgid(); + } else { + gid = pw->pw_gid; + } + + if (create_run_directories(CTDLUID, gid) != 0) { + syslog(LOG_EMERG, "failed to access & create directories"); + exit(1); + } + syslog(LOG_INFO, "Opening databases"); open_databases(); + + /* Load site-specific configuration */ + syslog(LOG_INFO, "Initializing configuration system"); + initialize_config_system(); + validate_config(); + migrate_legacy_control_record(); + + /* Check floor reference counts */ check_ref_counts(); 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); + CtdlCreateRoom(CtdlGetConfigStr("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(CtdlGetConfigStr("c_twitroom"), 0, "", 0, 1, 0, VIEW_BBS); /* The "Local System Configuration" room doesn't need to be visible */ if (CtdlGetRoomLock(&qrbuf, SYSCONFIGROOM) == 0) { @@ -196,16 +180,14 @@ void master_startup(void) { srand(seed); srandom(seed); - put_config(); - syslog(LOG_DEBUG, "master_startup() finished\n"); } /* - * Cleanup routine to be called when the server is shutting down. + * Cleanup routine to be called when the server is shutting down. Returns the needed exit code. */ -void master_cleanup(int exitcode) { +int master_cleanup(int exitcode) { struct CleanupFunctionHook *fcn; static int already_cleaning_up = 0; @@ -222,6 +204,9 @@ void master_cleanup(int exitcode) { /* Do system-dependent stuff */ sysdep_master_cleanup(); + + /* Close the configuration system */ + shutdown_config_system(); /* Close databases */ syslog(LOG_INFO, "Closing databases\n"); @@ -236,17 +221,17 @@ void master_cleanup(int exitcode) { } } - release_control(); - /* Now go away. */ 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 (restart_server != 0) { + exitcode = 1; + } + else if ((running_as_daemon != 0) && ((exitcode == 0) )) { exitcode = CTDLEXIT_SHUTDOWN; - exit(exitcode); + } + return(exitcode); } @@ -311,7 +296,7 @@ int CtdlIsPublicClient(void) safestrncpy(public_clientspos, LOCALHOSTSTR, sizeof public_clients); public_clientspos += sizeof(LOCALHOSTSTR) - 1; - if (hostname_to_dotted_quad(addrbuf, config.c_fqdn) == 0) { + if (hostname_to_dotted_quad(addrbuf, CtdlGetConfigStr("c_fqdn")) == 0) { *(public_clientspos++) = '|'; paddr = &addrbuf[0]; while (!IsEmptyStr (paddr) && @@ -368,156 +353,17 @@ int CtdlIsPublicClient(void) -/* - * 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_or_guest) && (CC->logged_in == 0) && (!config.c_guest_logins)) { - cprintf("%d Not logged in.\n", ERROR + NOT_LOGGED_IN); - 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 >= AxAideU) return(0); - if (required_level >= ac_aide) { - cprintf("%d This command requires Admin 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 Admin or Room Admin access.\n", - ERROR + HIGHER_ACCESS_REQUIRED); - return(-1); - } - - /* shhh ... succeed quietly */ - return(0); -} - - - - - - - - -/* - * Back-end function for starting a session - */ -void begin_session(CitContext *con) -{ - /* - * Initialize some variables specific to our context. - */ - con->logged_in = 0; - con->internal_pgm = 0; - con->download_fp = NULL; - con->upload_fp = NULL; - con->cached_msglist = NULL; - con->cached_num_msgs = 0; - 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'; - *con->cs_clientinfo = '\0'; - safestrncpy(con->cs_host, config.c_fqdn, sizeof con->cs_host); - safestrncpy(con->cs_addr, "", sizeof con->cs_addr); - con->cs_UDSclientUID = -1; - con->cs_host[sizeof con->cs_host - 1] = 0; - if (!CC->is_local_socket) { - locate_host(con->cs_host, sizeof con->cs_host, - con->cs_addr, sizeof con->cs_addr, - con->client_socket - ); - } - else { - con->cs_host[0] = 0; - con->cs_addr[0] = 0; -#ifdef HAVE_STRUCT_UCRED - { - /* as http://www.wsinnovations.com/softeng/articles/uds.html told us... */ - struct ucred credentials; - socklen_t ucred_length = sizeof(struct ucred); - - /*fill in the user data structure */ - if(getsockopt(con->client_socket, SOL_SOCKET, SO_PEERCRED, &credentials, &ucred_length)) { - syslog(LOG_NOTICE, "could obtain credentials from unix domain socket"); - - } - else { - /* the process ID of the process on the other side of the socket */ - /* credentials.pid; */ - - /* the effective UID of the process on the other side of the socket */ - con->cs_UDSclientUID = credentials.uid; - - /* the effective primary GID of the process on the other side of the socket */ - /* credentials.gid; */ - - /* To get supplemental groups, we will have to look them up in our account - database, after a reverse lookup on the UID to get the account name. - We can take this opportunity to check to see if this is a legit account. - */ - snprintf(con->cs_clientinfo, sizeof(con->cs_clientinfo), - "PID: "F_PID_T"; UID: "F_UID_T"; GID: "F_XPID_T" ", - credentials.pid, - credentials.uid, - credentials.gid); - } - } -#endif - } - 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) { - syslog(LOG_NOTICE, "Session (%s) started from %s (%s).\n", con->ServiceName, con->cs_host, con->cs_addr); - } - else { - syslog(LOG_NOTICE, "Session (%s) started via local socket UID:%d.\n", con->ServiceName, con->cs_UDSclientUID); - } - - /* Run any session startup routines registered by loadable modules */ - PerformSessionHooks(EVT_START); -} - 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, - config.c_nodename, config.c_maxsessions + CtdlGetConfigStr("c_nodename"), CtdlGetConfigInt("c_maxsessions") ); 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, CtdlGetConfigStr("c_nodename")); CC->can_receive_im = 1; } } @@ -525,70 +371,7 @@ void citproto_begin_session() { void citproto_begin_admin_session() { CC->internal_pgm = 1; - cprintf("%d %s Citadel server ADMIN CONNECTION ready.\n", CIT_OK, config.c_nodename); -} - - - - -/* - * This loop recognizes all server commands. - */ -void do_command_loop(void) { - char cmdbuf[SIZ]; - - time(&CC->lastcmd); - memset(cmdbuf, 0, sizeof cmdbuf); /* Clear it, just in case */ - if (client_getln(cmdbuf, sizeof cmdbuf) < 1) { - 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)) ) { - syslog(LOG_INFO, "[%d][%s(%ld)] %s", - CC->cs_pid, CC->curr_user, CC->user.usernum, cmdbuf - ); - } - else { - syslog(LOG_INFO, "[%d][%s(%ld)]