Implement * to mean any user or repo

[repo_shell.git] / git_acl.c

diff --git a/git_acl.c b/git_acl.c
index e077f785e54fd2a78e8e828ca1c3ab6a2e088068..ea171feedf2ba521cf9cf9995961e3b4769cacdf 100644 (file)
--- a/git_acl.c
+++ b/git_acl.c
@@ -30,6 +30,8 @@
 #include "stra.h"
 #include "git_acl.h"
 
+#define ANYID   "*"
+
 enum {
   DFLT_IDS_SZ = 32
 };
@@ -114,14 +116,14 @@ static acl_clear(acl_t *acl)
   stra_destroy(&acl->userids);
 }
 
-static int str_has_word(const char* string, const char* word)
+static bool str_has_word(const char* string, const char* word)
 {
   char *_s = xstrdup(string);
   char *s = _s;
   char *p = my_strtok(&s, " \t\n");
 
   while (p) {
-    if (!strcmp(p, word)) {
+    if (!strcmp(p, word) || !strcmp(p, ANYID)) {
       free(_s);
       return true;
     }
@@ -159,8 +161,8 @@ static int acl_handler(void* user, const char* section, const char* name,
     if (!repo || my_strtok(&p, " \t\n"))
       die("acl_handler: badly formatted section '%s'", section);
     /* repo is repo name, name is userid, value is permission */
-    if (stra_find(&acl->repoids, repo) >= 0 &&
-        stra_find(&acl->userids, name) >= 0) {
+    if ((!strcmp(repo, ANYID) || stra_find(&acl->repoids, repo) >= 0) &&
+        (!strcmp(name, ANYID) || stra_find(&acl->userids, name) >= 0)) {
       acl->perms = perms_from_str(value);
       set_lm_repoid(repo);
       set_lm_userid(name);
@@ -174,13 +176,11 @@ static int acl_handler(void* user, const char* section, const char* name,
   return 1;
 }
 
-int git_acl(char *user, char *repo, char *file)
+int git_acl(const char *user, const char *repo, const char *file)
 {
   acl_t acl;
 
-  if (!file || !*file)
-    file = GIT_ACL_FILE;
-  if (!user || !*user || !repo || !*repo) {
+  if (!file || !*file || !user || !*user || !repo || !*repo) {
     die("git_acl: invalid args user='%s', repo='%s', file='%s'", user, repo,
        file);
   }
@@ -189,8 +189,8 @@ int git_acl(char *user, char *repo, char *file)
   set_lm_userid(NULL);
   lm_perms = PERMS_NOTFOUND;
   acl_init(&acl);
-  acl.user = user;
-  acl.repo = repo;
+  acl.user = (char*)user;
+  acl.repo = (char*)repo;
   stra_add(&acl.userids, acl.user);
   stra_add(&acl.repoids, acl.repo);