Add support for 'enable-gitweb-owner' option

When this option is enabled (which it is by default), cgit will lookup
the 'gitweb.owner' setting in each git config file found when processing
the 'scan-path' option.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

4 files changed, 33 insertions, 9 deletions

diff --git a/cgit.c b/cgit.c
index f9a42bb..eff5b7a 100644
--- a/cgit.c
+++ b/cgit.c
@@ -136,4 +136,6 @@ void config_cb(const char *name, const char *value)
         else if (!strcmp(name, "enable-filter-overrides"))
                 ctx.cfg.enable_filter_overrides = atoi(value);
+        else if (!strcmp(name, "enable-gitweb-owner"))
+                ctx.cfg.enable_gitweb_owner = atoi(value);
         else if (!strcmp(name, "enable-index-links"))
                 ctx.cfg.enable_index_links = atoi(value);
@@ -294,4 +296,5 @@ static void prepare_context(struct cgit_context *ctx)
         ctx->cfg.logo = "/cgit.png";
         ctx->cfg.local_time = 0;
+        ctx->cfg.enable_gitweb_owner = 1;
         ctx->cfg.enable_tree_linenumbers = 1;
         ctx->cfg.max_repo_count = 50;
diff --git a/cgit.h b/cgit.h
index ada8535..232099d 100644
--- a/cgit.h
+++ b/cgit.h
@@ -184,4 +184,5 @@ struct cgit_config {
         int embedded;
         int enable_filter_overrides;
+        int enable_gitweb_owner;
         int enable_index_links;
         int enable_log_filecount;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 6fb1083..5d77973 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -96,4 +96,9 @@ enable-filter-overrides::
         overridden in repository-specific cgitrc files. Default value: none.
 
+enable-gitweb-owner::
+        If set to "1" and scan-path is enabled, we first check each repository
+        for the git config value "gitweb.owner" to determine the owner.
+        Default value: "1". See also: scan-path.
+
 enable-index-links::
         Flag which, when set to "1", will make cgit generate extra links for
diff --git a/scan-tree.c b/scan-tree.c
index a83a78c..e987824 100644
--- a/scan-tree.c
+++ b/scan-tree.c
@@ -48,4 +48,5 @@ static int is_git_dir(const char *path)
 struct cgit_repo *repo;
 repo_config_fn config_fn;
+char *owner;
 
 static void repo_config(const char *name, const char *value)
@@ -54,4 +55,11 @@ static void repo_config(const char *name, const char *value)
 }
 
+static int git_owner_config(const char *key, const char *value, void *cb)
+{
+        if (!strcmp(key, "gitweb.owner"))
+                owner = xstrdup(value);
+        return 0;
+}
+
 static void add_repo(const char *base, const char *path, repo_config_fn fn)
 {
@@ -68,9 +76,8 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
         if (!stat(fmt("%s/noweb", path), &st))
                 return;
-        if ((pwd = getpwuid(st.st_uid)) == NULL) {
-                fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
-                        path, strerror(errno), errno);
-                return;
-        }
+
+        owner = NULL;
+        if (ctx.cfg.enable_gitweb_owner)
+                git_config_from_file(git_owner_config, fmt("%s/config", path), NULL);
         if (base == path)
                 p = fmt("%s", path);
@@ -87,8 +94,16 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn)
         repo->name = repo->url;
         repo->path = xstrdup(path);
-        p = (pwd && pwd->pw_gecos) ? strchr(pwd->pw_gecos, ',') : NULL;
-        if (p)
-                *p = '\0';
-        repo->owner = (pwd ? xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name) : "");
+        while (!owner) {
+                if ((pwd = getpwuid(st.st_uid)) == NULL) {
+                        fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n",
+                                path, strerror(errno), errno);
+                        break;
+                }
+                if (pwd->pw_gecos)
+                        if ((p = strchr(pwd->pw_gecos, ',')))
+                                *p = '\0';
+                owner = xstrdup(pwd->pw_gecos ? pwd->pw_gecos : pwd->pw_name);
+        }
+        repo->owner = owner;
 
         p = fmt("%s/description", path);