cgit.c: allow repo.*-filter options to unset the current default

[cgit.git] / cgit.c

diff --git a/cgit.c b/cgit.c
index 497337b8e203188e54827bd4909e8cb8ff4d953a..b3a98c1599ff8971d9af03a0ca8ea1a1b6d8abb0 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -12,9 +12,26 @@
 #include "configfile.h"
 #include "html.h"
 #include "ui-shared.h"
 #include "configfile.h"
 #include "html.h"
 #include "ui-shared.h"

+#include "ui-stats.h"
+#include "scan-tree.h"

 
 const char *cgit_version = CGIT_VERSION;
 
 
 const char *cgit_version = CGIT_VERSION;
 

+struct cgit_filter *new_filter(const char *cmd, int extra_args)
+{
+       struct cgit_filter *f;
+
+       if (!cmd || !cmd[0])
+               return NULL;
+
+       f = xmalloc(sizeof(struct cgit_filter));
+       f->cmd = xstrdup(cmd);
+       f->argv = xmalloc((2 + extra_args) * sizeof(char *));
+       f->argv[0] = f->cmd;
+       f->argv[1] = NULL;
+       return f;
+}
+

 void config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "root-title"))
 void config_cb(const char *name, const char *value)
 {
        if (!strcmp(name, "root-title"))


@@ -29,6 +46,10 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.favicon = xstrdup(value);
        else if (!strcmp(name, "footer"))
                ctx.cfg.footer = xstrdup(value);
                ctx.cfg.favicon = xstrdup(value);
        else if (!strcmp(name, "footer"))
                ctx.cfg.footer = xstrdup(value);

+       else if (!strcmp(name, "head-include"))
+               ctx.cfg.head_include = xstrdup(value);
+       else if (!strcmp(name, "header"))
+               ctx.cfg.header = xstrdup(value);

        else if (!strcmp(name, "logo"))
                ctx.cfg.logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))
        else if (!strcmp(name, "logo"))
                ctx.cfg.logo = xstrdup(value);
        else if (!strcmp(name, "index-header"))


@@ -45,6 +66,8 @@ void config_cb(const char *name, const char *value)
                        ctx.cfg.virtual_root = "";
        } else if (!strcmp(name, "nocache"))
                ctx.cfg.nocache = atoi(value);
                        ctx.cfg.virtual_root = "";
        } else if (!strcmp(name, "nocache"))
                ctx.cfg.nocache = atoi(value);

+       else if (!strcmp(name, "noheader"))
+               ctx.cfg.noheader = atoi(value);

        else if (!strcmp(name, "snapshots"))
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-index-links"))
        else if (!strcmp(name, "snapshots"))
                ctx.cfg.snapshots = cgit_parse_snapshots_mask(value);
        else if (!strcmp(name, "enable-index-links"))


@@ -53,6 +76,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
                ctx.cfg.enable_log_linecount = atoi(value);
                ctx.cfg.enable_log_filecount = atoi(value);
        else if (!strcmp(name, "enable-log-linecount"))
                ctx.cfg.enable_log_linecount = atoi(value);

+       else if (!strcmp(name, "max-stats"))
+               ctx.cfg.max_stats = cgit_find_stats_period(value, NULL);

        else if (!strcmp(name, "cache-size"))
                ctx.cfg.cache_size = atoi(value);
        else if (!strcmp(name, "cache-root"))
        else if (!strcmp(name, "cache-size"))
                ctx.cfg.cache_size = atoi(value);
        else if (!strcmp(name, "cache-root"))


@@ -65,6 +90,10 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.cache_static_ttl = atoi(value);
        else if (!strcmp(name, "cache-dynamic-ttl"))
                ctx.cfg.cache_dynamic_ttl = atoi(value);
                ctx.cfg.cache_static_ttl = atoi(value);
        else if (!strcmp(name, "cache-dynamic-ttl"))
                ctx.cfg.cache_dynamic_ttl = atoi(value);

+       else if (!strcmp(name, "commit-filter"))
+               ctx.cfg.commit_filter = new_filter(value, 0);
+       else if (!strcmp(name, "embedded"))
+               ctx.cfg.embedded = atoi(value);

        else if (!strcmp(name, "max-message-length"))
                ctx.cfg.max_msg_len = atoi(value);
        else if (!strcmp(name, "max-repodesc-length"))
        else if (!strcmp(name, "max-message-length"))
                ctx.cfg.max_msg_len = atoi(value);
        else if (!strcmp(name, "max-repodesc-length"))


@@ -73,6 +102,8 @@ void config_cb(const char *name, const char *value)
                ctx.cfg.max_repo_count = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);
                ctx.cfg.max_repo_count = atoi(value);
        else if (!strcmp(name, "max-commit-count"))
                ctx.cfg.max_commit_count = atoi(value);

+       else if (!strcmp(name, "source-filter"))
+               ctx.cfg.source_filter = new_filter(value, 1);

        else if (!strcmp(name, "summary-log"))
                ctx.cfg.summary_log = atoi(value);
        else if (!strcmp(name, "summary-branches"))
        else if (!strcmp(name, "summary-log"))
                ctx.cfg.summary_log = atoi(value);
        else if (!strcmp(name, "summary-branches"))


@@ -111,8 +142,14 @@ void config_cb(const char *name, const char *value)
                ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
        else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
                ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);
                ctx.repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value);
        else if (ctx.repo && !strcmp(name, "repo.enable-log-linecount"))
                ctx.repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value);

+       else if (ctx.repo && !strcmp(name, "repo.max-stats"))
+               ctx.repo->max_stats = cgit_find_stats_period(value, NULL);

        else if (ctx.repo && !strcmp(name, "repo.module-link"))
                ctx.repo->module_link= xstrdup(value);
        else if (ctx.repo && !strcmp(name, "repo.module-link"))
                ctx.repo->module_link= xstrdup(value);

+       else if (ctx.repo && !strcmp(name, "repo.commit-filter"))
+               ctx.repo->commit_filter = new_filter(value, 0);
+       else if (ctx.repo && !strcmp(name, "repo.source-filter"))
+               ctx.repo->source_filter = new_filter(value, 1);

        else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
                if (*value == '/')
                        ctx.repo->readme = xstrdup(value);
        else if (ctx.repo && !strcmp(name, "repo.readme") && value != NULL) {
                if (*value == '/')
                        ctx.repo->readme = xstrdup(value);


@@ -130,6 +167,7 @@ static void querystring_cb(const char *name, const char *value)
        } else if (!strcmp(name, "p")) {
                ctx.qry.page = xstrdup(value);
        } else if (!strcmp(name, "url")) {
        } else if (!strcmp(name, "p")) {
                ctx.qry.page = xstrdup(value);
        } else if (!strcmp(name, "url")) {

+               ctx.qry.url = xstrdup(value);

                cgit_parse_url(value);
        } else if (!strcmp(name, "qt")) {
                ctx.qry.grep = xstrdup(value);
                cgit_parse_url(value);
        } else if (!strcmp(name, "qt")) {
                ctx.qry.grep = xstrdup(value);


@@ -152,6 +190,12 @@ static void querystring_cb(const char *name, const char *value)
                ctx.qry.name = xstrdup(value);
        } else if (!strcmp(name, "mimetype")) {
                ctx.qry.mimetype = xstrdup(value);
                ctx.qry.name = xstrdup(value);
        } else if (!strcmp(name, "mimetype")) {
                ctx.qry.mimetype = xstrdup(value);

+       } else if (!strcmp(name, "s")){
+               ctx.qry.sort = xstrdup(value);
+       } else if (!strcmp(name, "showmsg")) {
+               ctx.qry.showmsg = atoi(value);
+       } else if (!strcmp(name, "period")) {
+               ctx.qry.period = xstrdup(value);

        }
 }
 
        }
 }
 


@@ -175,6 +219,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->cfg.max_lock_attempts = 5;
        ctx->cfg.max_msg_len = 80;
        ctx->cfg.max_repodesc_len = 80;
        ctx->cfg.max_lock_attempts = 5;
        ctx->cfg.max_msg_len = 80;
        ctx->cfg.max_repodesc_len = 80;

+       ctx->cfg.max_stats = 0;

        ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
        ctx->cfg.renamelimit = -1;
        ctx->cfg.robots = "index, nofollow";
        ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s";
        ctx->cfg.renamelimit = -1;
        ctx->cfg.robots = "index, nofollow";


@@ -190,6 +235,7 @@ static void prepare_context(struct cgit_context *ctx)
        ctx->page.size = 0;
        ctx->page.modified = time(NULL);
        ctx->page.expires = ctx->page.modified;
        ctx->page.size = 0;
        ctx->page.modified = time(NULL);
        ctx->page.expires = ctx->page.modified;

+       ctx->page.etag = NULL;

 }
 
 struct refmatch {
 }
 
 struct refmatch {


@@ -252,6 +298,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
 
        if (!ctx->qry.head) {
        ctx->page.title = fmt("%s - %s", ctx->repo->name, ctx->repo->desc);
 
        if (!ctx->qry.head) {

+               ctx->qry.nohead = 1;

                ctx->qry.head = find_default_branch(ctx->repo);
                ctx->repo->defbranch = ctx->qry.head;
        }
                ctx->qry.head = find_default_branch(ctx->repo);
                ctx->repo->defbranch = ctx->qry.head;
        }


@@ -268,6 +315,8 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        if (get_sha1(ctx->qry.head, sha1)) {
                tmp = xstrdup(ctx->qry.head);
                ctx->qry.head = ctx->repo->defbranch;
        if (get_sha1(ctx->qry.head, sha1)) {
                tmp = xstrdup(ctx->qry.head);
                ctx->qry.head = ctx->repo->defbranch;

+               ctx->page.status = 404;
+               ctx->page.statusmsg = "not found";

                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);


@@ -286,7 +335,6 @@ static void process_request(void *cbdata)
        cmd = cgit_get_cmd(ctx);
        if (!cmd) {
                ctx->page.title = "cgit error";
        cmd = cgit_get_cmd(ctx);
        if (!cmd) {
                ctx->page.title = "cgit error";

-               ctx->repo = NULL;

                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);
                cgit_print_http_headers(ctx);
                cgit_print_docstart(ctx);
                cgit_print_pageheader(ctx);


@@ -319,9 +367,39 @@ static void process_request(void *cbdata)
                cgit_print_docend();
 }
 
                cgit_print_docend();
 }
 

+int cmp_repos(const void *a, const void *b)
+{
+       const struct cgit_repo *ra = a, *rb = b;
+       return strcmp(ra->url, rb->url);
+}
+
+void print_repo(struct cgit_repo *repo)
+{
+       printf("repo.url=%s\n", repo->url);
+       printf("repo.name=%s\n", repo->name);
+       printf("repo.path=%s\n", repo->path);
+       if (repo->owner)
+               printf("repo.owner=%s\n", repo->owner);
+       if (repo->desc)
+               printf("repo.desc=%s\n", repo->desc);
+       if (repo->readme)
+               printf("repo.readme=%s\n", repo->readme);
+       printf("\n");
+}
+
+void print_repolist(struct cgit_repolist *list)
+{
+       int i;
+
+       for(i = 0; i < list->count; i++)
+               print_repo(&list->repos[i]);
+}
+
+

 static void cgit_parse_args(int argc, const char **argv)
 {
        int i;
 static void cgit_parse_args(int argc, const char **argv)
 {
        int i;

+       int scan = 0;

 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {
 
        for (i = 1; i < argc; i++) {
                if (!strncmp(argv[i], "--cache=", 8)) {


@@ -350,6 +428,16 @@ static void cgit_parse_args(int argc, const char **argv)
                if (!strncmp(argv[i], "--ofs=", 6)) {
                        ctx.qry.ofs = atoi(argv[i]+6);
                }
                if (!strncmp(argv[i], "--ofs=", 6)) {
                        ctx.qry.ofs = atoi(argv[i]+6);
                }

+               if (!strncmp(argv[i], "--scan-tree=", 12)) {
+                       scan++;
+                       scan_tree(argv[i] + 12);
+               }
+       }
+       if (scan) {
+               qsort(cgit_repolist.repos, cgit_repolist.count,
+                       sizeof(struct cgit_repo), cmp_repos);
+               print_repolist(&cgit_repolist);
+               exit(0);

        }
 }
 
        }
 }
 


@@ -373,6 +461,9 @@ static int calc_ttl()
 int main(int argc, const char **argv)
 {
        const char *cgit_config_env = getenv("CGIT_CONFIG");
 int main(int argc, const char **argv)
 {
        const char *cgit_config_env = getenv("CGIT_CONFIG");

+       const char *method = getenv("REQUEST_METHOD");
+       const char *path;
+       char *qry;

        int err, ttl;
 
        prepare_context(&ctx);
        int err, ttl;
 
        prepare_context(&ctx);


@@ -380,18 +471,45 @@ int main(int argc, const char **argv)
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
 
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
 

-       parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
-                        config_cb);
-       ctx.repo = NULL;

        if (getenv("SCRIPT_NAME"))
                ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
        if (getenv("QUERY_STRING"))
                ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
        cgit_parse_args(argc, argv);
        if (getenv("SCRIPT_NAME"))
                ctx.cfg.script_name = xstrdup(getenv("SCRIPT_NAME"));
        if (getenv("QUERY_STRING"))
                ctx.qry.raw = xstrdup(getenv("QUERY_STRING"));
        cgit_parse_args(argc, argv);

+       parse_configfile(cgit_config_env ? cgit_config_env : CGIT_CONFIG,
+                        config_cb);
+       ctx.repo = NULL;

        http_parse_querystring(ctx.qry.raw, querystring_cb);
 
        http_parse_querystring(ctx.qry.raw, querystring_cb);
 

+       /* If virtual-root isn't specified in cgitrc, lets pretend
+        * that virtual-root equals SCRIPT_NAME.
+        */
+       if (!ctx.cfg.virtual_root)
+               ctx.cfg.virtual_root = ctx.cfg.script_name;
+
+       /* If no url parameter is specified on the querystring, lets
+        * use PATH_INFO as url. This allows cgit to work with virtual
+        * urls without the need for rewriterules in the webserver (as
+        * long as PATH_INFO is included in the cache lookup key).
+        */
+       path = getenv("PATH_INFO");
+       if (!ctx.qry.url && path) {
+               if (path[0] == '/')
+                       path++;
+               ctx.qry.url = xstrdup(path);
+               if (ctx.qry.raw) {
+                       qry = ctx.qry.raw;
+                       ctx.qry.raw = xstrdup(fmt("%s?%s", path, qry));
+                       free(qry);
+               } else
+                       ctx.qry.raw = ctx.qry.url;
+               cgit_parse_url(ctx.qry.url);
+       }
+

        ttl = calc_ttl();
        ctx.page.expires += ttl*60;
        ttl = calc_ttl();
        ctx.page.expires += ttl*60;

+       if (method && !strcmp(method, "HEAD"))
+               ctx.cfg.nocache = 1;

        if (ctx.cfg.nocache)
                ctx.cfg.cache_size = 0;
        err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,
        if (ctx.cfg.nocache)
                ctx.cfg.cache_size = 0;
        err = cache_process(ctx.cfg.cache_size, ctx.cfg.cache_root,