X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=3bd25181843369611e13cba7cadc2c6602d9c2ba;hb=f948a91d2ef63c2b9e8ac07bab05c647a3819db6;hp=c99cff762eb57bcba2cb2f12322c2c78a2100755;hpb=cf934431c7c8c1091b38c0b374f6a3b9293841ca;p=citadel.git diff --git a/webcit/webserver.c b/webcit/webserver.c index c99cff762..3bd251818 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -5,6 +5,9 @@ * waiting on the specified port for incoming HTTP connections. When a * connection is established, it calls context_loop() from context_loop.c. * + * Copyright (c) 1996-2009 by the citadel.org developers. + * This program is released under the terms of the GNU General Public License v3. + * */ #include "webcit.h" @@ -13,7 +16,7 @@ #if HAVE_BACKTRACE #include #endif - +#include "modules_init.h" #ifndef HAVE_SNPRINTF int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp); #endif @@ -24,11 +27,15 @@ 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); +int DisableGzip = 0; +extern void *context_loop(ParsedHttpHdrs *Hdr); extern void *housekeeping_loop(void); extern pthread_mutex_t SessionListMutex; extern pthread_key_t MyConKey; +extern int ig_tcp_server(char *ip_addr, int port_number, int queue_len); +extern int ig_uds_server(char *sockpath, int queue_len); + char ctdl_key_dir[PATH_MAX]=SSL_DIR; char file_crpt_file_key[PATH_MAX]=""; @@ -36,10 +43,10 @@ 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 */ -static char static_icon_dir[PATH_MAX]; /* where should we find our mime icons? */ +const char editor_absolut_dir[PATH_MAX]=EDITORDIR; /* nailed to what configure gives us. */ +char static_dir[PATH_MAX]; /* calculated on startup */ +char static_local_dir[PATH_MAX]; /* calculated on startup */ +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 */ @@ -53,9 +60,9 @@ char *static_dirs[]={ /* needs same sort order as the web mapping */ * (If you add more, remember to increment 'ndirs' below) */ char *static_content_dirs[] = { - "static", /** static templates */ - "static.local", /** site local static templates */ - "tiny_mce" /** rich text editor */ + "static", /* static templates */ + "static.local", /* site local static templates */ + "tiny_mce" /* rich text editor */ }; int ndirs=3; @@ -70,425 +77,10 @@ char wizard_filename[PATH_MAX]; /* where's the setup wizard? */ int running_as_daemon = 0; /* should we deamonize on startup? */ -/* - * 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. - * - * 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) -{ - struct sockaddr_in sin; - int s, i; - - memset(&sin, 0, sizeof(sin)); - sin.sin_family = AF_INET; - if (ip_addr == NULL) { - sin.sin_addr.s_addr = INADDR_ANY; - } else { - sin.sin_addr.s_addr = inet_addr(ip_addr); - } - - if (sin.sin_addr.s_addr == INADDR_NONE) { - sin.sin_addr.s_addr = INADDR_ANY; - } - - if (port_number == 0) { - lprintf(1, "Cannot start: no port number specified.\n"); - exit(WC_EXIT_BIND); - } - sin.sin_port = htons((u_short) port_number); - - s = socket(PF_INET, SOCK_STREAM, (getprotobyname("tcp")->p_proto)); - if (s < 0) { - lprintf(1, "Can't create a socket: %s\n", strerror(errno)); - exit(WC_EXIT_BIND); - } - /* Set some socket options that make sense. */ - i = 1; - setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); - - 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)); - exit(WC_EXIT_BIND); - } - if (listen(s, queue_len) < 0) { - lprintf(1, "Can't listen: %s\n", strerror(errno)); - exit(WC_EXIT_BIND); - } - return (s); -} - - - -/* - * \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 - */ -int ig_uds_server(char *sockpath, int queue_len) -{ - struct sockaddr_un addr; - int s; - int i; - int actual_queue_len; - - actual_queue_len = queue_len; - if (actual_queue_len < 5) actual_queue_len = 5; - - i = unlink(sockpath); - if (i != 0) if (errno != ENOENT) { - lprintf(1, "webserver: can't unlink %s: %s\n", - sockpath, strerror(errno)); - exit(WC_EXIT_BIND); - } - - memset(&addr, 0, sizeof(addr)); - addr.sun_family = AF_UNIX; - safestrncpy(addr.sun_path, sockpath, sizeof addr.sun_path); - - s = socket(AF_UNIX, SOCK_STREAM, 0); - if (s < 0) { - 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, "webserver: Can't bind: %s\n", - strerror(errno)); - exit(WC_EXIT_BIND); - } - - if (listen(s, actual_queue_len) < 0) { - lprintf(1, "webserver: Can't listen: %s\n", - strerror(errno)); - exit(WC_EXIT_BIND); - } - - chmod(sockpath, 0777); - return(s); -} - - - - -/* - * \brief Read data from the client socket. - * \param sock socket fd to read from - * \param buf buffer to read into - * \param bytes number of bytes to read - * \param timeout Number of seconds to wait before timing out - * \return values are\ - * 1 Requested number of bytes has been read.\ - * 0 Request timed out.\ - * -1 Connection is broken, or other error. - */ -int client_read_to(int sock, char *buf, int bytes, int timeout) -{ - int len, rlen; - fd_set rfds; - struct timeval tv; - int retval; - - -#ifdef HAVE_OPENSSL - if (is_https) { - return (client_read_ssl(buf, bytes, timeout)); - } -#endif - - len = 0; - while (len < bytes) { - FD_ZERO(&rfds); - FD_SET(sock, &rfds); - tv.tv_sec = timeout; - tv.tv_usec = 0; - - retval = select((sock) + 1, &rfds, NULL, NULL, &tv); - if (FD_ISSET(sock, &rfds) == 0) { - return (0); - } - - rlen = read(sock, &buf[len], bytes - len); - - if (rlen < 1) { - lprintf(2, "client_read() failed: %s\n", - strerror(errno)); - return (-1); - } - len = len + rlen; - } - -#ifdef HTTP_TRACING - write(2, "\033[32m", 5); - write(2, buf, bytes); - write(2, "\033[30m", 5); -#endif - 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; - size_t bytesWritten = 0; - ssize_t res; - fd_set wset; - int fdflags; - - if (WC->burst != NULL) { - if ((WC->burst_len + count) >= WC->burst_alloc) { - newalloc = (WC->burst_alloc * 2); - if ((WC->burst_len + count) >= newalloc) { - newalloc += count; - } - newptr = realloc(WC->burst, newalloc); - if (newptr != NULL) { - WC->burst = newptr; - WC->burst_alloc = newalloc; - } - } - if ((WC->burst_len + count) < WC->burst_alloc) { - memcpy(&WC->burst[WC->burst_len], buf, count); - WC->burst_len += count; - return (count); - } - else { - return(-1); - } - } -#ifdef HAVE_OPENSSL - if (is_https) { - client_write_ssl((char *) buf, count); - return (count); - } -#endif -#ifdef HTTP_TRACING - write(2, "\033[34m", 5); - write(2, buf, count); - write(2, "\033[30m", 5); -#endif - 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) -{ - if (WC->burst != NULL) { - free(WC->burst); - WC->burst = NULL; - } - WC->burst_len = 0; - WC->burst_alloc = 32768; - WC->burst = malloc(WC->burst_alloc); -} - - -/* - * \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 */ -{ - const int gz_magic[2] = { 0x1f, 0x8b }; /* gzip magic 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 */ , - OS_CODE); - - /* normal deflate */ - z_stream stream; - int err; - stream.next_in = (Bytef *) source; - stream.avail_in = (uInt) sourceLen; - stream.next_out = dest + 10L; // after header - stream.avail_out = (uInt) * destLen; - if ((uLong) stream.avail_out != *destLen) - return Z_BUF_ERROR; - - stream.zalloc = (alloc_func) 0; - stream.zfree = (free_func) 0; - stream.opaque = (voidpf) 0; - - err = deflateInit2(&stream, level, Z_DEFLATED, -MAX_WBITS, - DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY); - if (err != Z_OK) - return err; - - err = deflate(&stream, Z_FINISH); - if (err != Z_STREAM_END) { - deflateEnd(&stream); - return err == Z_OK ? Z_BUF_ERROR : err; - } - *destLen = stream.total_out + 10L; - - /* write CRC and Length */ - uLong crc = crc32(0L, source, sourceLen); - int n; - for (n = 0; n < 4; ++n, ++*destLen) { - dest[*destLen] = (int) (crc & 0xff); - crc >>= 8; - } - uLong len = stream.total_in; - for (n = 0; n < 4; ++n, ++*destLen) { - dest[*destLen] = (int) (len & 0xff); - len >>= 8; - } - err = deflateEnd(&stream); - return err; -} -#endif /* - * \brief Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header. - */ -void end_burst(void) -{ - size_t the_len; - char *the_data; - - if (WC->burst == NULL) - return; - - the_len = WC->burst_len; - the_data = WC->burst; - - WC->burst_len = 0; - WC->burst_alloc = 0; - WC->burst = NULL; - -#ifdef HAVE_ZLIB - /* Perform gzip compression, if enabled and supported by client */ - if (WC->gzip_ok) { - char *compressed_data = NULL; - size_t compressed_len; - - compressed_len = ((the_len * 101) / 100) + 100; - compressed_data = malloc(compressed_len); - - if (compress_gzip((Bytef *) compressed_data, - &compressed_len, - (Bytef *) the_data, - (uLongf) the_len, Z_BEST_SPEED) == Z_OK) { - wprintf("Content-encoding: gzip\r\n"); - free(the_data); - the_data = compressed_data; - the_len = compressed_len; - } else { - free(compressed_data); - } - } -#endif /* HAVE_ZLIB */ - - wprintf("Content-length: %d\r\n\r\n", the_len); - client_write(the_data, the_len); - free(the_data); - return; -} - - - -/* - * \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) - * \param sock the socket fd to read from - * \param buf the buffer to write to - * \param bytes Number of bytes to read - */ -int client_read(int sock, char *buf, int bytes) -{ - return (client_read_to(sock, buf, bytes, SLEEPING)); -} - - -/* - * \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) - * \param sock socket fd to get client line from - * \param buf buffer to write read data to - * \param bufsiz how many bytes to read - * \return number of bytes read??? - */ -int client_getln(int sock, char *buf, int bufsiz) -{ - int i, retval; - - /* 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 */ - return(-1); - } - } - - /* 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; - while ((i > 0) && (!isprint(buf[i - 1]))) { - buf[--i] = 0; - } - return (retval); -} - -/* - * \brief shut us down the regular way. - * param signum the signal we want to forward + * Shut us down the regular way. + * signum is the signal we want to forward */ pid_t current_child; void graceful_shutdown_watcher(int signum) { @@ -498,13 +90,15 @@ void graceful_shutdown_watcher(int signum) { exit(0); } + + + /* - * \brief shut us down the regular way. - * param signum the signal we want to forward + * Shut us down the regular way. + * signum is the signal we want to forward */ pid_t current_child; void graceful_shutdown(int signum) { -// kill(current_child, signum); char wd[SIZ]; FILE *FD; int fd; @@ -520,12 +114,6 @@ void graceful_shutdown(int signum) { } -/* - * \brief Start running as a daemon. - * - * param do_close_stdio Only close stdio if set. - */ - /* * Start running as a daemon. */ @@ -567,19 +155,16 @@ void start_daemon(char *pid_file) if (current_child < 0) { perror("fork"); + ShutDownLibCitadel (); exit(errno); } - else if (current_child == 0) { // child process -// signal(SIGTERM, graceful_shutdown); + else if (current_child == 0) { /* child process */ signal(SIGHUP, graceful_shutdown); return; /* continue starting webcit. */ } - - else { // watcher process -// signal(SIGTERM, SIG_IGN); -// signal(SIGHUP, SIG_IGN); + else { /* watcher process */ if (pid_file) { fp = fopen(pid_file, "w"); if (fp != NULL) { @@ -621,16 +206,17 @@ void start_daemon(char *pid_file) if (pid_file) { unlink(pid_file); } + ShutDownLibCitadel (); exit(WEXITSTATUS(status)); } /* - * \brief Spawn an additional worker thread into the pool. + * 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"); @@ -661,19 +247,80 @@ void spawn_another_worker_thread() pthread_attr_destroy(&attr); } +/* #define DBG_PRINNT_HOOKS_AT_START */ +#ifdef DBG_PRINNT_HOOKS_AT_START +const char foobuf[32]; +const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;} +#endif +extern int dbg_analyze_msg; +extern int dbg_bactrace_template_errors; +extern int DumpTemplateI18NStrings; +extern StrBuf *I18nDump; +void InitTemplateCache(void); +extern int LoadTemplates; + +extern HashList *HandlerHash; + + + +void +webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdir, char *relhome) +{ + char dirbuffer[PATH_MAX]=""; + /* calculate all our path on a central place */ + /* where to keep our config */ + +#define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\ + snprintf(SUBDIR,sizeof SUBDIR, "%s%s%s%s%s%s%s", \ + (home&!relh)?webcitdir:basedir, \ + ((basedir!=webcitdir)&(home&!relh))?basedir:"/", \ + ((basedir!=webcitdir)&(home&!relh))?"/":"", \ + relhome, \ + (relhome[0]!='\0')?"/":"",\ + dirbuffer,\ + (dirbuffer[0]!='\0')?"/":""); + basedir=RUNDIR; + 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); + StripSlashes(static_dir, 1); + StripSlashes(static_icon_dir, 1); + StripSlashes(static_local_dir, 1); + + snprintf(file_crpt_file_key, + sizeof file_crpt_file_key, + "%s/citadel.key", + ctdl_key_dir); + snprintf(file_crpt_file_csr, + sizeof file_crpt_file_csr, + "%s/citadel.csr", + ctdl_key_dir); + snprintf(file_crpt_file_cer, + sizeof file_crpt_file_cer, + "%s/citadel.cer", + ctdl_key_dir); + + /* 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"); + } +} /* - * \brief Here's where it all begins. - * \param argc number of commandline args - * \param argv the commandline arguments + * Here's where it all begins. */ int main(int argc, char **argv) { - pthread_t SessThread; /*< Thread descriptor */ - pthread_attr_t attr; /*< Thread attributes */ - int a, i; /*< General-purpose variables */ + size_t basesize = 2; /* how big should strbufs be on creation? */ + 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]=""; int relh=0; int home=0; int home_specified=0; @@ -686,7 +333,16 @@ 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? */ + const char *I18nDumpFile = NULL; + + WildFireInitBacktrace(argv[0], 2); + + start_modules (); + +#ifdef DBG_PRINNT_HOOKS_AT_START +/* dbg_PrintHash(HandlerHash, nix, NULL);*/ +#endif /* Ensure that we are linked to the correct version of libcitadel */ if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) { @@ -701,9 +357,9 @@ int main(int argc, char **argv) /* Parse command line */ #ifdef HAVE_OPENSSL - while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cfs")) != EOF) + while ((a = getopt(argc, argv, "h:i:p:t:T:B:x:dD:G:cfsZ")) != EOF) #else - while ((a = getopt(argc, argv, "h:i:p:t:x:dD:cf")) != EOF) + while ((a = getopt(argc, argv, "h:i:p:t:T:B:x:dD:G:cfZ")) != EOF) #endif switch (a) { case 'h': @@ -725,6 +381,11 @@ int main(int argc, char **argv) pidfile = strdup(optarg); running_as_daemon = 1; break; + case 'B': /* Basesize */ + basesize = atoi(optarg); + if (basesize > 2) + StartLibCitadel(basesize); + break; case 'i': safestrncpy(ip_addr, optarg, sizeof ip_addr); break; @@ -740,6 +401,14 @@ int main(int argc, char **argv) freopen(tracefile, "w", stderr); freopen(tracefile, "r", stdin); break; + case 'T': + LoadTemplates = atoi(optarg); + dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0; + dbg_bactrace_template_errors = (LoadTemplates && (1<<2)) != 0; + break; + case 'Z': + DisableGzip = 1; + break; case 'x': verbosity = atoi(optarg); break; @@ -764,11 +433,17 @@ int main(int argc, char **argv) case 's': is_https = 1; break; + case 'G': + DumpTemplateI18NStrings = 1; + I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n")); + I18nDumpFile = optarg; + break; default: - fprintf(stderr, "usage: webserver " + fprintf(stderr, "usage: webcit " "[-i ip_addr] [-p http_port] " "[-t tracefile] [-c] [-f] " - "[-d] " + "[-T Templatedebuglevel] " + "[-d] [-Z] [-G i18ndumpfile] " #ifdef HAVE_OPENSSL "[-s] " #endif @@ -783,17 +458,19 @@ int main(int argc, char **argv) } /* daemonize, if we were asked to */ - if (running_as_daemon) { + if (!DumpTemplateI18NStrings && running_as_daemon) { start_daemon(pidfile); } else { -/// signal(SIGTERM, graceful_shutdown); signal(SIGHUP, graceful_shutdown); } + webcit_calc_dirs_n_files(relh, basedir, home, webcitdir, relhome); + LoadIconDir(static_icon_dir); + /* Tell 'em who's in da house */ lprintf(1, PACKAGE_STRING "\n"); - lprintf(1, "Copyright (C) 1996-2008 by the Citadel development team.\n" + lprintf(1, "Copyright (C) 1996-2009 by the Citadel development team.\n" "This software is distributed under the terms of the " "GNU General Public License.\n\n" ); @@ -803,6 +480,7 @@ int main(int argc, char **argv) #ifdef ENABLE_NLS initialize_locales(); + locale = setlocale(LC_ALL, ""); mo = malloc(strlen(webcitdir) + 20); @@ -810,52 +488,40 @@ int main(int argc, char **argv) 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 + initialise_modules(); + initialize_viewdefs(); + initialize_axdefs(); - /* calculate all our path on a central place */ - /* where to keep our config */ - -#define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\ - snprintf(SUBDIR,sizeof SUBDIR, "%s%s%s%s%s%s%s", \ - (home&!relh)?webcitdir:basedir, \ - ((basedir!=webcitdir)&(home&!relh))?basedir:"/", \ - ((basedir!=webcitdir)&(home&!relh))?"/":"", \ - relhome, \ - (relhome[0]!='\0')?"/":"",\ - dirbuffer,\ - (dirbuffer[0]!='\0')?"/":""); - basedir=RUNDIR; - 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); + InitTemplateCache(); + if (DumpTemplateI18NStrings) { + FILE *fd; + StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0); + if (StrLength(I18nDump) < 50) { + lprintf(1, "********************************************************************************\n"); + lprintf(1, "* No strings found in templates! are you shure they're there? *\n"); + lprintf(1, "********************************************************************************\n"); + return -1; + } + fd = fopen(I18nDumpFile, "w"); + if (fd == NULL) { + lprintf(1, "********************************************************************************\n"); + lprintf(1, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile); + lprintf(1, "********************************************************************************\n"); + return -1; + } + fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd); + fclose(fd); + return 0; + } - snprintf(file_crpt_file_key, - sizeof file_crpt_file_key, - "%s/citadel.key", - ctdl_key_dir); - snprintf(file_crpt_file_csr, - sizeof file_crpt_file_csr, - "%s/citadel.csr", - ctdl_key_dir); - snprintf(file_crpt_file_cer, - sizeof file_crpt_file_cer, - "%s/citadel.cer", - ctdl_key_dir); - /* 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(); + /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */ + icalerror_errors_are_fatal = 0; + + /* Use our own prefix on tzid's generated from system tzdata */ + icaltimezone_set_tzid_prefix("/citadel.org/"); /* * Set up a place to put thread-specific data. @@ -924,10 +590,28 @@ int main(int argc, char **argv) /* now the original thread becomes another worker */ worker_entry(); + ShutDownLibCitadel (); return 0; } +void ShutDownWebcit(void) +{ + free_zone_directory (); + icaltimezone_release_zone_tab (); + icalmemory_free_ring (); + ShutDownLibCitadel (); + shutdown_modules (); +#ifdef ENABLE_NLS + ShutdownLocale(); +#endif +#ifdef HAVE_OPENSSL + if (is_https) { + shutdown_ssl(); + } +#endif +} + /* * Entry point for worker threads */ @@ -939,7 +623,11 @@ void worker_entry(void) int ret; struct timeval tv; fd_set readset, tempset; + ParsedHttpHdrs Hdr; + memset(&Hdr, 0, sizeof(ParsedHttpHdrs)); + Hdr.HR.eReqType = eGET; + http_new_modules(&Hdr); tv.tv_sec = 0; tv.tv_usec = 10000; FD_ZERO(&readset); @@ -961,19 +649,19 @@ void worker_entry(void) if (msock > 0) ret = select(msock+1, &tempset, NULL, NULL, &tv); end_critical_section(S_SELECT); if ((ret < 0) && (errno != EINTR) && (errno != EAGAIN)) - {// EINTR and EAGAIN are thrown but not of interest. + {/* EINTR and EAGAIN are thrown but not of interest. */ lprintf(2, "accept() failed:%d %s\n", errno, strerror(errno)); } else if ((ret > 0) && (msock > 0) && FD_ISSET(msock, &tempset)) - {// Successfully selected, and still not shutting down? Accept! + {/* Successfully selected, and still not shutting down? Accept! */ ssock = accept(msock, NULL, 0); } } while ((msock > 0) && (ssock < 0) && (time_to_die == 0)); if ((msock == -1)||(time_to_die)) - {// ok, we're going down. + {/* ok, we're going down. */ int shutdown = 0; /* the first to come here will have to do the cleanup. @@ -987,17 +675,18 @@ void worker_entry(void) } end_critical_section(S_SHUTDOWN); if (shutdown == 1) - {// we're the one to cleanup the mess. + {/* we're the one to cleanup the mess. */ + http_destroy_modules(&Hdr); lprintf(2, "I'm master shutdown: tagging sessions to be killed.\n"); shutdown_sessions(); lprintf(2, "master shutdown: waiting for others\n"); - sleeeeeeeeeep(1); // wait so some others might finish... + sleeeeeeeeeep(1); /* wait so some others might finish... */ lprintf(2, "master shutdown: cleaning up sessions\n"); do_housekeeping(); lprintf(2, "master shutdown: cleaning up libical\n"); - free_zone_directory (); - icaltimezone_release_zone_tab (); - icalmemory_free_ring (); + + ShutDownWebcit(); + lprintf(2, "master shutdown exiting!.\n"); exit(0); } @@ -1009,7 +698,7 @@ void worker_entry(void) if (ssock > 0) close (ssock); lprintf(2, "inbetween."); pthread_exit(NULL); - } else { // Got it? do some real work! + } else { /* Got it? do some real work! */ /* Set the SO_REUSEADDR socket option */ i = 1; setsockopt(ssock, SOL_SOCKET, SO_REUSEADDR, @@ -1023,12 +712,25 @@ void worker_entry(void) close(ssock); } } + else + { + int fdflags; + fdflags = fcntl(ssock, F_GETFL); + if (fdflags < 0) + lprintf(1, "unable to get server socket flags! %s \n", + strerror(errno)); + fdflags = fdflags | O_NONBLOCK; + if (fcntl(ssock, F_SETFD, fdflags) < 0) + lprintf(1, "unable to set server socket nonblocking flags! %s \n", + strerror(errno)); + } #endif if (fail_this_transaction == 0) { + Hdr.http_sock = ssock; /* Perform an HTTP transaction... */ - context_loop(ssock); + context_loop(&Hdr); /* Shut down SSL/TLS if required... */ #ifdef HAVE_OPENSSL @@ -1038,23 +740,28 @@ void worker_entry(void) #endif /* ...and close the socket. */ - lingering_close(ssock); + if (Hdr.http_sock > 0) + lingering_close(ssock); + http_detach_modules(&Hdr); + } } } while (!time_to_die); + http_destroy_modules(&Hdr); lprintf (1, "bye\n"); pthread_exit(NULL); } /* - * \brief logprintf. log messages + * print log messages * logs to stderr if loglevel is lower than the verbosity set at startup - * \param loglevel level of the message - * \param format the printf like format string - * \param ... the strings to put into format + * + * loglevel level of the message + * format the printf like format string + * ... the strings to put into format */ int lprintf(int loglevel, const char *format, ...) { @@ -1071,7 +778,7 @@ int lprintf(int loglevel, const char *format, ...) /* - * \brief print the actual stack frame. + * print the actual stack frame. */ void wc_backtrace(void) { @@ -1093,4 +800,6 @@ void wc_backtrace(void) #endif } -/*@}*/ + + +