X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=517a9d30799ef93c18f7a26171e52411182a0dce;hb=8c321fbcc2a64f0d0627562fdf5651442e525ab1;hp=32887f47c642a0a0bd0421431bb751bde7aa1c07;hpb=f0d4dec106f607b5bbd5bb1cf1467c55ffefa8c8;p=citadel.git diff --git a/webcit/webserver.c b/webcit/webserver.c index 32887f47c..517a9d307 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-2008 by the citadel.org developers. + * This program is released under the terms of the GNU General Public License v3. + * */ #include "webcit.h" @@ -24,7 +27,8 @@ 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(int*); extern void *housekeeping_loop(void); extern pthread_mutex_t SessionListMutex; extern pthread_key_t MyConKey; @@ -110,10 +114,12 @@ int ig_tcp_server(char *ip_addr, int port_number, int queue_len) i = 1; setsockopt(s, SOL_SOCKET, SO_REUSEADDR, &i, sizeof(i)); + #ifndef __APPLE__ 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 */ + #endif if (bind(s, (struct sockaddr *) &sin, sizeof(sin)) < 0) { lprintf(1, "Can't bind: %s\n", strerror(errno)); @@ -144,7 +150,7 @@ int ig_uds_server(char *sockpath, int queue_len) if (actual_queue_len < 5) actual_queue_len = 5; i = unlink(sockpath); - if (i != 0) if (errno != ENOENT) { + if ((i != 0) && (errno != ENOENT)) { lprintf(1, "webcit: can't unlink %s: %s\n", sockpath, strerror(errno)); exit(WC_EXIT_BIND); @@ -193,40 +199,44 @@ int ig_uds_server(char *sockpath, int queue_len) * 0 Request timed out. * -1 Connection is broken, or other error. */ -int client_read_to(int sock, char *buf, int bytes, int timeout) +int client_read_to(int *sock, StrBuf *Target, StrBuf *Buf, int bytes, int timeout) { - int len, rlen; - fd_set rfds; - struct timeval tv; - int retval; - + const char *Error; + int retval = 0; #ifdef HAVE_OPENSSL if (is_https) { - return (client_read_ssl(buf, bytes, timeout)); - } + while ((StrLength(Buf) + StrLength(Target) < bytes) && + (retval >= 0)) + retval = client_read_sslbuffer(Buf, timeout); + if (retval >= 0) { + StrBufAppendBuf(Target, Buf, 0); /// todo: Buf > bytes? +#ifdef HTTP_TRACING + write(2, "\033[32m", 5); + write(2, buf, bytes); + write(2, "\033[30m", 5); #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); + return 1; } - - rlen = read(sock, &buf[len], bytes - len); - - if (rlen < 1) { - lprintf(2, "client_read() failed: %s\n", - strerror(errno)); - return (-1); + else { + lprintf(2, "client_read_ssl() failed\n"); + return -1; } - len = len + rlen; + } +#endif + + if (StrLength(Buf) > 0) {//// todo: what if Buf > bytes? + StrBufAppendBuf(Target, Buf, 0); + } + retval = StrBufReadBLOB(Target, + sock, + (StrLength(Target) > 0), + bytes - StrLength(Target), + &Error); + if (retval < 0) { + lprintf(2, "client_read() failed: %s\n", + Error); + return retval; } #ifdef HTTP_TRACING @@ -234,11 +244,12 @@ int client_read_to(int sock, char *buf, int bytes, int timeout) write(2, buf, bytes); write(2, "\033[30m", 5); #endif - return (1); + return 1; } + /* - * \brief Begin buffering HTTP output so we can transmit it all in one write operation later. + * Begin buffering HTTP output so we can transmit it all in one write operation later. */ void begin_burst(void) { @@ -248,11 +259,11 @@ void begin_burst(void) /* - * \brief Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header. + * Finish buffering HTTP output. [Compress using zlib and] output with a Content-Length: header. */ long end_burst(void) { - struct wcsession *WCC = WC; + wcsession *WCC = WC; const char *ptr, *eptr; long count; ssize_t res; @@ -261,7 +272,7 @@ long end_burst(void) #ifdef HAVE_ZLIB /* Perform gzip compression, if enabled and supported by client */ - if ((WCC->gzip_ok) && CompressBuffer(WCC->WBuf)) + if (!DisableGzip && (WCC->gzip_ok) && CompressBuffer(WCC->WBuf)) { hprintf("Content-encoding: gzip\r\n"); } @@ -275,7 +286,8 @@ long end_burst(void) #ifdef HAVE_OPENSSL if (is_https) { - client_write_ssl(ptr, StrLength(WCC->HBuf)); + client_write_ssl(WCC->HBuf); + client_write_ssl(WCC->WBuf); return (count); } #endif @@ -289,7 +301,7 @@ long end_burst(void) #endif fdflags = fcntl(WC->http_sock, F_GETFL); - while (ptr < eptr) { + while (ptr < eptr) { if ((fdflags & O_NONBLOCK) == O_NONBLOCK) { FD_ZERO(&wset); FD_SET(WCC->http_sock, &wset); @@ -303,6 +315,7 @@ long end_burst(void) ptr, count)) == -1) { lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno)); + wc_backtrace(); return res; } count -= res; @@ -313,13 +326,6 @@ long end_burst(void) count = StrLength(WCC->WBuf); eptr = ptr + count; -#ifdef HAVE_OPENSSL - if (is_https) { - client_write_ssl(ptr, StrLength(WCC->HBuf)); - return (count); - } -#endif - #ifdef HTTP_TRACING write(2, "\033[34m", 5); @@ -341,6 +347,7 @@ long end_burst(void) ptr, count)) == -1) { lprintf(2, "client_write: Socket write failed (%s)\n", strerror(errno)); + wc_backtrace(); return res; } count -= res; @@ -353,61 +360,66 @@ long end_burst(void) /* - * \brief Read data from the client socket with default timeout. + * 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 + * + * sock the socket fd to read from + * buf the buffer to write to + * bytes Number of bytes to read */ -int client_read(int sock, char *buf, int bytes) +int client_read(int *sock, StrBuf *Target, StrBuf *buf, int bytes) { - return (client_read_to(sock, buf, bytes, SLEEPING)); + return (client_read_to(sock, Target, buf, bytes, SLEEPING)); } /* - * \brief Get a LF-terminated line of text from the client. + * 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??? + * + * sock socket fd to get client line from + * buf buffer to write read data to + * bufsiz how many bytes to read + * + * returns the 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); -} +/////int client_getln(int *sock, char *buf, int bufsiz) +/////{ +///// int i, retval; +///// +///// /* Read one character at a time.*/ +///// for (i = 0; *sock > 0; i++) { +///// retval = client_read(sock, &buf[i], 1); +///// if (retval < 0) +///// return retval; +///// 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) { @@ -417,9 +429,72 @@ void graceful_shutdown_watcher(int signum) { exit(0); } + +int ClientGetLine(int *sock, StrBuf *Target, StrBuf *CLineBuf) +{ + const char *Error, *pch, *pchs; + int rlen, len, retval = 0; + + if (is_https) { + int ntries = 0; + if (StrLength(CLineBuf) > 0) { + pchs = ChrPtr(CLineBuf); + pch = strchr(pchs, '\n'); + if (pch != NULL) { + rlen = 0; + len = pch - pchs; + if (len > 0 && (*(pch - 1) == '\r') ) + rlen ++; + StrBufSub(Target, CLineBuf, 0, len - rlen); + StrBufCutLeft(CLineBuf, len + 1); + return len - rlen; + } + } + + while (retval == 0) { + pch = NULL; + pchs = ChrPtr(CLineBuf); + if (*pchs != '\0') + pch = strchr(pchs, '\n'); + if (pch == NULL) { + retval = client_read_sslbuffer(CLineBuf, SLEEPING); + pchs = ChrPtr(CLineBuf); + pch = strchr(pchs, '\n'); + } + if (retval == 0) { + sleeeeeeeeeep(1); + ntries ++; + } + if (ntries > 10) + return 0; + } + if ((retval > 0) && (pch != NULL)) { + rlen = 0; + len = pch - pchs; + if (len > 0 && (*(pch - 1) == '\r') ) + rlen ++; + StrBufSub(Target, CLineBuf, 0, len - rlen); + StrBufCutLeft(CLineBuf, len + 1); + return len - rlen; + + } + else + return -1; + } + else + return StrBufTCP_read_buffered_line(Target, + CLineBuf, + sock, + 5, + 1, + &Error); +} + + + /* - * \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) { @@ -439,12 +514,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. */ @@ -546,12 +615,12 @@ void start_daemon(char *pid_file) } /* - * \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"); @@ -588,17 +657,17 @@ const char foobuf[32]; const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;} #endif void InitTemplateCache(void); - +extern int LoadTemplates; +extern void LoadZoneFiles(void); +StrBuf *csslocal = NULL; /* - * \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 */ + 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]=""; @@ -614,7 +683,7 @@ 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? */ HandlerHash = NewHash(1, NULL); PreferenceHooks = NewHash(1, NULL); @@ -624,7 +693,22 @@ int main(int argc, char **argv) TemplateCache = NewHash(1, NULL); GlobalNS = NewHash(1, NULL); Iterators = NewHash(1, NULL); - + Conditionals = NewHash(1, NULL); + MsgHeaderHandler = NewHash(1, NULL); + MimeRenderHandler = NewHash(1, NULL); + SortHash = NewHash(1, NULL); + + LoadZoneFiles(); + StrBuf *foo=NewStrBufPlain("", -1); + StrBuf *bar = NewStrBufPlain("A", -1); + + StrBufExtract_token(bar, foo, 0, '|'); + StrBufExtract_token(bar, foo, 1, '|'); + StrBufExtract_token(bar, foo, 2, '|'); + StrBufExtract_token(bar, foo, 3, '|'); + StrBufExtract_token(bar, foo, 4, '|'); + StrBufExtract_token(bar, foo, 5, '|'); + StrBufExtract_token(bar, foo, 6, '|'); #ifdef DBG_PRINNT_HOOKS_AT_START dbg_PrintHash(HandlerHash, nix, NULL); @@ -643,9 +727,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:x:dD: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:x:dD:cfZ")) != EOF) #endif switch (a) { case 'h': @@ -682,6 +766,12 @@ int main(int argc, char **argv) freopen(tracefile, "w", stderr); freopen(tracefile, "r", stdin); break; + case 'T': + LoadTemplates = atoi(optarg); + break; + case 'Z': + DisableGzip = 1; + break; case 'x': verbosity = atoi(optarg); break; @@ -710,7 +800,8 @@ int main(int argc, char **argv) fprintf(stderr, "usage: webcit " "[-i ip_addr] [-p http_port] " "[-t tracefile] [-c] [-f] " - "[-d] " + "[-T Templatedebuglevel] " + "[-d] [-Z] " #ifdef HAVE_OPENSSL "[-s] " #endif @@ -796,12 +887,23 @@ int main(int argc, char **argv) perror("chdir"); } LoadIconDir(static_icon_dir); - InitTemplateCache(); initialise_modules(); initialize_viewdefs(); initialize_axdefs(); + InitTemplateCache(); + + if (!access("static.local/webcit.css", R_OK)) { + csslocal = NewStrBufPlain(HKEY("")); + } + + /* 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. * We only need a single pointer per thread - it points to the @@ -876,6 +978,35 @@ int main(int argc, char **argv) } +void ShutDownWebcit(void) +{ + DeleteHash(&ZoneHash); + free_zone_directory (); + icaltimezone_release_zone_tab (); + icalmemory_free_ring (); + ShutDownLibCitadel (); + DeleteHash(&HandlerHash); + DeleteHash(&PreferenceHooks); + DeleteHash(&GlobalNS); + DeleteHash(&WirelessTemplateCache); + DeleteHash(&WirelessLocalTemplateCache); + DeleteHash(&TemplateCache); + DeleteHash(&LocalTemplateCache); + DeleteHash(&Iterators); + DeleteHash(&MimeRenderHandler); + DeleteHash(&Conditionals); + DeleteHash(&MsgHeaderHandler); + DeleteHash(&SortHash); +#ifdef ENABLE_NLS + ShutdownLocale(); +#endif +#ifdef HAVE_OPENSSL + if (is_https) { + shutdown_ssl(); + } +#endif +} + /* * Entry point for worker threads */ @@ -943,21 +1074,9 @@ void worker_entry(void) 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 (); - ShutDownLibCitadel (); - DeleteHash(&HandlerHash); - DeleteHash(&PreferenceHooks); - DeleteHash(&GlobalNS); - DeleteHash(&WirelessTemplateCache); - DeleteHash(&WirelessLocalTemplateCache); - DeleteHash(&TemplateCache); - DeleteHash(&LocalTemplateCache); - DeleteHash(&Iterators); -#ifdef ENABLE_NLS - void ShutdownLocale(void); -#endif + + ShutDownWebcit(); + lprintf(2, "master shutdown exiting!.\n"); exit(0); } @@ -988,7 +1107,7 @@ void worker_entry(void) if (fail_this_transaction == 0) { /* Perform an HTTP transaction... */ - context_loop(ssock); + context_loop(&ssock); /* Shut down SSL/TLS if required... */ #ifdef HAVE_OPENSSL @@ -998,7 +1117,8 @@ void worker_entry(void) #endif /* ...and close the socket. */ - lingering_close(ssock); + if (ssock > 0) + lingering_close(ssock); } } @@ -1010,11 +1130,12 @@ void worker_entry(void) } /* - * \brief print 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, ...) { @@ -1031,7 +1152,7 @@ int lprintf(int loglevel, const char *format, ...) /* - * \brief print the actual stack frame. + * print the actual stack frame. */ void wc_backtrace(void) { @@ -1053,4 +1174,3 @@ void wc_backtrace(void) #endif } -/*@}*/