From: oes <oes@users.sourceforge.net>
Date: Tue, 5 Mar 2002 18:13:56 +0000 (+0000)
Subject: Added --user option
X-Git-Tag: v_2_9_12~172
X-Git-Url: http://www.privoxy.org/gitweb/?a=commitdiff_plain;h=544914fa824cf2e731be6d4946370f3d90693c16;p=privoxy.git

Added --user option
---

diff --git a/jcc.c b/jcc.c
index a8840318..622fecaf 100644
--- a/jcc.c
+++ b/jcc.c
@@ -1,4 +1,4 @@
-const char jcc_rcs[] = "$Id: jcc.c,v 1.69 2002/03/04 23:50:00 jongfoster Exp $";
+const char jcc_rcs[] = "$Id: jcc.c,v 1.70 2002/03/05 04:52:42 oes Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/jcc.c,v $
@@ -33,6 +33,9 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.69 2002/03/04 23:50:00 jongfoster Exp $";
  *
  * Revisions   :
  *    $Log: jcc.c,v $
+ *    Revision 1.70  2002/03/05 04:52:42  oes
+ *    Deleted non-errlog debugging code
+ *
  *    Revision 1.69  2002/03/04 23:50:00  jongfoster
  *    Splitting off bind_port() call into bind_port_helper(), with
  *    improved logging.
@@ -463,6 +466,10 @@ const char jcc_rcs[] = "$Id: jcc.c,v 1.69 2002/03/04 23:50:00 jongfoster Exp $";
 #include <sys/termios.h>
 #endif /* sun */
 
+#ifdef unix
+#include <pwd.h>
+#endif
+
 # include <signal.h>
 
 # ifdef __BEOS__
@@ -1515,7 +1522,7 @@ static int32 server_thread(void *data)
 void usage(const char *myname)
 {
    printf("JunkBuster proxy version " VERSION " (" HOME_PAGE_URL ")\n"
-           "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [configfile]\n"
+           "Usage: %s [--help] [--version] [--no-daemon] [--pidfile pidfile] [--user user] [configfile]\n"
            "Aborting.\n", myname);
  
    exit(2);
@@ -1553,6 +1560,7 @@ int main(int argc, const char *argv[])
 #endif
 {
    int argc_pos = 0;
+   struct passwd *pw;
 
    Argc = argc;
    Argv = argv;
@@ -1593,6 +1601,17 @@ int main(int argc, const char *argv[])
          if (++argc_pos == argc) usage(argv[0]);
          pidfile = strdup(argv[argc_pos]);
       }
+
+      else if (strcmp(argv[argc_pos], "--user" ) == 0)
+      {
+         if (++argc_pos == argc) usage(argv[0]);
+         pw = getpwnam(argv[argc_pos]);
+
+         if (pw == NULL)
+         {
+            log_error(LOG_LEVEL_FATAL, "User %s not found.", argv[argc_pos]);
+         }
+      }
       else
 #endif /* defined(_WIN32) && !defined(_WIN_CONSOLE) */
       {
@@ -1744,9 +1763,19 @@ int main(int argc, const char *argv[])
       close( 1 );
       chdir("/");
 
-      write_pid_file();
-
    } /* -END- if (!no_daemon) */
+
+   /*
+    * As soon as we have written the PID file, we can switch
+    * to the user ID indicated by the --user option
+    */
+   write_pid_file();
+   
+   if (setuid(pw->pw_uid))
+   {
+      log_error(LOG_LEVEL_FATAL, "Cannot setuid(): Insufficient permissions.");
+   }
+
 }
 #endif /* defined unix */
 
diff --git a/junkbuster.1 b/junkbuster.1
index 70d2b3bc..e9c4b51f 100644
--- a/junkbuster.1
+++ b/junkbuster.1
@@ -38,6 +38,11 @@ On startup, write the process ID to \fIpidfile\fP. Delete the
 \fIpidfile\fP on exit. Failiure to create or delete the
 \fIpidfile\fP is non-fatal. If no \fB--pidfile\fP option
 is given, no PID file will be used.
+.TP
+\fB --user\fP \fIuser\fP (unix only)
+After (optionally) writing the PID file, assume the user ID
+of \fIuser\fP. Exit if the privileges are not sufficient to
+do so.
 
 .PP
 If the \fIconfig file\fP is not specified on the command line,