1 files changed, 104 insertions, 4 deletions

diff --git a/src/setup/gnunet-setup.c b/src/setup/gnunet-setup.c
index f36ec7d4..d41be339 100644
--- a/src/setup/gnunet-setup.c
+++ b/src/setup/gnunet-setup.c
@@ -26,6 +26,9 @@
 #if ENABLE_NLS
 #include <locale.h>
 #endif
+#if HAVE_LIBGKSU_LIBGKSU_H
+#include <libgksu/gksu.h>
+#endif
 #include "gnunet-setup.h"
 #include "gnunet-setup-options.h"
 #include "gnunet-setup-gns.h"
@@ -62,6 +65,20 @@ static struct GNUNET_OS_Process *resolver;
  */
 static struct GNUNET_OS_Process *namestore;
 
+#if HAVE_LIBGKSU_LIBGKSU_H
+/**
+ * Flag to emable privilege escalation.
+ */
+static int do_gksu;
+#endif
+
+/**
+ * Show all configuration options, even if we are run
+ * as a normal user and a 'gnunet' user exists and thus
+ * most options should not apply to the normal user.
+ */ 
+static int force_full_setup;
+
 
 /**
  * Get an object from the main window.
@@ -424,6 +441,35 @@ start_namestore (void *cls,
 }
 
 
+#if HAVE_LIBGKSU_LIBGKSU_H
+/**
+ * Try elevating user priviledges to run as user 'gnunet' or 'root'.
+ *
+ * @param username user gnunet-setup should be run as
+ * @return GNUNET_OK on success
+ */
+static int
+try_gksu (const char *username)
+{
+  GksuContext *gksu;
+  GError *err;
+  
+  gksu = gksu_context_new ();
+  gksu_context_set_user (gksu, username);
+  gksu_context_set_command (gksu, "gnunet-setup");
+  gksu_context_set_description (gksu, _("Elevate priviledges to setup GNUnet on the host"));
+  gksu_context_set_message (gksu, _("Enter password to run gnunet-setup as user 'gnunet'"));
+  if (gksu_run_full (gksu,
+                     NULL, NULL,
+                     NULL, NULL,
+                     &err))
+    return GNUNET_OK;
+  g_object_unref (err);
+  return GNUNET_SYSERR;
+}
+#endif
+
+
 /**
  * Actual main method that sets up the configuration window.
  *
@@ -434,17 +480,49 @@ static void
 run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
 {
   GtkWidget *main_window;
+  uid_t my_uid;
+  struct passwd *gnunet_pw;
+
+  my_uid = getuid ();
+  gnunet_pw = getpwnam ("gnunet");
+#if HAVE_LIBGKSU_LIBGKSU_H
+
+  if ( (0 != do_gksu) &&
+       (0 != my_uid) &&
+       (NULL != gnunet_pw) &&
+       (my_uid != gnunet_pw->pw_uid) &&
+       (GNUNET_OK == try_gksu ("gnunet")))
+  {
+    GNUNET_GTK_main_loop_quit (cls);
+    return;
+  }
+#endif  
 
   ml = cls;
-
   if (GNUNET_OK != GNUNET_GTK_main_loop_build_window (ml, NULL))
-  {
     return;
-  }
 
   cfgName = GNUNET_GTK_main_loop_get_configuration_file (ml);
   cfg = GNUNET_CONFIGURATION_create ();
-  (void) GNUNET_CONFIGURATION_load (cfg, cfgName);
+  if ( (0 != my_uid) &&
+       (NULL != gnunet_pw) &&
+       (my_uid != gnunet_pw->pw_uid) &&
+       (0 == force_full_setup) )
+  {
+    /* load system defaults, system/'gnunet' user's configuration and THEN
+       our configuration file */
+    if (GNUNET_YES ==
+        GNUNET_DISK_file_test ("/etc/gnunet.conf"))
+      (void) GNUNET_CONFIGURATION_load (cfg, "/etc/gnunet.conf");
+    else
+      (void) GNUNET_CONFIGURATION_load (cfg, "~gnunet/.gnunet/gnunet.conf");
+    (void) GNUNET_CONFIGURATION_parse (cfg, cfgName);
+  }
+  else
+  {
+    /* only load system defaults and our configuration file */
+    (void) GNUNET_CONFIGURATION_load (cfg, cfgName);
+  }
   main_window = GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_dialog"));
   GNUNET_CLIENT_service_test ("resolver",
                               cfg,
@@ -456,6 +534,20 @@ run (void *cls, const struct GNUNET_SCHEDULER_TaskContext *tc)
                               &start_namestore, NULL);
   load_options ();
   GNUNET_SETUP_gns_init ();
+  if ( (0 != my_uid) &&
+       (NULL != gnunet_pw) &&
+       (my_uid != gnunet_pw->pw_uid) &&
+       (0 == force_full_setup) )
+  {
+    /* hide all options that are not for individual users; this
+       run is only for per-user options, not for per-peer options */
+    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_general_vbox")));
+    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_transport_main_frame")));
+    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_network_tab_vbox")));
+    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_fs_main_vbox")));
+    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_vpn_vbox")));
+    gtk_widget_hide (GTK_WIDGET (GNUNET_SETUP_get_object ("GNUNET_setup_namestore_vbox")));
+  }
   gtk_widget_show (main_window);
   gtk_window_present (GTK_WINDOW (main_window));
 }
@@ -472,6 +564,14 @@ int
 main (int argc, char *const *argv)
 {
   struct GNUNET_GETOPT_CommandLineOption options[] = {
+#if HAVE_LIBGKSU_LIBGKSU_H
+    { 'e', "elevate-priviledges", NULL,
+      gettext_noop ("run as user 'gnunet', if necessary by executing gksu to elevate rights"),
+      0, &GNUNET_GETOPT_set_one, &do_gksu },
+#endif
+    { 'f', "force-full-setup", NULL,
+      gettext_noop ("force showing the full set of options, even if gnunet-setup is run as a normal user and as a user 'gnunet' exists on the system, most options should not apply to the normal user as GNUnet should be run by the 'gnunet' user"),
+      0, &GNUNET_GETOPT_set_one, &force_full_setup },
     GNUNET_GETOPT_OPTION_END
   };
   int ret;