* port our setuid function from citserver to webcit; -u can now specify the UID...

[citadel.git] / webcit / webserver.c

diff --git a/webcit/webserver.c b/webcit/webserver.c
index 064031ff36a9805d78f880ed888423287551e514..c70419b3be0d405c982abfbf537168a50109ca49 100644 (file)
--- a/webcit/webserver.c
+++ b/webcit/webserver.c
@@ -5,7 +5,7 @@
  * 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.
+ * Copyright (c) 1996-2010 by the citadel.org developers.
  * This program is released under the terms of the GNU General Public License v3.
  *
  */
@@ -36,6 +36,7 @@ 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);
 
+extern void drop_root(uid_t UID);
 
 char ctdl_key_dir[PATH_MAX]=SSL_DIR;
 char file_crpt_file_key[PATH_MAX]="";
@@ -315,6 +316,7 @@ webcit_calc_dirs_n_files(int relh, const char *basedir, int home, char *webcitdi
  */
 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 */
@@ -332,6 +334,7 @@ int main(int argc, char **argv)
        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);
 
@@ -354,11 +357,14 @@ int main(int argc, char **argv)
 
        /* Parse command line */
 #ifdef HAVE_OPENSSL
-       while ((a = getopt(argc, argv, "h:i:p:t:T:B:x:dD:G:cfsS:Z")) != EOF)
+       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:cfsS:Z")) != EOF)
 #else
-       while ((a = getopt(argc, argv, "h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
+       while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:dD:G:cfZ")) != EOF)
 #endif
                switch (a) {
+               case 'u':
+                       UID = atol(optarg);
+                       break;
                case 'h':
                        hdir = strdup(optarg);
                        relh=hdir[0]!='/';
@@ -474,7 +480,7 @@ int main(int argc, char **argv)
 
        /* Tell 'em who's in da house */
        lprintf(1, PACKAGE_STRING "\n");
-       lprintf(1, "Copyright (C) 1996-2009 by the Citadel development team.\n"
+       lprintf(1, "Copyright (C) 1996-2010 by the Citadel development team.\n"
                "This software is distributed under the terms of the "
                "GNU General Public License.\n\n"
        );
@@ -503,7 +509,7 @@ int main(int argc, char **argv)
                        lprintf(1, "********************************************************************************\n");
                        return -1;
                }
-               fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
+               rv = fwrite(ChrPtr(I18nDump), 1, StrLength(I18nDump), fd);
                fclose(fd);
                return 0;
        }
@@ -551,6 +557,11 @@ int main(int argc, char **argv)
                lprintf(2, "Attempting to bind to port %d...\n", http_port);
                msock = ig_tcp_server(ip_addr, http_port, LISTEN_QUEUE_LENGTH);
        }
+       if (msock < 0)
+       {
+               ShutDownWebcit();
+               return -msock;
+       }
 
        lprintf(2, "Listening on socket %d\n", msock);
        signal(SIGPIPE, SIG_IGN);
@@ -574,6 +585,7 @@ int main(int argc, char **argv)
                init_ssl();
        }
 #endif
+       drop_root(UID);
 
        /* Start a few initial worker threads */
        for (i = 0; i < (MIN_WORKER_THREADS); ++i) {
@@ -702,6 +714,7 @@ void worker_entry(void)
                                }
                        }
                        else 
+#endif
                        {
                                int fdflags; 
                                fdflags = fcntl(ssock, F_GETFL);
@@ -709,11 +722,10 @@ void worker_entry(void)
                                        lprintf(1, "unable to get server socket flags! %s \n",
                                                strerror(errno));
                                fdflags = fdflags | O_NONBLOCK;
-                               if (fcntl(ssock, F_SETFD, fdflags) < 0)
+                               if (fcntl(ssock, F_SETFL, 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;