git_acl_file is always {git_root}/.gitacls

[repo_shell.git] / repo_shell.c

diff --git a/repo_shell.c b/repo_shell.c
index 660c2fd282685927cf53e11e9a049eb14570261f..f5ec2680fdcf9e2f408a860cfc5eddff30a0365a 100644 (file)
--- a/repo_shell.c
+++ b/repo_shell.c
@@ -12,32 +12,31 @@
 #include "utility.h"
 #include "version.h"
 #include "git_acl.h"
+#include "stringutils.h"
 
-#define CFG_FILE "/etc/repo_shell.cfg"
+#define CFG_FILE "/etc/repo_shell.conf"
 #define SHELL "/bin/bash"
+#define GIT_ACL_FILE ".gitacls"
 
 typedef struct {
+  char *user;
   char *svn_root;
   char *git_root;
   char *owner;
   char *git_acl_file;
+  bool allow_interactive;
 } cfg_t;
 
 static cfg_t cfg;
 
-static uid_t user_uid(char *user)
+/* This is the function for which setuid root is needed for repo_shell */
+static void change_user(char *user)
 {
   struct passwd *pw = getpwnam(user);
 
   if (!pw)
     die("invalid user %s", user);
-  return pw->pw_uid;
-}
-
-static void change_user(char *user)
-{
-  /* This is the function for which setuid is required, as root */
-  setuid(user_uid(user));
+  setuid(pw->pw_uid);
 }
 
 static char *dequote(char *arg)
@@ -55,10 +54,10 @@ static char *dequote(char *arg)
   return narg;
 }
 
-static char *add_prefix(char *prefix, char* arg)
+static char *add_prefix(const char *prefix, const char* arg)
 {
-  char *narg = arg;
-        int i;
+  char *narg;
+  int i;
 
   if (arg && prefix && (i = strlen(prefix))) {
     narg = xmalloc(sizeof(char *) * (i + strlen(arg) + 2));
@@ -69,15 +68,6 @@ static char *add_prefix(char *prefix, char* arg)
   return narg;
 }
 
-static int check_ssh_interactive(uid_t uid)
-{
-  /* TODO: Check the config file for the user owning uid to see if that
-   * user should be able to execute any commands other than those required
-   * to support repository access.  Return a boolean true/false.
-   */
-  return 1; /* for now */
-}
-
 /* Return true if the user's permissions >= those required */
 static bool git_check_access(const char *cmd, const char *repo,
     const char *user)
@@ -113,6 +103,7 @@ static int do_git_cmd(const char *cmd, char *arg, char *user)
 
   ret = execvp(nargv[0], (char *const *) nargv);
   /* Code unreached if execv successful */
+  free((char*)nargv[1]);
   free(narg);
   return ret;
 }
@@ -155,12 +146,13 @@ static int ini_handler(void* user, const char* section, const char* name,
 
   if (!strcmp(name, "svn_root"))
     pconfig->svn_root = xstrdup(value);
-  else if (!strcmp(name, "git_root"))
+  else if (!strcmp(name, "git_root")) {
     pconfig->git_root = xstrdup(value);
-  else if (!strcmp(name, "owner"))
+    pconfig->git_acl_file = add_prefix(value, GIT_ACL_FILE);
+  } else if (!strcmp(name, "owner"))
     pconfig->owner = xstrdup(value);
-  else if (!strcmp(name, "git_acl_file"))
-    pconfig->git_acl_file = xstrdup(value);
+  else if (!strcmp(name, "allow_interactive"))
+    pconfig->allow_interactive = str_has_word(value, pconfig->user);
   else
     return 0;  /* unknown section/name, error */
   return 1;
@@ -173,6 +165,7 @@ int main(int argc, char **argv)
   struct commands *cmd;
   int devnull_fd;
   int count;
+  struct passwd *pw;
 
   /*
    * Always open file descriptors 0/1/2 to avoid clobbering files
@@ -191,18 +184,22 @@ int main(int argc, char **argv)
     return 0;
   }
 
+  pw = getpwuid(getuid());
+  cfg.user = xstrdup(pw->pw_name);
+  if (ini_parse(CFG_FILE, ini_handler, &cfg) < 0)
+    die("cannot read config file %s", CFG_FILE);
+
   if (argc == 1) {
-    if (!check_ssh_interactive(getuid()))
+    if (!cfg.allow_interactive) {
+      fprintf(stderr, "\n");
       die("only repository access is allowed");
+    }
     setuid(getuid());
     argv[0] = SHELL;
     execvp(argv[0], (char *const *) argv);
     return 1;
   }
 
-  if (ini_parse(CFG_FILE, ini_handler, &cfg) < 0)
-    die("cannot read config file %s", CFG_FILE);
-
   if ((!strcmp(argv[1], "-t") || !strcmp(argv[1], "--test"))) {
     perms_t p;
 
@@ -228,7 +225,6 @@ int main(int argc, char **argv)
     for (cmd = cmd_list ; cmd->name ; cmd++) {
       int len = strlen(cmd->name);
       char *arg;
-      struct passwd *pw;
       if (strncmp(cmd->name, prog, len))
         continue;
       arg = NULL;
@@ -243,14 +239,12 @@ int main(int argc, char **argv)
           continue;
       }
 
-      pw = getpwuid(getuid());
-      exit(cmd->exec(cmd->name, arg, pw->pw_name));
+      exit(cmd->exec(cmd->name, arg, cfg.user));
     }
   }
 
-  if (!check_ssh_interactive(getuid()))
+  if (!cfg.allow_interactive)
     die("only repository access is allowed");
-
   setuid(getuid());
   cd_to_homedir();
   argv[0] = SHELL;