Restrict deep nesting of configfiles

[ps-cgit] / cgit.c

diff --git a/cgit.c b/cgit.c
index ada488b66dec98696fe5547287b2957a6d19581f..3c11ff0a8f9021a20bf20771a617c7c53ebe6aac 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -10,49 +10,154 @@
 
 const char cgit_version[] = CGIT_VERSION;
 
 
 const char cgit_version[] = CGIT_VERSION;
 

-static void cgit_print_repo_page(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 (chdir(fmt("%s/%s", cgit_root, cgit_query_repo)) || 
-           cgit_read_config("info/cgit", cgit_repo_config_cb)) {
+       if (!cgit_query_repo) {
+               item->name = xstrdup(fmt("%s/index.html", cgit_cache_root));
+               item->ttl = cgit_cache_root_ttl;
+               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);
                char *title = fmt("%s - %s", cgit_root_title, "Bad request");
                cgit_print_docstart(title, item);

-               cgit_print_pageheader(title);
+               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_repo->url));
+               item->ttl = cgit_cache_repo_ttl;
+       } else {
+               item->name = xstrdup(fmt("%s/%s/%s/%s.html", cgit_cache_root,
+                          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)
+{
+       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;
        }
                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);
+
+       title = fmt("%s - %s", cgit_repo->name, cgit_repo->desc);
+       show_search = 0;
+       setenv("GIT_DIR", cgit_repo->path, 1);
+
+       if (cgit_query_page) {
+           if (cgit_repo->snapshots && !strcmp(cgit_query_page, "snapshot")) {
+               cgit_print_snapshot(item, cgit_query_sha1, "zip",
+                                   cgit_repo->url, cgit_query_name);
+               return;
+           }
+           if (!strcmp(cgit_query_page, "blob")) {
+                   cgit_print_blob(item, cgit_query_sha1, cgit_query_path);
+                   return;
+           }
+       }
+
+       if (cgit_query_page && !strcmp(cgit_query_page, "log"))
+               show_search = 1;
+

        cgit_print_docstart(title, item);
        cgit_print_docstart(title, item);

-       cgit_print_pageheader(title);
+
+

        if (!cgit_query_page) {
        if (!cgit_query_page) {

+               cgit_print_pageheader("summary", show_search);

                cgit_print_summary();
                cgit_print_summary();

-       } else if (!strcmp(cgit_query_page, "log")) {
-               cgit_print_log(cgit_query_head, 0, 100);
+               cgit_print_docend();
+               return;
+       }
+
+       cgit_print_pageheader(cgit_query_page, show_search);
+
+       if (!strcmp(cgit_query_page, "log")) {
+               cgit_print_log(cgit_query_head, cgit_query_ofs,
+                              cgit_max_commit_count, cgit_query_search,
+                              cgit_query_path);

        } else if (!strcmp(cgit_query_page, "tree")) {
        } else if (!strcmp(cgit_query_page, "tree")) {

-               cgit_print_tree(cgit_query_sha1);
+               cgit_print_tree(cgit_query_head, cgit_query_sha1, cgit_query_path);
+       } else if (!strcmp(cgit_query_page, "commit")) {
+               cgit_print_commit(cgit_query_sha1);

        } else if (!strcmp(cgit_query_page, "view")) {
        } else if (!strcmp(cgit_query_page, "view")) {

-               cgit_print_view(cgit_query_sha1);
+               cgit_print_view(cgit_query_sha1, cgit_query_path);
+       } else if (!strcmp(cgit_query_page, "diff")) {
+               cgit_print_diff(cgit_query_sha1, cgit_query_sha2, cgit_query_path);
+       } else {
+               cgit_print_error("Invalid request");

        }
        cgit_print_docend();
 }
 
        }
        cgit_print_docend();
 }
 

-static void cgit_fill_cache(struct cacheitem *item)
+static void cgit_fill_cache(struct cacheitem *item, int use_cache)

 {
 {

-       htmlfd = item->fd;
+       static char buf[PATH_MAX];
+       int stdout2;
+
+       getcwd(buf, sizeof(buf));

        item->st.st_mtime = time(NULL);
        item->st.st_mtime = time(NULL);

+
+       if (use_cache) {
+               stdout2 = chk_positive(dup(STDOUT_FILENO),
+                                      "Preserving STDOUT");
+               chk_zero(close(STDOUT_FILENO), "Closing STDOUT");
+               chk_positive(dup2(item->fd, STDOUT_FILENO), "Dup2(cachefile)");
+       }
+

        if (cgit_query_repo)
                cgit_print_repo_page(item);
        else
                cgit_print_repolist(item);
        if (cgit_query_repo)
                cgit_print_repo_page(item);
        else
                cgit_print_repolist(item);

+
+       if (use_cache) {
+               chk_zero(close(STDOUT_FILENO), "Close redirected STDOUT");
+               chk_positive(dup2(stdout2, STDOUT_FILENO),
+                            "Restoring original STDOUT");
+               chk_zero(close(stdout2), "Closing temporary STDOUT");
+       }
+
+       chdir(buf);

 }
 
 static void cgit_check_cache(struct cacheitem *item)
 {
        int i = 0;
 
 }
 
 static void cgit_check_cache(struct cacheitem *item)
 {
        int i = 0;
 

-       cache_prepare(item);

  top:
        if (++i > cgit_max_lock_attempts) {
                die("cgit_refresh_cache: unable to lock %s: %s",
  top:
        if (++i > cgit_max_lock_attempts) {
                die("cgit_refresh_cache: unable to lock %s: %s",


@@ -64,14 +169,14 @@ static void cgit_check_cache(struct cacheitem *item)
                        goto top;
                }
                if (!cache_exist(item)) {
                        goto top;
                }
                if (!cache_exist(item)) {

-                       cgit_fill_cache(item);
+                       cgit_fill_cache(item, 1);

                        cache_unlock(item);
                } else {
                        cache_cancel_lock(item);
                }
        } else if (cache_expired(item) && cache_lock(item)) {
                if (cache_expired(item)) {
                        cache_unlock(item);
                } else {
                        cache_cancel_lock(item);
                }
        } else if (cache_expired(item) && cache_lock(item)) {
                if (cache_expired(item)) {

-                       cgit_fill_cache(item);
+                       cgit_fill_cache(item, 1);

                        cache_unlock(item);
                } else {
                        cache_cancel_lock(item);
                        cache_unlock(item);
                } else {
                        cache_cancel_lock(item);


@@ -94,15 +199,64 @@ static void cgit_print_cache(struct cacheitem *item)
        close(fd);
 }
 
        close(fd);
 }
 

+static void cgit_parse_args(int argc, const char **argv)
+{
+       int i;
+
+       for (i = 1; i < argc; i++) {
+               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);
+               }
+               if (!strncmp(argv[i], "--page=", 7)) {
+                       cgit_query_page = xstrdup(argv[i]+7);
+               }
+               if (!strncmp(argv[i], "--head=", 7)) {
+                       cgit_query_head = xstrdup(argv[i]+7);
+                       cgit_query_has_symref = 1;
+               }
+               if (!strncmp(argv[i], "--sha1=", 7)) {
+                       cgit_query_sha1 = xstrdup(argv[i]+7);
+                       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;
 
 int main(int argc, const char **argv)
 {
        struct cacheitem item;
 

-       cgit_read_config("/etc/cgitrc", cgit_global_config_cb);
-       cgit_querystring = xstrdup(getenv("QUERY_STRING"));
-       cgit_parse_query(cgit_querystring, cgit_querystring_cb);
+       htmlfd = STDOUT_FILENO;
+       item.st.st_mtime = time(NULL);
+       cgit_repolist.length = 0;
+       cgit_repolist.count = 0;
+       cgit_repolist.repos = NULL;

 
 

-       cgit_check_cache(&item);
-       cgit_print_cache(&item);
+       cgit_read_config(CGIT_CONFIG, cgit_global_config_cb);
+       if (getenv("SCRIPT_NAME"))
+               cgit_script_name = xstrdup(getenv("SCRIPT_NAME"));
+       if (getenv("QUERY_STRING"))
+               cgit_querystring = xstrdup(getenv("QUERY_STRING"));
+       cgit_parse_args(argc, argv);
+       cgit_parse_query(cgit_querystring, cgit_querystring_cb);
+       if (!cgit_prepare_cache(&item))
+               return 0;
+       if (cgit_nocache) {
+               cgit_fill_cache(&item, 0);
+       } else {
+               cgit_check_cache(&item);
+               cgit_print_cache(&item);
+       }

        return 0;
 }
        return 0;
 }