X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fcitserver.c;h=0c8955a8a2b3fb10386b589818e6a3618aff6088;hb=5365493a013629f909c27528febb9660e5d1d863;hp=3890ae6f142f98e2b3c88a796db4e0ead2a011ab;hpb=9410731556b7041aa980a0384ece2c08754f6f5d;p=citadel.git diff --git a/citadel/citserver.c b/citadel/citserver.c index 3890ae6f1..0c8955a8a 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -4,18 +4,12 @@ * Copyright (c) 1987-2011 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 as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * 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. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ #include "sysdep.h" @@ -169,6 +163,7 @@ void master_startup(void) { syslog(LOG_DEBUG, "master_startup() started\n"); time(&server_startup_time); + get_config(); syslog(LOG_INFO, "Opening databases\n"); open_databases(); @@ -196,6 +191,9 @@ void master_startup(void) { urandom = fopen("/dev/urandom", "r"); if (urandom != NULL) { 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 { @@ -205,9 +203,6 @@ void master_startup(void) { srand(seed); srandom(seed); - syslog(LOG_INFO, "Initializing ipgm secret\n"); - get_config(); - config.c_ipgm_secret = rand(); put_config(); syslog(LOG_DEBUG, "master_startup() finished\n"); @@ -221,7 +216,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 */ @@ -343,9 +338,9 @@ void cmd_time(char *argbuf) /* 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); + cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst, server_startup_time); #else - cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst); + cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst, server_startup_time); #endif } @@ -430,7 +425,7 @@ int is_public_client(void) } } } - fclose(fp); + if (fp != NULL) fclose(fp); pc_timestamp = time(NULL); end_critical_section(S_PUBLIC_CLIENTS); } @@ -652,7 +647,7 @@ void GenerateRoomDisplay(char *real_room, if (viewed->room.QRflags & QR_PRIVATE) { CtdlRoomAccess(&viewed->room, &viewer->user, &ra, NULL); if ( (ra & UA_KNOWN) == 0) { - strcpy(real_room, ""); + strcpy(real_room, " "); } } @@ -689,14 +684,14 @@ int CtdlAccessCheck(int required_level) { if (CC->user.axlevel >= AxAideU) return(0); if (required_level >= ac_aide) { - cprintf("%d This command requires Aide access.\n", + 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 Aide or Room Aide access.\n", + cprintf("%d This command requires Admin or Room Admin access.\n", ERROR + HIGHER_ACCESS_REQUIRED); return(-1); } @@ -756,36 +751,6 @@ void cmd_echo(char *etext) } -/* - * Perform privilege escalation for an 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); - syslog(LOG_ERR, "Warning: ipgm authentication failed.\n"); - CC->kill_me = KILLME_AUTHFAILED; - } -} - /* * Shut down the server @@ -887,9 +852,6 @@ void cmd_asyn(char *argbuf) */ void begin_session(CitContext *con) { - socklen_t len; - struct sockaddr_in sin; - /* * Initialize some variables specific to our context. */ @@ -914,7 +876,6 @@ void begin_session(CitContext *con) safestrncpy(con->cs_addr, "", sizeof con->cs_addr); con->cs_UDSclientUID = -1; con->cs_host[sizeof con->cs_host - 1] = 0; - len = sizeof sin; if (!CC->is_local_socket) { locate_host(con->cs_host, sizeof con->cs_host, con->cs_addr, sizeof con->cs_addr, @@ -994,6 +955,12 @@ 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); +} + + void cmd_noop(char *argbuf) { cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() ); @@ -1108,7 +1075,6 @@ CTDL_MODULE_INIT(citserver) CtdlRegisterProtoHook(cmd_echo, "ECHO", "echo text back to the client"); CtdlRegisterProtoHook(cmd_more, "MORE", "fetch the paginator prompt"); CtdlRegisterProtoHook(cmd_iden, "IDEN", "identify the client software and location"); - CtdlRegisterProtoHook(cmd_ipgm, "IPGM", "perform privilege escalation for internal programs"); CtdlRegisterProtoHook(cmd_term, "TERM", "terminate another running session"); CtdlRegisterProtoHook(cmd_down, "DOWN", "perform a server shutdown"); CtdlRegisterProtoHook(cmd_halt, "HALT", "halt the server without exiting the server process");