X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=24fd560211f6d2c7ee87c74ee568cf073a7d7e38;hb=6d051cee6f669b6ecd950e933a95644f3cf097ea;hp=ef1c5eb8e66cd4ef1b19eccaff7f80c76b59397a;hpb=d04995c5146e2987bea4875e88c5e6da04ecc048;p=citadel.git diff --git a/webcit/webserver.c b/webcit/webserver.c index ef1c5eb8e..24fd56021 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -1,29 +1,26 @@ /* - * 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. + * Copyright (c) 1996-2020 by the citadel.org team * - * Copyright (c) 1996-2011 by the citadel.org developers. - * This program is released under the terms of the GNU General Public License v3. + * This program is open source software. You can redistribute it and/or + * modify 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. */ #include "webcit.h" #include "webserver.h" #include "modules_init.h" -#ifndef HAVE_SNPRINTF -int vsnprintf(char *buf, size_t max, const char *fmt, va_list argp); -#endif - extern int msock; /* master listening socket */ -extern int verbosity; /* Logging level */ extern char static_icon_dir[PATH_MAX]; /* where should we find our mime icons */ int is_https = 0; /* Nonzero if I am an HTTPS service */ int follow_xff = 0; /* Follow X-Forwarded-For: header? */ int DisableGzip = 0; -char *default_landing_page = NULL; /* FIXME we need to populate this somehow */ +char *default_landing_page = NULL; extern pthread_mutex_t SessionListMutex; extern pthread_key_t MyConKey; @@ -46,13 +43,13 @@ int setup_wizard = 0; /* should we run the setup wizard? */ char wizard_filename[PATH_MAX]; /* location of file containing the last webcit version against which we ran setup wizard */ int running_as_daemon = 0; /* should we deamonize on startup? */ - /* #define DBG_PRINNT_HOOKS_AT_START */ #ifdef DBG_PRINNT_HOOKS_AT_START extern HashList *HandlerHash; const char foobuf[32]; const char *nix(void *vptr) {snprintf(foobuf, 32, "%0x", (long) vptr); return foobuf;} #endif +extern int verbose; extern int dbg_analyze_msg; extern int dbg_backtrace_template_errors; extern int DumpTemplateI18NStrings; @@ -60,9 +57,7 @@ extern StrBuf *I18nDump; void InitTemplateCache(void); extern int LoadTemplates; - - - +void LoadMimeBlacklist(void); /* * Here's where it all begins. @@ -74,7 +69,6 @@ int main(int argc, char **argv) pthread_t SessThread; /* Thread descriptor */ pthread_attr_t attr; /* Thread attributes */ int a; /* General-purpose variable */ - char tracefile[PATH_MAX]; char ip_addr[256]="*"; int relh=0; int home=0; @@ -85,12 +79,10 @@ int main(int argc, char **argv) const char *basedir = NULL; char uds_listen_path[PATH_MAX]; /* listen on a unix domain socket? */ const char *I18nDumpFile = NULL; - FILE *rvfp = NULL; - int rv = 0; WildFireInitBacktrace(argv[0], 2); - start_modules (); + start_modules(); #ifdef DBG_PRINNT_HOOKS_AT_START /* dbg_PrintHash(HandlerHash, nix, NULL);*/ @@ -98,10 +90,8 @@ int main(int argc, char **argv) /* 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)); + fprintf(stderr, " You are running libcitadel version %d\n", libcitadel_version_number() ); + fprintf(stderr, "WebCit was compiled against version %d\n", LIBCITADEL_VERSION_NUMBER ); return(1); } @@ -109,9 +99,9 @@ int main(int argc, char **argv) /* Parse command line */ #ifdef HAVE_OPENSSL - while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z")) != EOF) + while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z:v:")) != EOF) #else - while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfZ")) != EOF) + while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfZ:v:")) != EOF) #endif switch (a) { case 'u': @@ -154,21 +144,18 @@ int main(int argc, char **argv) } break; case 't': - safestrncpy(tracefile, optarg, sizeof tracefile); - rvfp = freopen(tracefile, "w", stdout); - rvfp = freopen(tracefile, "w", stderr); - rvfp = freopen(tracefile, "r", stdin); + /* no longer used, but ignored so old scripts don't break */ break; case 'T': LoadTemplates = atoi(optarg); - dbg_analyze_msg = (LoadTemplates && (1<<1)) != 0; - dbg_backtrace_template_errors = (LoadTemplates && (1<<2)) != 0; + dbg_analyze_msg = (LoadTemplates & (1<<1)) != 0; + dbg_backtrace_template_errors = (LoadTemplates & (1<<2)) != 0; break; case 'Z': DisableGzip = 1; break; case 'x': - verbosity = atoi(optarg); + /* no longer used, but ignored so old scripts don't break */ break; case 'f': follow_xff = 1; @@ -182,7 +169,7 @@ int main(int argc, char **argv) if (gethostname (&server_cookie[strlen(server_cookie)], 200) != 0) { - syslog(2, "gethostname: %s", strerror(errno)); + syslog(LOG_INFO, "gethostname: %s", strerror(errno)); free(server_cookie); } } @@ -201,12 +188,18 @@ int main(int argc, char **argv) I18nDump = NewStrBufPlain(HKEY("int templatestrings(void)\n{\n")); I18nDumpFile = optarg; break; + case 'v': + verbose=1; + break; default: - fprintf(stderr, "usage: webcit " + fprintf(stderr, "usage:\nwebcit " "[-i ip_addr] [-p http_port] " - "[-t tracefile] [-c] [-f] " + "[-c] [-f] " "[-T Templatedebuglevel] " "[-d] [-Z] [-G i18ndumpfile] " + "[-u uid] [-h homedirectory] " + "[-D daemonizepid] [-v] " + "[-g defaultlandingpage] [-B basesize] " #ifdef HAVE_OPENSSL "[-s] [-S cipher_suites]" #endif @@ -236,55 +229,55 @@ int main(int argc, char **argv) } webcit_calc_dirs_n_files(relh, basedir, home, webcitdir, relhome); + LoadMimeBlacklist(); LoadIconDir(static_icon_dir); /* Tell 'em who's in da house */ - syslog(1, "%s", PACKAGE_STRING); - syslog(1, "Copyright (C) 1996-2011 by the citadel.org team"); - syslog(1, " "); - syslog(1, "This program is open source software: you can redistribute it and/or"); - syslog(1, "modify it under the terms of the GNU General Public License as published"); - syslog(1, "by the Free Software Foundation, either version 3 of the License, or"); - syslog(1, "(at your option) any later version."); - syslog(1, " "); - syslog(1, "This program is distributed in the hope that it will be useful,"); - syslog(1, "but WITHOUT ANY WARRANTY; without even the implied warranty of"); - syslog(1, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the"); - syslog(1, "GNU General Public License for more details."); - syslog(1, " "); - syslog(1, "You should have received a copy of the GNU General Public License"); - syslog(1, "along with this program. If not, see ."); - syslog(1, " "); - + syslog(LOG_NOTICE, "%s", PACKAGE_STRING); + syslog(LOG_NOTICE, "Copyright (C) 1996-2020 by the citadel.org team"); + syslog(LOG_NOTICE, " "); + syslog(LOG_NOTICE, "This program is open source software: you can redistribute it and/or"); + syslog(LOG_NOTICE, "modify it under the terms of the GNU General Public License, version 3."); + syslog(LOG_NOTICE, " "); + syslog(LOG_NOTICE, "This program is distributed in the hope that it will be useful,"); + syslog(LOG_NOTICE, "but WITHOUT ANY WARRANTY; without even the implied warranty of"); + syslog(LOG_NOTICE, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the"); + syslog(LOG_NOTICE, "GNU General Public License for more details."); + syslog(LOG_NOTICE, " "); /* initialize various subsystems */ initialise_modules(); + initialise2_modules(); InitTemplateCache(); if (DumpTemplateI18NStrings) { FILE *fd; StrBufAppendBufPlain(I18nDump, HKEY("}\n"), 0); if (StrLength(I18nDump) < 50) { - syslog(1, "********************************************************************************\n"); - syslog(1, "* No strings found in templates! Are you sure they're there? *\n"); - syslog(1, "********************************************************************************\n"); + syslog(LOG_INFO, "*******************************************************************\n"); + syslog(LOG_INFO, "* No strings found in templates! Are you sure they're there? *\n"); + syslog(LOG_INFO, "*******************************************************************\n"); return -1; } fd = fopen(I18nDumpFile, "w"); if (fd == NULL) { - syslog(1, "********************************************************************************\n"); - syslog(1, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile); - syslog(1, "********************************************************************************\n"); + syslog(LOG_INFO, "***********************************************\n"); + syslog(LOG_INFO, "* unable to open I18N dumpfile [%s] *\n", I18nDumpFile); + syslog(LOG_INFO, "***********************************************\n"); return -1; } - rv = fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd); + fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd); fclose(fd); return 0; } - /* Tell libical to return an error instead of aborting if it sees badly formed iCalendar data. */ - icalerror_errors_are_fatal = 0; + +#ifdef LIBICAL_ICAL_EXPORT // cheap and sleazy way to detect libical >=2.0 + icalerror_set_errors_are_fatal(0); +#else + icalerror_errors_are_fatal = 0; +#endif /* Use our own prefix on tzid's generated from system tzdata */ icaltimezone_set_tzid_prefix("/citadel.org/"); @@ -295,9 +288,9 @@ int main(int argc, char **argv) * wcsession struct to which the thread is currently bound. */ if (pthread_key_create(&MyConKey, NULL) != 0) { - syslog(1, "Can't create TSD key: %s\n", strerror(errno)); + syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno)); } - InitialiseSemaphores (); + InitialiseSemaphores(); /* * Set up a place to put thread-specific SSL data. @@ -307,7 +300,7 @@ int main(int argc, char **argv) */ #ifdef HAVE_OPENSSL if (pthread_key_create(&ThreadSSL, NULL) != 0) { - syslog(1, "Can't create TSD key: %s\n", strerror(errno)); + syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno)); } #endif @@ -318,11 +311,11 @@ int main(int argc, char **argv) */ if (!IsEmptyStr(uds_listen_path)) { - syslog(2, "Attempting to create listener socket at %s...\n", uds_listen_path); + syslog(LOG_DEBUG, "Attempting to create listener socket at %s...", uds_listen_path); msock = webcit_uds_server(uds_listen_path, LISTEN_QUEUE_LENGTH); } else { - syslog(2, "Attempting to bind to port %d...\n", http_port); + syslog(LOG_DEBUG, "Attempting to bind to port %d...", http_port); msock = webcit_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH); } if (msock < 0) @@ -331,7 +324,7 @@ int main(int argc, char **argv) return -msock; } - syslog(2, "Listening on socket %d\n", msock); + syslog(LOG_INFO, "Listening on socket %d", msock); signal(SIGPIPE, SIG_IGN); pthread_mutex_init(&SessionListMutex, NULL); @@ -341,9 +334,7 @@ int main(int argc, char **argv) */ pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); - pthread_create(&SessThread, &attr, - (void *(*)(void *)) housekeeping_loop, NULL); - + pthread_create(&SessThread, &attr, (void *(*)(void *)) housekeeping_loop, NULL); /* * If this is an HTTPS server, fire up SSL