X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=c99cff762eb57bcba2cb2f12322c2c78a2100755;hb=cf934431c7c8c1091b38c0b374f6a3b9293841ca;hp=e4dce667973dbe4c112c25bdaac6db41cd9e975a;hpb=543be0cbdc85ca5873af98a05c6b9dbc51b74e57;p=citadel.git diff --git a/webcit/webserver.c b/webcit/webserver.c index e4dce6679..c99cff762 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -1,14 +1,12 @@ /* * $Id$ - */ -/** - * \defgroup Webserver This contains a simple multithreaded TCP server manager. It sits around + * + * This contains a simple multithreaded TCP server manager. It sits around * waiting on the specified port for incoming HTTP connections. When a * connection is established, it calls context_loop() from context_loop.c. - * \ingroup WebcitHttpServer + * */ -/*@{*/ #include "webcit.h" #include "webserver.h" @@ -20,12 +18,12 @@ int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp); #endif -int verbosity = 9; /**< Logging level */ -int msock; /**< master listening socket */ -int is_https = 0; /**< Nonzero if I am an HTTPS service */ -int follow_xff = 0; /**< Follow X-Forwarded-For: header */ -int home_specified = 0; /**< did the user specify a homedir? */ -int time_to_die = 0; /**< Nonzero if server is shutting down */ +int verbosity = 9; /* Logging level */ +int msock; /* master listening socket */ +int is_https = 0; /* Nonzero if I am an HTTPS service */ +int follow_xff = 0; /* Follow X-Forwarded-For: header */ +int home_specified = 0; /* did the user specify a homedir? */ +int time_to_die = 0; /* Nonzero if server is shutting down */ extern void *context_loop(int); extern void *housekeeping_loop(void); extern pthread_mutex_t SessionListMutex; @@ -37,17 +35,19 @@ char file_crpt_file_key[PATH_MAX]=""; char file_crpt_file_csr[PATH_MAX]=""; char file_crpt_file_cer[PATH_MAX]=""; -char socket_dir[PATH_MAX]; /**< where to talk to our citadel server */ -static const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /**< nailed to what configure gives us. */ -static char static_dir[PATH_MAX]; /**< calculated on startup */ -static char static_local_dir[PATH_MAX]; /**< calculated on startup */ -char *static_dirs[]={ /**< needs same sort order as the web mapping */ - (char*)static_dir, /** our templates on disk */ - (char*)static_local_dir, /** user provided templates disk */ - (char*)editor_absolut_dir /** the editor on disk */ +char socket_dir[PATH_MAX]; /* where to talk to our citadel server */ +static const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /* nailed to what configure gives us. */ +static char static_dir[PATH_MAX]; /* calculated on startup */ +static char static_local_dir[PATH_MAX]; /* calculated on startup */ +static char static_icon_dir[PATH_MAX]; /* where should we find our mime icons? */ +char *static_dirs[]={ /* needs same sort order as the web mapping */ + (char*)static_dir, /* our templates on disk */ + (char*)static_local_dir, /* user provided templates disk */ + (char*)editor_absolut_dir, /* the editor on disk */ + (char*)static_icon_dir /* our icons... */ }; -/** +/* * Subdirectories from which the client may request static content * * (If you add more, remember to increment 'ndirs' below) @@ -61,21 +61,22 @@ char *static_content_dirs[] = { int ndirs=3; -char *server_cookie = NULL; /**< our Cookie connection to the client */ -int http_port = PORT_NUM; /**< Port to listen on */ -char *ctdlhost = DEFAULT_HOST; /**< our name */ -char *ctdlport = DEFAULT_PORT; /**< our Port */ -int setup_wizard = 0; /**< should we run the setup wizard? \todo */ -char wizard_filename[PATH_MAX]; /**< where's the setup wizard? */ -int running_as_daemon = 0; /**< should we deamonize on startup? */ +char *server_cookie = NULL; /* our Cookie connection to the client */ +int http_port = PORT_NUM; /* Port to listen on */ +char *ctdlhost = DEFAULT_HOST; /* our name */ +char *ctdlport = DEFAULT_PORT; /* our Port */ +int setup_wizard = 0; /* should we run the setup wizard? \todo */ +char wizard_filename[PATH_MAX]; /* where's the setup wizard? */ +int running_as_daemon = 0; /* should we deamonize on startup? */ -/** - * \brief This is a generic function to set up a master socket for listening on +/* + * This is a generic function to set up a master socket for listening on * a TCP port. The server shuts down if the bind fails. - * \param ip_addr ip to bind to - * \param port_number the port to bind to - * \param queue_len Number of incoming connections to allow in the queue + * + * ip_addr IP address to bind + * port_number port number to bind + * queue_len number of incoming connections to allow in the queue */ int ig_tcp_server(char *ip_addr, int port_number, int queue_len) { @@ -105,11 +106,14 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len) lprintf(1, "Can't create a socket: %s\n", strerror(errno)); exit(WC_EXIT_BIND); } - /** Set some socket options that make sense. */ + /* Set some socket options that make sense. */ i = 1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); - fcntl(s, F_SETFL, O_NONBLOCK);/// TODO + fcntl(s, F_SETFL, O_NONBLOCK); /* maide: this statement is incorrect + there should be a preceding F_GETFL + and a bitwise OR with the previous + fd flags */ if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) { lprintf(1, "Can't bind: %s\n", strerror(errno)); @@ -124,7 +128,7 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len) -/** +/* * \brief Create a Unix domain socket and listen on it * \param sockpath file name of the unix domain socket * \param queue_len Number of incoming connections to allow in the queue @@ -141,7 +145,7 @@ int ig_uds_server(char *sockpath, int queue_len) i = unlink(sockpath); if (i != 0) if (errno != ENOENT) { - lprintf(1, "citserver: can't unlink %s: %s\n", + lprintf(1, "webserver: can't unlink %s: %s\n", sockpath, strerror(errno)); exit(WC_EXIT_BIND); } @@ -152,19 +156,19 @@ int ig_uds_server(char *sockpath, int queue_len) s = socket(AF_UNIX, SOCK_STREAM, 0); if (s < 0) { - lprintf(1, "citserver: Can't create a socket: %s\n", + lprintf(1, "webserver: Can't create a socket: %s\n", strerror(errno)); exit(WC_EXIT_BIND); } if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) < 0) { - lprintf(1, "citserver: Can't bind: %s\n", + lprintf(1, "webserver: Can't bind: %s\n", strerror(errno)); exit(WC_EXIT_BIND); } if (listen(s, actual_queue_len) < 0) { - lprintf(1, "citserver: Can't listen: %s\n", + lprintf(1, "webserver: Can't listen: %s\n", strerror(errno)); exit(WC_EXIT_BIND); } @@ -176,7 +180,7 @@ int ig_uds_server(char *sockpath, int queue_len) -/** +/* * \brief Read data from the client socket. * \param sock socket fd to read from * \param buf buffer to read into @@ -231,15 +235,19 @@ int client_read_to(int sock, char *buf, int bytes, int timeout) return (1); } -/** +/* * \brief write data to the client * \param buf data to write to the client * \param count size of buffer */ ssize_t client_write(const void *buf, size_t count) { - char *newptr; - size_t newalloc; + char *newptr; + size_t newalloc; + size_t bytesWritten = 0; + ssize_t res; + fd_set wset; + int fdflags; if (WC->burst != NULL) { if ((WC->burst_len + count) >= WC->burst_alloc) { @@ -273,10 +281,30 @@ ssize_t client_write(const void *buf, size_t count) write(2, buf, count); write(2, "\033[30m", 5); #endif - return (write(WC->http_sock, buf, count)); + fdflags = fcntl(WC->http_sock, F_GETFL); + + while (bytesWritten < count) { + if ((fdflags & O_NONBLOCK) == O_NONBLOCK) { + FD_ZERO(&wset); + FD_SET(WC->http_sock, &wset); + if (select(1, NULL, &wset, NULL, NULL) == -1) { + lprintf(2, "client_write: Socket select failed (%s)\n", strerror(errno)); + return -1; + } + } + + if ((res = write(WC->http_sock, (char*)buf + bytesWritten, + count - bytesWritten)) == -1) { + lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno)); + return res; + } + bytesWritten += res; + } + + return bytesWritten; } -/** +/* * \brief Begin buffering HTTP output so we can transmit it all in one write operation later. */ void begin_burst(void) @@ -291,26 +319,26 @@ void begin_burst(void) } -/** +/* * \brief uses the same calling syntax as compress2(), but it * creates a stream compatible with HTTP "Content-encoding: gzip" */ #ifdef HAVE_ZLIB -#define DEF_MEM_LEVEL 8 /**< memlevel??? */ -#define OS_CODE 0x03 /**< unix */ -int ZEXPORT compress_gzip(Bytef * dest, /**< compressed buffer*/ - size_t * destLen, /**< length of the compresed data */ - const Bytef * source, /**< source to encode */ - uLong sourceLen, /**< length of source to encode */ - int level) /**< compression level */ +#define DEF_MEM_LEVEL 8 /*< memlevel??? */ +#define OS_CODE 0x03 /*< unix */ +int ZEXPORT compress_gzip(Bytef * dest, /*< compressed buffer*/ + size_t * destLen, /*< length of the compresed data */ + const Bytef * source, /*< source to encode */ + uLong sourceLen, /*< length of source to encode */ + int level) /*< compression level */ { - const int gz_magic[2] = { 0x1f, 0x8b }; /** gzip magic header */ + const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic header */ - /** write gzip header */ + /* write gzip header */ snprintf((char *) dest, *destLen, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], Z_DEFLATED, - 0 /*flags */ , 0, 0, 0, 0 /*time */ , 0 /** xflags */ , + 0 /*flags */ , 0, 0, 0, 0 /*time */ , 0 /* xflags */ , OS_CODE); /* normal deflate */ @@ -356,7 +384,7 @@ int ZEXPORT compress_gzip(Bytef * dest, /**< compressed buffer*/ } #endif -/** +/* * \brief Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header. */ void end_burst(void) @@ -405,7 +433,7 @@ void end_burst(void) -/** +/* * \brief Read data from the client socket with default timeout. * (This is implemented in terms of client_read_to() and could be * justifiably moved out of sysdep.c) @@ -419,7 +447,7 @@ int client_read(int sock, char *buf, int bytes) } -/** +/* * \brief Get a LF-terminated line of text from the client. * (This is implemented in terms of client_read() and could be * justifiably moved out of sysdep.c) @@ -432,23 +460,23 @@ int client_getln(int sock, char *buf, int bufsiz) { int i, retval; - /** Read one character at a time.*/ + /* Read one character at a time.*/ for (i = 0;; i++) { retval = client_read(sock, &buf[i], 1); if (retval != 1 || buf[i] == '\n' || i == (bufsiz-1)) break; if ( (!isspace(buf[i])) && (!isprint(buf[i])) ) { - /** Non printable character recieved from client */ + /* Non printable character recieved from client */ return(-1); } } - /** If we got a long line, discard characters until the newline. */ + /* If we got a long line, discard characters until the newline. */ if (i == (bufsiz-1)) while (buf[i] != '\n' && retval == 1) retval = client_read(sock, &buf[i], 1); - /** + /* * Strip any trailing non-printable characters. */ buf[i] = 0; @@ -458,7 +486,7 @@ int client_getln(int sock, char *buf, int bufsiz) return (retval); } -/** +/* * \brief shut us down the regular way. * param signum the signal we want to forward */ @@ -466,10 +494,11 @@ pid_t current_child; void graceful_shutdown_watcher(int signum) { lprintf (1, "bye; shutting down watcher."); kill(current_child, signum); - exit(0); + if (signum != SIGHUP) + exit(0); } -/** +/* * \brief shut us down the regular way. * param signum the signal we want to forward */ @@ -491,7 +520,7 @@ void graceful_shutdown(int signum) { } -/** +/* * \brief Start running as a daemon. * * param do_close_stdio Only close stdio if set. @@ -529,7 +558,7 @@ void start_daemon(char *pid_file) freopen("/dev/null", "r", stdin); freopen("/dev/null", "w", stdout); freopen("/dev/null", "w", stderr); -/// signal(SIGTERM, graceful_shutdown_watcher); + signal(SIGTERM, graceful_shutdown_watcher); signal(SIGHUP, graceful_shutdown_watcher); do { @@ -541,20 +570,20 @@ void start_daemon(char *pid_file) exit(errno); } - else if (current_child == 0) { -//// signal(SIGTERM, graceful_shutdown); + else if (current_child == 0) { // child process +// signal(SIGTERM, graceful_shutdown); signal(SIGHUP, graceful_shutdown); return; /* continue starting webcit. */ } - else { -//// signal(SIGTERM, SIG_IGN); - signal(SIGHUP, SIG_IGN); + else { // watcher process +// signal(SIGTERM, SIG_IGN); +// signal(SIGHUP, SIG_IGN); if (pid_file) { fp = fopen(pid_file, "w"); if (fp != NULL) { - fprintf(fp, "%d\n", current_child); + fprintf(fp, "%d\n", getpid()); fclose(fp); } } @@ -595,22 +624,22 @@ void start_daemon(char *pid_file) exit(WEXITSTATUS(status)); } -/** +/* * \brief Spawn an additional worker thread into the pool. */ void spawn_another_worker_thread() { - pthread_t SessThread; /**< Thread descriptor */ - pthread_attr_t attr; /**< Thread attributes */ + pthread_t SessThread; /*< Thread descriptor */ + pthread_attr_t attr; /*< Thread attributes */ int ret; lprintf(3, "Creating a new thread\n"); - /** set attributes for the new thread */ + /* set attributes for the new thread */ pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - /** + /* * Our per-thread stacks need to be bigger than the default size, otherwise * the MIME parser crashes on FreeBSD, and the IMAP service crashes on * 64-bit Linux. @@ -621,27 +650,27 @@ void spawn_another_worker_thread() pthread_attr_destroy(&attr); } - /** now create the thread */ + /* now create the thread */ if (pthread_create(&SessThread, &attr, (void *(*)(void *)) worker_entry, NULL) != 0) { lprintf(1, "Can't create thread: %s\n", strerror(errno)); } - /** free up the attributes */ + /* free up the attributes */ pthread_attr_destroy(&attr); } -/** +/* * \brief Here's where it all begins. * \param argc number of commandline args * \param argv the commandline arguments */ int main(int argc, char **argv) { - pthread_t SessThread; /**< Thread descriptor */ - pthread_attr_t attr; /**< Thread attributes */ - int a, i; /**< General-purpose variables */ + pthread_t SessThread; /*< Thread descriptor */ + pthread_attr_t attr; /*< Thread attributes */ + int a, i; /*< General-purpose variables */ char tracefile[PATH_MAX]; char ip_addr[256]="0.0.0.0"; char dirbuffer[PATH_MAX]=""; @@ -657,11 +686,20 @@ int main(int argc, char **argv) char *locale = NULL; char *mo = NULL; #endif /* ENABLE_NLS */ - char uds_listen_path[PATH_MAX]; /**< listen on a unix domain socket? */ + char uds_listen_path[PATH_MAX]; /*< listen on a unix domain socket? */ + + /* Ensure that we are linked to the correct version of libcitadel */ + if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) { + fprintf(stderr, " You are running libcitadel version %d.%02d\n", + (libcitadel_version_number() / 100), (libcitadel_version_number() % 100)); + fprintf(stderr, "WebCit was compiled against version %d.%02d\n", + (LIBCITADEL_VERSION_NUMBER / 100), (LIBCITADEL_VERSION_NUMBER % 100)); + return(1); + } strcpy(uds_listen_path, ""); - /** Parse command line */ + /* Parse command line */ #ifdef HAVE_OPENSSL while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cfs")) != EOF) #else @@ -753,7 +791,7 @@ int main(int argc, char **argv) signal(SIGHUP, graceful_shutdown); } - /** Tell 'em who's in da house */ + /* Tell 'em who's in da house */ lprintf(1, PACKAGE_STRING "\n"); lprintf(1, "Copyright (C) 1996-2008 by the Citadel development team.\n" "This software is distributed under the terms of the " @@ -761,15 +799,18 @@ int main(int argc, char **argv) ); - /** initialize the International Bright Young Thing */ + /* initialize the International Bright Young Thing */ #ifdef ENABLE_NLS initialize_locales(); + locale = setlocale(LC_ALL, ""); + mo = malloc(strlen(webcitdir) + 20); lprintf(9, "Message catalog directory: %s\n", bindtextdomain("webcit", LOCALEDIR"/locale")); free(mo); lprintf(9, "Text domain: %s\n", textdomain("webcit")); lprintf(9, "Text domain Charset: %s\n", bind_textdomain_codeset("webcit","UTF8")); + preset_locale(); #endif @@ -789,6 +830,8 @@ int main(int argc, char **argv) COMPUTE_DIRECTORY(socket_dir); basedir=WWWDIR "/static"; COMPUTE_DIRECTORY(static_dir); + basedir=WWWDIR "/static/icons"; + COMPUTE_DIRECTORY(static_icon_dir); basedir=WWWDIR "/static.local"; COMPUTE_DIRECTORY(static_local_dir); @@ -805,15 +848,16 @@ int main(int argc, char **argv) "%s/citadel.cer", ctdl_key_dir); - /** we should go somewhere we can leave our coredump, if enabled... */ + /* we should go somewhere we can leave our coredump, if enabled... */ lprintf(9, "Changing directory to %s\n", socket_dir); if (chdir(webcitdir) != 0) { perror("chdir"); } + LoadIconDir(static_icon_dir); initialize_viewdefs(); initialize_axdefs(); - /** + /* * Set up a place to put thread-specific data. * We only need a single pointer per thread - it points to the * wcsession struct to which the thread is currently bound. @@ -823,7 +867,7 @@ int main(int argc, char **argv) } InitialiseSemaphores (); - /** + /* * Set up a place to put thread-specific SSL data. * We don't stick this in the wcsession struct because SSL starts * up before the session is bound, and it gets torn down between @@ -835,7 +879,7 @@ int main(int argc, char **argv) } #endif - /** + /* * Bind the server to our favorite port. * There is no need to check for errors, because ig_tcp_server() * exits if it doesn't succeed. @@ -855,7 +899,7 @@ int main(int argc, char **argv) pthread_mutex_init(&SessionListMutex, NULL); - /** + /* * Start up the housekeeping thread */ pthread_attr_init(&attr); @@ -864,7 +908,7 @@ int main(int argc, char **argv) (void *(*)(void *)) housekeeping_loop, NULL); - /** + /* * If this is an HTTPS server, fire up SSL */ #ifdef HAVE_OPENSSL @@ -873,7 +917,7 @@ int main(int argc, char **argv) } #endif - /** Start a few initial worker threads */ + /* Start a few initial worker threads */ for (i = 0; i < (MIN_WORKER_THREADS); ++i) { spawn_another_worker_thread(); } @@ -884,7 +928,7 @@ int main(int argc, char **argv) } -/** +/* * Entry point for worker threads */ void worker_entry(void) @@ -902,7 +946,7 @@ void worker_entry(void) FD_SET(msock, &readset); do { - /** Only one thread can accept at a time */ + /* Only one thread can accept at a time */ fail_this_transaction = 0; ssock = -1; errno = EAGAIN; @@ -950,12 +994,10 @@ void worker_entry(void) sleeeeeeeeeep(1); // wait so some others might finish... lprintf(2, "master shutdown: cleaning up sessions\n"); do_housekeeping(); -#ifdef WEBCIT_WITH_CALENDAR_SERVICE lprintf(2, "master shutdown: cleaning up libical\n"); free_zone_directory (); icaltimezone_release_zone_tab (); icalmemory_free_ring (); -#endif lprintf(2, "master shutdown exiting!.\n"); exit(0); } @@ -968,12 +1010,12 @@ void worker_entry(void) lprintf(2, "inbetween."); pthread_exit(NULL); } else { // Got it? do some real work! - /** Set the SO_REUSEADDR socket option */ + /* Set the SO_REUSEADDR socket option */ i = 1; setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); - /** If we are an HTTPS server, go crypto now. */ + /* If we are an HTTPS server, go crypto now. */ #ifdef HAVE_OPENSSL if (is_https) { if (starttls(ssock) != 0) { @@ -985,17 +1027,17 @@ void worker_entry(void) if (fail_this_transaction == 0) { - /** Perform an HTTP transaction... */ + /* Perform an HTTP transaction... */ context_loop(ssock); - /** Shut down SSL/TLS if required... */ + /* Shut down SSL/TLS if required... */ #ifdef HAVE_OPENSSL if (is_https) { endtls(); } #endif - /** ...and close the socket. */ + /* ...and close the socket. */ lingering_close(ssock); } @@ -1007,7 +1049,7 @@ void worker_entry(void) pthread_exit(NULL); } -/** +/* * \brief logprintf. log messages * logs to stderr if loglevel is lower than the verbosity set at startup * \param loglevel level of the message @@ -1028,7 +1070,7 @@ int lprintf(int loglevel, const char *format, ...) } -/** +/* * \brief print the actual stack frame. */ void wc_backtrace(void)