]> code.citadel.org Git - citadel.git/blobdiff - citadel/citserver.c
move Mesg commands to serv_files; they basicaly also handle files - just text files.
[citadel.git] / citadel / citserver.c
index 7e5538b51817757f789466066e61edda741c518e..5fe1fdd4e47f81b8aafaafc7164573db7cad5b99 100644 (file)
@@ -38,7 +38,6 @@
 
 #include <ctype.h>
 #include <string.h>
-#include <dirent.h>
 #include <errno.h>
 #include <limits.h>
 #include <netdb.h>
 #include "support.h"
 #include "locate_host.h"
 #include "room_ops.h"
-#include "file_ops.h"
 #include "control.h"
 #include "euidindex.h"
 #include "context.h"
 #include "svn_revision.h"
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
-
 #include "ctdl_module.h"
 
 char *unique_session_numbers;
@@ -216,7 +209,7 @@ void master_cleanup(int exitcode) {
        struct CleanupFunctionHook *fcn;
        static int already_cleaning_up = 0;
 
-       if (already_cleaning_up) while(1) usleep(1000);
+       if (already_cleaning_up) while(1) usleep(1000000);
        already_cleaning_up = 1;
 
        /* Run any cleanup routines registered by loadable modules */
@@ -258,63 +251,6 @@ void master_cleanup(int exitcode) {
 
 
 
-/*
- * 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("\n");  /* nonce no longer supported */
-       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);
-
-       /* thread load averages -- temporarily disabled during refactoring of this code */
-       cprintf("0\n");         /* load average */
-       cprintf("0\n");         /* worker average */
-       cprintf("0\n");         /* thread count */
-
-       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("%d\n", openid_level_supported); /* OpenID is enabled when using native auth */
-       }
-       else {
-               cprintf("0\n"); /* OpenID is disabled when using non-native auth */
-       }
-
-       cprintf("%d\n", config.c_guest_logins);
-       
-       cprintf("000\n");
-}
-
-
 /*
  * returns an asterisk if there are any instant messages waiting,
  * space otherwise.
@@ -328,22 +264,6 @@ char CtdlCheckExpress(void) {
        }
 }
 
-void cmd_time(char *argbuf)
-{
-   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|%ld\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst, server_startup_time);
-#else
-   cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst, server_startup_time);
-#endif
-}
-
 
 /*
  * Check originating host against the public_clients file.  This determines
@@ -351,7 +271,7 @@ void cmd_time(char *argbuf)
  * (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];
@@ -425,7 +345,7 @@ int is_public_client(void)
                                        }
                                }
                        }
-               fclose(fp);
+               if (fp != NULL) fclose(fp);
                pc_timestamp = time(NULL);
                end_critical_section(S_PUBLIC_CLIENTS);
        }
@@ -446,189 +366,7 @@ int is_public_client(void)
 }
 
 
-/*
- * 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];
-
-       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;
-
-       /* For local sockets and public clients, trust the hostname supplied by the client */
-       if ( (CC->is_local_socket) || (is_public_client()) ) {
-               safestrncpy(CC->cs_host, from_host, sizeof CC->cs_host);
-               CC->cs_host[sizeof CC->cs_host - 1] = 0;
-               CC->cs_addr[0] = 0;
-       }
-
-       syslog(LOG_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);
-}
-
-typedef const char *ccharp;
-/*
- * 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 ccharp*)dirs);
-               if (IsEmptyStr(targ)) {
-                       snprintf(buf2, sizeof buf2, "%s.%d",
-                                                       buf, CC->cs_clientdev);
-                       mesg_locate(targ, sizeof targ, buf2, 2,
-                                   (const ccharp*)dirs);
-                       if (IsEmptyStr(targ)) {
-                               mesg_locate(targ, sizeof targ, buf, 2,
-                                           (const ccharp*)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 ccharp*)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
@@ -684,14 +422,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);
        }
@@ -702,53 +440,6 @@ int CtdlAccessCheck(int required_level) {
 
 
 
-/*
- * Terminate another running session
- */
-void cmd_term(char *cmdbuf)
-{
-       int session_num;
-       int terminated = 0;
-
-       session_num = extract_int(cmdbuf, 0);
-
-       terminated = CtdlTerminateOtherSession(session_num);
-
-       if (terminated < 0) {
-               cprintf("%d You can't kill your own session.\n", ERROR + ILLEGAL_VALUE);
-               return;
-       }
-
-       if (terminated & TERM_FOUND) {
-               if (terminated == TERM_KILLED) {
-                       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(char *argbuf) {
-       cprintf("%d %s\n", CIT_OK, config.c_moreprompt);
-}
-
-
-/*
- * echo 
- */
-void cmd_echo(char *etext)
-{
-       cprintf("%d %s\n", CIT_OK, etext);
-}
 
 
 
@@ -831,21 +522,6 @@ void cmd_scdn(char *argbuf)
 }
 
 
-/*
- * 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);
-}
-
-
 
 /*
  * Back-end function for starting a session
@@ -961,31 +637,6 @@ void citproto_begin_admin_session() {
 }
 
 
-void cmd_noop(char *argbuf)
-{
-       cprintf("%d%cok\n", CIT_OK, CtdlCheckExpress() );
-}
-
-
-void cmd_qnop(char *argbuf)
-{
-       /* do nothing, this command returns no response */
-}
-
-
-void cmd_quit(char *argbuf)
-{
-       cprintf("%d Goodbye.\n", CIT_OK);
-       CC->kill_me = KILLME_CLIENT_LOGGED_OUT;
-}
-
-
-void cmd_lout(char *argbuf)
-{
-       if (CC->logged_in) 
-               CtdlUserLogout();
-       cprintf("%d logged out.\n", CIT_OK);
-}
 
 
 /*
@@ -1064,22 +715,9 @@ void do_async_loop(void) {
 CTDL_MODULE_INIT(citserver)
 {
        if (!threading) {
-               CtdlRegisterProtoHook(cmd_noop, "NOOP", "no operation");
-               CtdlRegisterProtoHook(cmd_qnop, "QNOP", "no operation with no response");
-               CtdlRegisterProtoHook(cmd_quit, "QUIT", "log out and disconnect from server");
-               CtdlRegisterProtoHook(cmd_lout, "LOUT", "log out but do not disconnect from server");
-               CtdlRegisterProtoHook(cmd_asyn, "ASYN", "enable asynchronous server responses");
-               CtdlRegisterProtoHook(cmd_info, "INFO", "fetch server capabilities and configuration");
-               CtdlRegisterProtoHook(cmd_mesg, "MESG", "fetch system banners");
-               CtdlRegisterProtoHook(cmd_emsg, "EMSG", "submit system banners");
-               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_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");
                CtdlRegisterProtoHook(cmd_scdn, "SCDN", "schedule or cancel a server shutdown");
-               CtdlRegisterProtoHook(cmd_time, "TIME", "fetch the date and time from the server");
        }
         /* return our id for the Log */
        return "citserver";