Ticket #254: droproot.diff

bitlbee.conf

@@ -19 +19 @@
 ##
 # RunMode = Inetd
 
+## User:
+## 
+## If BitlBee is run as root as a Daemon or ForkDaemon, it can drop root
+## privileges, and change to specified user.
+##
+# User = bitlbee
+
 ## DaemonPort/DaemonInterface:
 ##
 ## For daemon mode, you can specify on what interface and port the daemon

conf.c

@@ -66 +66 @@
         conf->motdfile = g_strdup( ETCDIR "/motd.txt" );
         conf->ping_interval = 180;
         conf->ping_timeout = 300;
+        conf->user = "";
         proxytype = 0;
         
         i = conf_loadini( conf, CONF_FILE );
@@ -79 +80 @@
                 fprintf( stderr, "Warning: Unable to read configuration file `%s'.\n", CONF_FILE );
         }
         
-        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:" ) ) >= 0 )
+        while( argc > 0 && ( opt = getopt( argc, argv, "i:p:P:nvIDFc:d:hR:u:" ) ) >= 0 )
         /*     ^^^^ Just to make sure we skip this step from the REHASH handler. */
         {
                 if( opt == 'i' )
@@ -139 +140 @@
                                 "  -I  Classic/InetD mode. (Default)\n"
                                 "  -D  Daemon mode. (Still EXPERIMENTAL!)\n"
                                 "  -F  Forking daemon. (one process per client)\n"
+                                "  -u  Run daemon as specified user.\n"
                                 "  -P  Specify PID-file (not for inetd mode)\n"
                                 "  -i  Specify the interface (by IP address) to listen on.\n"
                                 "      (Default: 0.0.0.0 (any interface))\n"
@@ -158 +160 @@
                            mode anyway!) */
                         ipc_master_set_statefile( optarg );
                 }
+                else if(opt == 'u' )
+                {
+                        conf->user = g_strdup( optarg );
+                }
         }
         
         if( conf->configdir[strlen(conf->configdir)-1] != '/' )
@@ -293 +299 @@
                                 
                                 g_free( url );
                         }
+                        else if( g_strcasecmp( ini->key, "user" ) == 0 )
+                        {
+                                conf->user = g_strdup( ini->value );
+                        }
                         else
                         {
                                 fprintf( stderr, "Error: Unknown setting `%s` in configuration file.\n", ini->key );

conf.h

@@ -48 +48 @@
         char **migrate_storage;
         int ping_interval;
         int ping_timeout;
+        char *user;
 } conf_t;
 
 conf_t *conf_load( int argc, char *argv[] );

unix.c

@@ -33 +33 @@
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/wait.h>
+#include <pwd.h>
 
 global_t global;        /* Against global namespace pollution */
 
@@ -59 +60 @@
         if( global.conf == NULL )
                 return( 1 );
         
+        if( ( global.conf->runmode == RUNMODE_DAEMON || 
+                global.conf->runmode == RUNMODE_FORKDAEMON ) 
+                && ( !getuid() || !geteuid() ) )
+        {
+                struct passwd *pw = NULL;
+                pw = getpwnam(global.conf->user);
+                if (pw)
+                {
+                        setgid(pw->pw_gid);
+                        setuid(pw->pw_uid);
+                }
+        }
+
         if( global.conf->runmode == RUNMODE_INETD )
         {
                 i = bitlbee_inetd_init();