Read repo-info from /etc/cgitrc

This makes cgit read all repo-info from the configfile, instead of scanning for
possible git-dirs below a common root path. This is primarily done to get
better security (separate physical path from logical repo-name).

In /etc/cgitrc each repo is registered with the following keys:

repo.url
repo.name
repo.path
repo.desc
repo.owner

Note:

*Required keys are repo.url and repo.path, all others are optional
*Each occurrence of repo.url starts a new repository registration
*Default value for repo.name is taken from repo.url
*The value of repo.url cannot contain characters with special meaning for
 urls (i.e. one of /?%&), while repo.name can contain anything.

Example:

repo.url=cgit-pub
repo.name=cgit/public
repo.path=/pub/git/cgit
repo.desc=My public cgit repo
repo.owner=Lars Hjemli

repo.url=cgit-priv
repo.name=cgit/private
repo.path=/home/larsh/src/cgit/.git
repo.desc=My private cgit repo
repo.owner=Lars Hjemli

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

5 files changed, 120 insertions, 55 deletions

diff --git a/cgit.c b/cgit.c
index 9535abc..0fa203c 100644
--- a/cgit.c
+++ b/cgit.c
@@ -1,61 +1,92 @@
 /* cgit.c: cgi for the git scm
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 const char cgit_version[] = CGIT_VERSION;
 
-static void cgit_prepare_cache(struct cacheitem *item)
+
+static struct repoinfo *cgit_get_repoinfo(char *url)
+{
+        int i;
+        struct repoinfo *repo;
+        
+        for (i=0; i<cgit_repolist.count; i++) {
+                repo = &cgit_repolist.repos[i];
+                if (!strcmp(repo->url, url))
+                        return repo;
+        }
+        return NULL;
+}
+
+
+static int cgit_prepare_cache(struct cacheitem *item)
 {
         if (!cgit_query_repo) {
                 item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
                 item->ttl = cgit_cache_root_ttl;
-        } else if (!cgit_query_page) {
+                return 1;
+        }
+        cgit_repo = cgit_get_repoinfo(cgit_query_repo);
+        if (!cgit_repo) {
+                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
+                cgit_print_docstart(title, item);
+                cgit_print_pageheader(title, 0);
+                cgit_print_error(fmt("Unknown repo: %s", cgit_query_repo));
+                cgit_print_docend();
+                return 0;
+        }
+
+        if (!cgit_query_page) {
                 item->name = xstrdup(fmt("%s/%s/index.html", cgit_cache_root, 
-                           cgit_query_repo));
+                           cgit_repo->url));
                 item->ttl = cgit_cache_repo_ttl;
         } else {
                 item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root, 
-                           cgit_query_repo, cgit_query_page, 
+                           cgit_repo->url, cgit_query_page, 
                            cache_safe_filename(cgit_querystring)));
                 if (cgit_query_has_symref)
                         item->ttl = cgit_cache_dynamic_ttl;
                 else if (cgit_query_has_sha1)
                         item->ttl = cgit_cache_static_ttl;
                 else
                         item->ttl = cgit_cache_repo_ttl;
         }
+        return 1;
 }
 
 static void cgit_print_repo_page(struct cacheitem *item)
 {
-        if (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
-            cgit_read_config("info/cgit", cgit_repo_config_cb)) {
-                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
+        char *title;
+        int show_search;
+
+        if (chdir(cgit_repo->path)) {
+                title = fmt("%s - %s", cgit_root_title, "Bad request");
                 cgit_print_docstart(title, item);
                 cgit_print_pageheader(title, 0);
                 cgit_print_error(fmt("Unable to scan repository: %s",
                                      strerror(errno)));
                 cgit_print_docend();
                 return;
         }
-        setenv("GIT_DIR", fmt("%s/%s", cgit_root, cgit_query_repo), 1);
-        char *title = fmt("%s - %s", cgit_repo_name, cgit_repo_desc);
-        int show_search = 0;
+
+        title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
+        show_search = 0;
+        setenv("GIT_DIR", cgit_repo->path, 1);
         if (cgit_query_page && !strcmp(cgit_query_page, "log"))
                 show_search = 1;
         cgit_print_docstart(title, item);
         cgit_print_pageheader(title, show_search);
         if (!cgit_query_page) {
                 cgit_print_summary();
         } else if (!strcmp(cgit_query_page, "log")) {
                 cgit_print_log(cgit_query_head, cgit_query_ofs, 100, cgit_query_search);
         } else if (!strcmp(cgit_query_page, "tree")) {
                 cgit_print_tree(cgit_query_sha1, cgit_query_path);
         } else if (!strcmp(cgit_query_page, "commit")) {
                 cgit_print_commit(cgit_query_sha1);
@@ -122,27 +153,24 @@ static void cgit_print_cache(struct cacheitem *item)
 
         while((i=read(fd, buf, sizeof(buf))) > 0)
                 write(STDOUT_FILENO, buf, i);
 
         close(fd);
 }
 
 static void cgit_parse_args(int argc, const char **argv)
 {
         int i;
 
         for (i = 1; i < argc; i++) {
-                if (!strncmp(argv[i], "--root=", 7)) {
-                        cgit_root = xstrdup(argv[i]+7);
-                }
                 if (!strncmp(argv[i], "--cache=", 8)) {
                         cgit_cache_root = xstrdup(argv[i]+8);
                 }
                 if (!strcmp(argv[i], "--nocache")) {
                         cgit_nocache = 1;
                 }
                 if (!strncmp(argv[i], "--query=", 8)) {
                         cgit_querystring = xstrdup(argv[i]+8);
                 }
                 if (!strncmp(argv[i], "--repo=", 7)) {
                         cgit_query_repo = xstrdup(argv[i]+7);
                 }
@@ -158,28 +186,34 @@ static void cgit_parse_args(int argc, const char **argv)
                         cgit_query_has_sha1 = 1;
                 }
                 if (!strncmp(argv[i], "--ofs=", 6)) {
                         cgit_query_ofs = atoi(argv[i]+6);
                 }
         }
 }
 
 int main(int argc, const char **argv)
 {
         struct cacheitem item;
 
+        htmlfd = STDOUT_FILENO;
+        item.st.st_mtime = time(NULL);
+        cgit_repolist.length = 0;
+        cgit_repolist.count = 0;
+        cgit_repolist.repos = NULL;
+
         cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
         if (getenv("QUERY_STRING"))
                 cgit_querystring = xstrdup(getenv("QUERY_STRING"));
         cgit_parse_args(argc, argv);
         cgit_parse_query(cgit_querystring, cgit_querystring_cb);
-
-        cgit_prepare_cache(&item);
+        if (!cgit_prepare_cache(&item))
+                return 0;
         if (cgit_nocache) {
                 item.fd = STDOUT_FILENO;
                 cgit_fill_cache(&item);
         } else {
                 cgit_check_cache(&item);
                 cgit_print_cache(&item);
         }
         return 0;
 }
diff --git a/cgit.h b/cgit.h
index a3b5385..2a3cd5a 100644
--- a/cgit.h
+++ b/cgit.h
@@ -6,46 +6,62 @@
 #include <ctype.h>
 #include <sched.h>
 
 typedef void (*configfn)(const char *name, const char *value);
 
 struct cacheitem {
         char *name;
         struct stat st;
         int ttl;
         int fd;
 };
 
+struct repoinfo {
+        char *url;
+        char *name;
+        char *path;
+        char *desc;
+        char *owner;
+};
+
+struct repolist {
+        int length;
+        int count;
+        struct repoinfo *repos;
+};
+
 struct commitinfo {
         struct commit *commit;
         char *author;
         char *author_email;
         unsigned long author_date;
         char *committer;
         char *committer_email;
         unsigned long committer_date;
         char *subject;
         char *msg;
 };
 
 struct taginfo {
         char *tagger;
         char *tagger_email;
         int tagger_date;
         char *msg;
 };
 
 extern const char cgit_version[];
 
-extern char *cgit_root;
+extern struct repolist cgit_repolist;
+extern struct repoinfo *cgit_repo;
+
 extern char *cgit_root_title;
 extern char *cgit_css;
 extern char *cgit_logo;
 extern char *cgit_logo_link;
 extern char *cgit_virtual_root;
 extern char *cgit_cache_root;
 
 extern int cgit_nocache;
 extern int cgit_max_lock_attempts;
 extern int cgit_cache_root_ttl;
 extern int cgit_cache_repo_ttl;
 extern int cgit_cache_dynamic_ttl;
diff --git a/cgitrc b/cgitrc
index 7e7fae5..da3d138 100644
--- a/cgitrc
+++ b/cgitrc
@@ -1,21 +1,17 @@
 ##
 ## cgitrc: template for /etc/cgitrc
 ##
 
 
-## root folder for git repos
-#root=/usr/src/git
-
-
 ## base for virtual urls. If specified, rewrite rules must be added to 
 ## httpd.conf. Possible rules for /git/ when cgit.cgi is accessed as /cgit.cgi:
 ##
 ##   RewriteRule ^/git/$ /cgit.cgi                            [L,QSA]
 ##   RewriteRule ^/git/([^/]+)/$ /cgit.cgi?r=$1               [L,QSA]
 ##   RewriteRule ^/git/([^/]+)/([^/]+)/$ /cgit.cgi?r=$1&p=$2  [L,QSA]
 ##
 #virtual-root=/git
 
 
 ## page title for the root page (repo listing)
 #root-title=Git repository browser
@@ -52,12 +48,21 @@
 
 ## ttl for root page (repo listing)
 #cache-root-ttl=5
 
 ## ttl for repo summary page
 #cache-repo-ttl=5
 
 ## ttl for other dynamic pages 
 #cache-dynamic-ttl=5
 
 ## ttl for static pages (addressed by SHA-1)
 #cache-static-ttl=-1
+
+
+
+## Example repository entry
+#repo.url=cgit
+#repo.name=cgit
+#repo.desc=the caching cgi for git
+#repo.path=/pub/git/cgit
+#repo.owner=Lars Hjemli
diff --git a/shared.c b/shared.c
index 8e6df31..6fd70a8 100644
--- a/shared.c
+++ b/shared.c
@@ -1,23 +1,25 @@
 /* shared.c: global vars + some callback functions
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
-char *cgit_root         = "/usr/src/git";
+struct repolist cgit_repolist;
+struct repoinfo *cgit_repo;
+
 char *cgit_root_title   = "Git repository browser";
 char *cgit_css          = "/cgit.css";
 char *cgit_logo         = "/git-logo.png";
 char *cgit_logo_link    = "http://www.kernel.org/pub/software/scm/git/docs/";
 char *cgit_virtual_root = NULL;
 
 char *cgit_cache_root   = "/var/cache/cgit";
 
 int cgit_nocache               =  0;
 int cgit_max_lock_attempts     =  5;
 int cgit_cache_root_ttl        =  5;
 int cgit_cache_repo_ttl        =  5;
@@ -37,52 +39,83 @@ int cgit_query_has_sha1   = 0;
 char *cgit_querystring  = NULL;
 char *cgit_query_repo   = NULL;
 char *cgit_query_page   = NULL;
 char *cgit_query_head   = NULL;
 char *cgit_query_search = NULL;
 char *cgit_query_sha1   = NULL;
 char *cgit_query_sha2   = NULL;
 char *cgit_query_path   = NULL;
 int   cgit_query_ofs    = 0;
 
 int htmlfd = 0;
 
+struct repoinfo *add_repo(const char *url)
+{
+        struct repoinfo *ret;
+
+        if (++cgit_repolist.count > cgit_repolist.length) {
+                if (cgit_repolist.length == 0)
+                        cgit_repolist.length = 8;
+                else
+                        cgit_repolist.length *= 2;
+                cgit_repolist.repos = xrealloc(cgit_repolist.repos, 
+                                               cgit_repolist.length * 
+                                               sizeof(struct repoinfo));
+        }
+
+        ret = &cgit_repolist.repos[cgit_repolist.count-1];
+        ret->url = xstrdup(url);
+        ret->name = ret->url;
+        ret->path = NULL;
+        ret->desc = NULL;
+        ret->owner = NULL;
+        return ret;
+}
+
 void cgit_global_config_cb(const char *name, const char *value)
 {
-        if (!strcmp(name, "root"))
-                cgit_root = xstrdup(value);
-        else if (!strcmp(name, "root-title"))
+        if (!strcmp(name, "root-title"))
                 cgit_root_title = xstrdup(value);
         else if (!strcmp(name, "css"))
                 cgit_css = xstrdup(value);
         else if (!strcmp(name, "logo"))
                 cgit_logo = xstrdup(value);
         else if (!strcmp(name, "logo-link"))
                 cgit_logo_link = xstrdup(value);
         else if (!strcmp(name, "virtual-root"))
                 cgit_virtual_root = xstrdup(value);
         else if (!strcmp(name, "nocache"))
                 cgit_nocache = atoi(value);
         else if (!strcmp(name, "cache-root"))
                 cgit_cache_root = xstrdup(value);
         else if (!strcmp(name, "cache-root-ttl"))
                 cgit_cache_root_ttl = atoi(value);
         else if (!strcmp(name, "cache-repo-ttl"))
                 cgit_cache_repo_ttl = atoi(value);
         else if (!strcmp(name, "cache-static-ttl"))
                 cgit_cache_static_ttl = atoi(value);
         else if (!strcmp(name, "cache-dynamic-ttl"))
                 cgit_cache_dynamic_ttl = atoi(value);
         else if (!strcmp(name, "max-message-length"))
                 cgit_max_msg_len = atoi(value);
+        else if (!strcmp(name, "repo.url"))
+                cgit_repo = add_repo(value);
+        else if (!strcmp(name, "repo.name"))
+                cgit_repo->name = xstrdup(value);
+        else if (cgit_repo && !strcmp(name, "repo.path"))
+                cgit_repo->path = xstrdup(value);
+        else if (cgit_repo && !strcmp(name, "repo.desc"))
+                cgit_repo->desc = xstrdup(value);
+        else if (cgit_repo && !strcmp(name, "repo.owner"))
+                cgit_repo->owner = xstrdup(value);
 }
 
 void cgit_repo_config_cb(const char *name, const char *value)
 {
         if (!strcmp(name, "name"))
                 cgit_repo_name = xstrdup(value);
         else if (!strcmp(name, "desc"))
                 cgit_repo_desc = xstrdup(value);
         else if (!strcmp(name, "owner"))
                 cgit_repo_owner = xstrdup(value);
 }
 
diff --git a/ui-repolist.c b/ui-repolist.c
index bd4af59..011ec95 100644
--- a/ui-repolist.c
+++ b/ui-repolist.c
@@ -1,63 +1,40 @@
 /* ui-repolist.c: functions for generating the repolist page
  *
  * Copyright (C) 2006 Lars Hjemli
  *
  * Licensed under GNU General Public License v2
  *   (see COPYING for full license text)
  */
 
 #include "cgit.h"
 
 void cgit_print_repolist(struct cacheitem *item)
 {
-        DIR *d;
-        struct dirent *de;
-        struct stat st;
-        char *name;
+        struct repoinfo *repo;
+        int i;
 
-        chdir(cgit_root);
         cgit_print_docstart(cgit_root_title, item);
         cgit_print_pageheader(cgit_root_title, 0);
 
-        if (!(d = opendir("."))) {
-                cgit_print_error(fmt("Unable to scan repository directory: %s",
-                                     strerror(errno)));
-                cgit_print_docend();
-                return;
-        }
-
         html("<h2>Repositories</h2>\n");
         html("<table class='list nowrap'>");
         html("<tr class='nohover'>"
              "<th class='left'>Name</th>"
              "<th class='left'>Description</th>"
              "<th class='left'>Owner</th></tr>\n");
-        while ((de = readdir(d)) != NULL) {
-                if (de->d_name[0] == '.')
-                        continue;
-                if (stat(de->d_name, &st) < 0)
-                        continue;
-                if (!S_ISDIR(st.st_mode))
-                        continue;
-
-                cgit_repo_name = cgit_repo_desc = cgit_repo_owner = NULL;
-                name = fmt("%s/info/cgit", de->d_name);
-                if (cgit_read_config(name, cgit_repo_config_cb))
-                        continue;
 
+        for (i=0; i<cgit_repolist.count; i++) {
+                repo = &cgit_repolist.repos[i];
                 html("<tr><td>");
-                html_link_open(cgit_repourl(de->d_name), NULL, NULL);
-                html_txt(cgit_repo_name);
+                html_link_open(cgit_repourl(repo->url), NULL, NULL);
+                html_txt(repo->name);
                 html_link_close();
                 html("</td><td>");
-                html_txt(cgit_repo_desc);
+                html_txt(repo->desc);
                 html("</td><td>");
-                html_txt(cgit_repo_owner);
+                html_txt(repo->owner);
                 html("</td></tr>\n");
         }
-        closedir(d);
         html("</table>");
         cgit_print_docend();
 }
-
-