X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fwebserver.c;h=e814364d17a3e468bc9f1868ce0916baa91da0fa;hb=HEAD;hp=509d128f71e4806c994ce920b37a4d1bd27f885e;hpb=51ef89b985072d0bfe423c34575c8851aa16a606;p=citadel.git diff --git a/webcit/webserver.c b/webcit/webserver.c index 509d128f7..b10d5e9c3 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -1,17 +1,9 @@ -/* - * Copyright (c) 1996-2014 by the citadel.org team - * - * 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. - */ +// Copyright (c) 1996-2024 by the citadel.org team +// +// This program is open source software. Use, duplication, or disclosure +// is subject to the terms of the GNU General Public License version 3. #include "webcit.h" -#include "webserver.h" #include "modules_init.h" @@ -22,7 +14,6 @@ int follow_xff = 0; /* Follow X-Forwarded-For: header? */ int DisableGzip = 0; char *default_landing_page = NULL; extern pthread_mutex_t SessionListMutex; -extern pthread_key_t MyConKey; extern void *housekeeping_loop(void); extern int webcit_tcp_server(char *ip_addr, int port_number, int queue_len); @@ -34,14 +25,11 @@ extern void webcit_calc_dirs_n_files(int relh, const char *basedir, int home, ch extern void worker_entry(void); extern void drop_root(uid_t UID); -char socket_dir[PATH_MAX]; /* where to talk to our citadel server */ -char *server_cookie = NULL; /* our Cookie connection to the client */ -int http_port = PORT_NUM; /* Port to listen on */ -char *ctdlhost = DEFAULT_HOST; /* Host name or IP address of Citadel server */ -char *ctdlport = DEFAULT_PORT; /* Port number of Citadel server */ -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? */ +char socket_dir[PATH_MAX]; /* where to talk to our citadel server */ +char *server_cookie = NULL; /* our Cookie connection to the client */ +int http_port = PORT_NUM; /* Port to listen on */ +int running_as_daemon = 0; /* should we deamonize on startup? */ +char *ctdl_dir = DEFAULT_CTDLDIR; /* Directory where Citadel Server is running */ /* #define DBG_PRINNT_HOOKS_AT_START */ #ifdef DBG_PRINNT_HOOKS_AT_START @@ -49,6 +37,7 @@ 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; @@ -61,10 +50,8 @@ void LoadMimeBlacklist(void); /* * Here's where it all begins. */ -int main(int argc, char **argv) -{ +int main(int argc, char **argv) { uid_t UID = -1; - size_t basesize = 2; /* how big should strbufs be on creation? */ pthread_t SessThread; /* Thread descriptor */ pthread_attr_t attr; /* Thread attributes */ int a; /* General-purpose variable */ @@ -78,6 +65,7 @@ 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; + int max_log_level = LOG_INFO; WildFireInitBacktrace(argv[0], 2); @@ -89,10 +77,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); } @@ -100,9 +86,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': @@ -117,7 +103,6 @@ int main(int argc, char **argv) else { safestrncpy(relhome, relhome, sizeof relhome); } - /* free(hdir); TODO: SHOULD WE DO THIS? */ home=1; break; case 'd': @@ -130,10 +115,7 @@ int main(int argc, char **argv) case 'g': default_landing_page = strdup(optarg); break; - case 'B': /* Basesize */ - basesize = atoi(optarg); - if (basesize > 2) - StartLibCitadel(basesize); + case 'B': /* deprecated */ break; case 'i': safestrncpy(ip_addr, optarg, sizeof ip_addr); @@ -149,14 +131,14 @@ int main(int argc, char **argv) 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': - /* no longer used, but ignored so old scripts don't break */ + max_log_level = atoi(optarg); break; case 'f': follow_xff = 1; @@ -164,12 +146,8 @@ int main(int argc, char **argv) case 'c': server_cookie = malloc(256); if (server_cookie != NULL) { - safestrncpy(server_cookie, - "Set-cookie: wcserver=", - 256); - if (gethostname - (&server_cookie[strlen(server_cookie)], - 200) != 0) { + safestrncpy(server_cookie, "Set-cookie: wcserver=", 256); + if (gethostname (&server_cookie[strlen(server_cookie)], 200) != 0) { syslog(LOG_INFO, "gethostname: %s", strerror(errno)); free(server_cookie); } @@ -189,29 +167,35 @@ 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] " "[-c] [-f] " "[-T Templatedebuglevel] " "[-d] [-Z] [-G i18ndumpfile] " + "[-u uid] [-h homedirectory] " + "[-D daemonizepid] [-v] " + "[-g defaultlandingpage] " #ifdef HAVE_OPENSSL "[-s] [-S cipher_suites]" #endif - "[remotehost [remoteport]]\n"); + "[citadel_server_directory]\n"); return 1; } /* Start the logger */ + setlogmask(LOG_UPTO(max_log_level)); openlog("webcit", ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ), LOG_DAEMON ); - if (optind < argc) { - ctdlhost = argv[optind]; - if (++optind < argc) - ctdlport = argv[optind]; + while (optind < argc) { + ctdl_dir = strdup(argv[optind]); + ++optind; } /* daemonize, if we were asked to */ @@ -229,19 +213,19 @@ int main(int argc, char **argv) /* Tell 'em who's in da house */ syslog(LOG_NOTICE, "%s", PACKAGE_STRING); - syslog(LOG_NOTICE, "Copyright (C) 1996-2014 by the citadel.org team"); + syslog(LOG_NOTICE, "Copyright (C) 1996-2024 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, "This program is open source software. Use, duplication, or disclosure"); + syslog(LOG_NOTICE, "is subject to the terms of the GNU General Public License, version 3."); syslog(LOG_NOTICE, " "); - /* initialize various subsystems */ + /* run from the webcit home directory */ + if (chdir(webcitdir) != 0) { + syslog(LOG_ERR, "webcit: %s: %m", webcitdir); + exit(errno); + } + /* initialize various subsystems */ initialise_modules(); initialise2_modules(); InitTemplateCache(); @@ -267,7 +251,12 @@ int main(int argc, char **argv) } /* 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/"); @@ -278,7 +267,7 @@ int main(int argc, char **argv) * wcsession struct to which the thread is currently bound. */ if (pthread_key_create(&MyConKey, NULL) != 0) { - syslog(LOG_EMERG, "Can't create TSD key: %s", strerror(errno)); + syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno)); } InitialiseSemaphores(); @@ -290,7 +279,7 @@ int main(int argc, char **argv) */ #ifdef HAVE_OPENSSL if (pthread_key_create(&ThreadSSL, NULL) != 0) { - syslog(LOG_EMERG, "Can't create TSD key: %s", strerror(errno)); + syslog(LOG_ERR, "Can't create TSD key: %s", strerror(errno)); } #endif @@ -319,16 +308,12 @@ int main(int argc, char **argv) pthread_mutex_init(&SessionListMutex, NULL); - /* - * Start up the housekeeping thread - */ + // Start up the housekeeping thread pthread_attr_init(&attr); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); pthread_create(&SessThread, &attr, (void *(*)(void *)) housekeeping_loop, NULL); - /* - * If this is an HTTPS server, fire up SSL - */ + // If this is an HTTPS server, fire up SSL #ifdef HAVE_OPENSSL if (is_https) { init_ssl(); @@ -336,7 +321,7 @@ int main(int argc, char **argv) #endif drop_root(UID); - /* Become a worker thread. More worker threads will be spawned as they are needed. */ + // Become a worker thread. More worker threads will be spawned as they are needed. worker_entry(); ShutDownLibCitadel(); return 0;