]> git.cameronkatri.com Git - cgit.git/blobdiff - cgit.c
ui-shared: do not allow negative minutes
[cgit.git] / cgit.c
diff --git a/cgit.c b/cgit.c
index e31962d43bc919c14e08f4ddbd4ff5e8cfc7a4b4..09fce0c7a49163a902a0e6675d9d8dbd7ee26465 100644 (file)
--- a/cgit.c
+++ b/cgit.c
@@ -27,36 +27,6 @@ static void add_mimetype(const char *name, const char *value)
        item->util = xstrdup(value);
 }
 
-static struct cgit_filter *new_filter(const char *cmd, filter_type filtertype)
-{
-       struct cgit_filter *f;
-       int args_size = 0;
-       int extra_args;
-
-       if (!cmd || !cmd[0])
-               return NULL;
-
-       switch (filtertype) {
-               case SOURCE:
-               case ABOUT:
-                       extra_args = 1;
-                       break;
-
-               case COMMIT:
-               default:
-                       extra_args = 0;
-                       break;
-       }
-
-       f = xmalloc(sizeof(struct cgit_filter));
-       f->cmd = xstrdup(cmd);
-       args_size = (2 + extra_args) * sizeof(char *);
-       f->argv = xmalloc(args_size);
-       memset(f->argv, 0, args_size);
-       f->argv[0] = f->cmd;
-       return f;
-}
-
 static void process_cached_repolist(const char *path);
 
 static void repo_config(struct cgit_repo *repo, const char *name, const char *value)
@@ -114,11 +84,13 @@ static void repo_config(struct cgit_repo *repo, const char *name, const char *va
                repo->logo_link = xstrdup(value);
        else if (ctx.cfg.enable_filter_overrides) {
                if (!strcmp(name, "about-filter"))
-                       repo->about_filter = new_filter(value, ABOUT);
+                       repo->about_filter = cgit_new_filter(value, ABOUT);
                else if (!strcmp(name, "commit-filter"))
-                       repo->commit_filter = new_filter(value, COMMIT);
+                       repo->commit_filter = cgit_new_filter(value, COMMIT);
                else if (!strcmp(name, "source-filter"))
-                       repo->source_filter = new_filter(value, SOURCE);
+                       repo->source_filter = cgit_new_filter(value, SOURCE);
+               else if (!strcmp(name, "email-filter"))
+                       repo->email_filter = cgit_new_filter(value, EMAIL);
        }
 }
 
@@ -215,9 +187,13 @@ static void config_cb(const char *name, const char *value)
        else if (!strcmp(name, "case-sensitive-sort"))
                ctx.cfg.case_sensitive_sort = atoi(value);
        else if (!strcmp(name, "about-filter"))
-               ctx.cfg.about_filter = new_filter(value, ABOUT);
+               ctx.cfg.about_filter = cgit_new_filter(value, ABOUT);
        else if (!strcmp(name, "commit-filter"))
-               ctx.cfg.commit_filter = new_filter(value, COMMIT);
+               ctx.cfg.commit_filter = cgit_new_filter(value, COMMIT);
+       else if (!strcmp(name, "email-filter"))
+               ctx.cfg.email_filter = cgit_new_filter(value, EMAIL);
+       else if (!strcmp(name, "auth-filter"))
+               ctx.cfg.auth_filter = cgit_new_filter(value, AUTH);
        else if (!strcmp(name, "embedded"))
                ctx.cfg.embedded = atoi(value);
        else if (!strcmp(name, "max-atom-items"))
@@ -251,7 +227,7 @@ static void config_cb(const char *name, const char *value)
        else if (!strcmp(name, "section-sort"))
                ctx.cfg.section_sort = atoi(value);
        else if (!strcmp(name, "source-filter"))
-               ctx.cfg.source_filter = new_filter(value, SOURCE);
+               ctx.cfg.source_filter = cgit_new_filter(value, SOURCE);
        else if (!strcmp(name, "summary-log"))
                ctx.cfg.summary_log = atoi(value);
        else if (!strcmp(name, "summary-branches"))
@@ -346,78 +322,82 @@ static void querystring_cb(const char *name, const char *value)
        }
 }
 
-static void prepare_context(struct cgit_context *ctx)
+static void prepare_context(void)
 {
-       memset(ctx, 0, sizeof(*ctx));
-       ctx->cfg.agefile = "info/web/last-modified";
-       ctx->cfg.nocache = 0;
-       ctx->cfg.cache_size = 0;
-       ctx->cfg.cache_max_create_time = 5;
-       ctx->cfg.cache_root = CGIT_CACHE_ROOT;
-       ctx->cfg.cache_about_ttl = 15;
-       ctx->cfg.cache_repo_ttl = 5;
-       ctx->cfg.cache_root_ttl = 5;
-       ctx->cfg.cache_scanrc_ttl = 15;
-       ctx->cfg.cache_dynamic_ttl = 5;
-       ctx->cfg.cache_static_ttl = -1;
-       ctx->cfg.case_sensitive_sort = 1;
-       ctx->cfg.branch_sort = 0;
-       ctx->cfg.commit_sort = 0;
-       ctx->cfg.css = "/cgit.css";
-       ctx->cfg.logo = "/cgit.png";
-       ctx->cfg.favicon = "/favicon.ico";
-       ctx->cfg.local_time = 0;
-       ctx->cfg.enable_http_clone = 1;
-       ctx->cfg.enable_index_owner = 1;
-       ctx->cfg.enable_tree_linenumbers = 1;
-       ctx->cfg.enable_git_config = 0;
-       ctx->cfg.max_repo_count = 50;
-       ctx->cfg.max_commit_count = 50;
-       ctx->cfg.max_lock_attempts = 5;
-       ctx->cfg.max_msg_len = 80;
-       ctx->cfg.max_repodesc_len = 80;
-       ctx->cfg.max_blob_size = 0;
-       ctx->cfg.max_stats = 0;
-       ctx->cfg.project_list = NULL;
-       ctx->cfg.renamelimit = -1;
-       ctx->cfg.remove_suffix = 0;
-       ctx->cfg.robots = "index, nofollow";
-       ctx->cfg.root_title = "Git repository browser";
-       ctx->cfg.root_desc = "a fast webinterface for the git dscm";
-       ctx->cfg.scan_hidden_path = 0;
-       ctx->cfg.script_name = CGIT_SCRIPT_NAME;
-       ctx->cfg.section = "";
-       ctx->cfg.repository_sort = "name";
-       ctx->cfg.section_sort = 1;
-       ctx->cfg.summary_branches = 10;
-       ctx->cfg.summary_log = 10;
-       ctx->cfg.summary_tags = 10;
-       ctx->cfg.max_atom_items = 10;
-       ctx->cfg.ssdiff = 0;
-       ctx->env.cgit_config = getenv("CGIT_CONFIG");
-       ctx->env.http_host = getenv("HTTP_HOST");
-       ctx->env.https = getenv("HTTPS");
-       ctx->env.no_http = getenv("NO_HTTP");
-       ctx->env.path_info = getenv("PATH_INFO");
-       ctx->env.query_string = getenv("QUERY_STRING");
-       ctx->env.request_method = getenv("REQUEST_METHOD");
-       ctx->env.script_name = getenv("SCRIPT_NAME");
-       ctx->env.server_name = getenv("SERVER_NAME");
-       ctx->env.server_port = getenv("SERVER_PORT");
-       ctx->page.mimetype = "text/html";
-       ctx->page.charset = PAGE_ENCODING;
-       ctx->page.filename = NULL;
-       ctx->page.size = 0;
-       ctx->page.modified = time(NULL);
-       ctx->page.expires = ctx->page.modified;
-       ctx->page.etag = NULL;
-       memset(&ctx->cfg.mimetypes, 0, sizeof(struct string_list));
-       if (ctx->env.script_name)
-               ctx->cfg.script_name = xstrdup(ctx->env.script_name);
-       if (ctx->env.query_string)
-               ctx->qry.raw = xstrdup(ctx->env.query_string);
-       if (!ctx->env.cgit_config)
-               ctx->env.cgit_config = CGIT_CONFIG;
+       memset(&ctx, 0, sizeof(ctx));
+       ctx.cfg.agefile = "info/web/last-modified";
+       ctx.cfg.nocache = 0;
+       ctx.cfg.cache_size = 0;
+       ctx.cfg.cache_max_create_time = 5;
+       ctx.cfg.cache_root = CGIT_CACHE_ROOT;
+       ctx.cfg.cache_about_ttl = 15;
+       ctx.cfg.cache_repo_ttl = 5;
+       ctx.cfg.cache_root_ttl = 5;
+       ctx.cfg.cache_scanrc_ttl = 15;
+       ctx.cfg.cache_dynamic_ttl = 5;
+       ctx.cfg.cache_static_ttl = -1;
+       ctx.cfg.case_sensitive_sort = 1;
+       ctx.cfg.branch_sort = 0;
+       ctx.cfg.commit_sort = 0;
+       ctx.cfg.css = "/cgit.css";
+       ctx.cfg.logo = "/cgit.png";
+       ctx.cfg.favicon = "/favicon.ico";
+       ctx.cfg.local_time = 0;
+       ctx.cfg.enable_http_clone = 1;
+       ctx.cfg.enable_index_owner = 1;
+       ctx.cfg.enable_tree_linenumbers = 1;
+       ctx.cfg.enable_git_config = 0;
+       ctx.cfg.max_repo_count = 50;
+       ctx.cfg.max_commit_count = 50;
+       ctx.cfg.max_lock_attempts = 5;
+       ctx.cfg.max_msg_len = 80;
+       ctx.cfg.max_repodesc_len = 80;
+       ctx.cfg.max_blob_size = 0;
+       ctx.cfg.max_stats = 0;
+       ctx.cfg.project_list = NULL;
+       ctx.cfg.renamelimit = -1;
+       ctx.cfg.remove_suffix = 0;
+       ctx.cfg.robots = "index, nofollow";
+       ctx.cfg.root_title = "Git repository browser";
+       ctx.cfg.root_desc = "a fast webinterface for the git dscm";
+       ctx.cfg.scan_hidden_path = 0;
+       ctx.cfg.script_name = CGIT_SCRIPT_NAME;
+       ctx.cfg.section = "";
+       ctx.cfg.repository_sort = "name";
+       ctx.cfg.section_sort = 1;
+       ctx.cfg.summary_branches = 10;
+       ctx.cfg.summary_log = 10;
+       ctx.cfg.summary_tags = 10;
+       ctx.cfg.max_atom_items = 10;
+       ctx.cfg.ssdiff = 0;
+       ctx.env.cgit_config = getenv("CGIT_CONFIG");
+       ctx.env.http_host = getenv("HTTP_HOST");
+       ctx.env.https = getenv("HTTPS");
+       ctx.env.no_http = getenv("NO_HTTP");
+       ctx.env.path_info = getenv("PATH_INFO");
+       ctx.env.query_string = getenv("QUERY_STRING");
+       ctx.env.request_method = getenv("REQUEST_METHOD");
+       ctx.env.script_name = getenv("SCRIPT_NAME");
+       ctx.env.server_name = getenv("SERVER_NAME");
+       ctx.env.server_port = getenv("SERVER_PORT");
+       ctx.env.http_cookie = getenv("HTTP_COOKIE");
+       ctx.env.http_referer = getenv("HTTP_REFERER");
+       ctx.env.content_length = getenv("CONTENT_LENGTH") ? strtoul(getenv("CONTENT_LENGTH"), NULL, 10) : 0;
+       ctx.env.authenticated = 0;
+       ctx.page.mimetype = "text/html";
+       ctx.page.charset = PAGE_ENCODING;
+       ctx.page.filename = NULL;
+       ctx.page.size = 0;
+       ctx.page.modified = time(NULL);
+       ctx.page.expires = ctx.page.modified;
+       ctx.page.etag = NULL;
+       memset(&ctx.cfg.mimetypes, 0, sizeof(struct string_list));
+       if (ctx.env.script_name)
+               ctx.cfg.script_name = xstrdup(ctx.env.script_name);
+       if (ctx.env.query_string)
+               ctx.qry.raw = xstrdup(ctx.env.query_string);
+       if (!ctx.env.cgit_config)
+               ctx.env.cgit_config = CGIT_CONFIG;
 }
 
 struct refmatch {
@@ -547,14 +527,14 @@ static void choose_readme(struct cgit_repo *repo)
                string_list_append(&repo->readme, filename)->util = ref;
 }
 
-static int prepare_repo_cmd(struct cgit_context *ctx)
+static int prepare_repo_cmd(void)
 {
        unsigned char sha1[20];
        int nongit = 0;
        int rc;
 
        /* The path to the git repository. */
-       setenv("GIT_DIR", ctx->repo->path, 1);
+       setenv("GIT_DIR", ctx.repo->path, 1);
 
        /* Do not look in /etc/ for gitconfig and gitattributes. */
        setenv("GIT_CONFIG_NOSYSTEM", "1", 1);
@@ -569,104 +549,180 @@ static int prepare_repo_cmd(struct cgit_context *ctx)
        init_display_notes(NULL);
 
        if (nongit) {
-               const char *name = ctx->repo->name;
+               const char *name = ctx.repo->name;
                rc = errno;
-               ctx->page.title = fmtalloc("%s - %s", ctx->cfg.root_title,
+               ctx.page.title = fmtalloc("%s - %s", ctx.cfg.root_title,
                                                "config error");
-               ctx->repo = NULL;
-               cgit_print_http_headers(ctx);
-               cgit_print_docstart(ctx);
-               cgit_print_pageheader(ctx);
+               ctx.repo = NULL;
+               cgit_print_http_headers();
+               cgit_print_docstart();
+               cgit_print_pageheader();
                cgit_print_error("Failed to open %s: %s", name,
                                 rc ? strerror(rc) : "Not a valid git repository");
                cgit_print_docend();
                return 1;
        }
-       ctx->page.title = fmtalloc("%s - %s", ctx->repo->name, ctx->repo->desc);
+       ctx.page.title = fmtalloc("%s - %s", ctx.repo->name, ctx.repo->desc);
 
-       if (!ctx->repo->defbranch)
-               ctx->repo->defbranch = guess_defbranch();
+       if (!ctx.repo->defbranch)
+               ctx.repo->defbranch = guess_defbranch();
 
-       if (!ctx->qry.head) {
-               ctx->qry.nohead = 1;
-               ctx->qry.head = find_default_branch(ctx->repo);
+       if (!ctx.qry.head) {
+               ctx.qry.nohead = 1;
+               ctx.qry.head = find_default_branch(ctx.repo);
        }
 
-       if (!ctx->qry.head) {
-               cgit_print_http_headers(ctx);
-               cgit_print_docstart(ctx);
-               cgit_print_pageheader(ctx);
+       if (!ctx.qry.head) {
+               cgit_print_http_headers();
+               cgit_print_docstart();
+               cgit_print_pageheader();
                cgit_print_error("Repository seems to be empty");
                cgit_print_docend();
                return 1;
        }
 
-       if (get_sha1(ctx->qry.head, sha1)) {
-               char *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);
+       if (get_sha1(ctx.qry.head, sha1)) {
+               char *tmp = xstrdup(ctx.qry.head);
+               ctx.qry.head = ctx.repo->defbranch;
+               ctx.page.status = 404;
+               ctx.page.statusmsg = "Not found";
+               cgit_print_http_headers();
+               cgit_print_docstart();
+               cgit_print_pageheader();
                cgit_print_error("Invalid branch: %s", tmp);
                cgit_print_docend();
+               free(tmp);
                return 1;
        }
-       sort_string_list(&ctx->repo->submodules);
-       cgit_prepare_repo_env(ctx->repo);
-       choose_readme(ctx->repo);
+       sort_string_list(&ctx.repo->submodules);
+       cgit_prepare_repo_env(ctx.repo);
+       choose_readme(ctx.repo);
        return 0;
 }
 
-static void process_request(void *cbdata)
+static inline void open_auth_filter(const char *function)
+{
+       cgit_open_filter(ctx.cfg.auth_filter, function,
+               ctx.env.http_cookie ? ctx.env.http_cookie : "",
+               ctx.env.request_method ? ctx.env.request_method : "",
+               ctx.env.query_string ? ctx.env.query_string : "",
+               ctx.env.http_referer ? ctx.env.http_referer : "",
+               ctx.env.path_info ? ctx.env.path_info : "",
+               ctx.env.http_host ? ctx.env.http_host : "",
+               ctx.env.https ? ctx.env.https : "",
+               ctx.qry.repo ? ctx.qry.repo : "",
+               ctx.qry.page ? ctx.qry.page : "",
+               ctx.qry.url ? ctx.qry.url : "",
+               cgit_loginurl());
+}
+
+/* We intentionally keep this rather small, instead of looping and
+ * feeding it to the filter a couple bytes at a time. This way, the
+ * filter itself does not need to handle any denial of service or
+ * buffer bloat issues. If this winds up being too small, people
+ * will complain on the mailing list, and we'll increase it as needed. */
+#define MAX_AUTHENTICATION_POST_BYTES 4096
+/* The filter is expected to spit out "Status: " and all headers. */
+static inline void authenticate_post(void)
+{
+       char buffer[MAX_AUTHENTICATION_POST_BYTES];
+       int len;
+
+       open_auth_filter("authenticate-post");
+       len = ctx.env.content_length;
+       if (len > MAX_AUTHENTICATION_POST_BYTES)
+               len = MAX_AUTHENTICATION_POST_BYTES;
+       if (read(STDIN_FILENO, buffer, len) < 0)
+               die_errno("Could not read POST from stdin");
+       if (write(STDOUT_FILENO, buffer, len) < 0)
+               die_errno("Could not write POST to stdout");
+       cgit_close_filter(ctx.cfg.auth_filter);
+       exit(0);
+}
+
+static inline void authenticate_cookie(void)
+{
+       /* If we don't have an auth_filter, consider all cookies valid, and thus return early. */
+       if (!ctx.cfg.auth_filter) {
+               ctx.env.authenticated = 1;
+               return;
+       }
+
+       /* If we're having something POST'd to /login, we're authenticating POST,
+        * instead of the cookie, so call authenticate_post and bail out early.
+        * This pattern here should match /?p=login with POST. */
+       if (ctx.env.request_method && ctx.qry.page && !ctx.repo && \
+           !strcmp(ctx.env.request_method, "POST") && !strcmp(ctx.qry.page, "login")) {
+               authenticate_post();
+               return;
+       }
+
+       /* If we've made it this far, we're authenticating the cookie for real, so do that. */
+       open_auth_filter("authenticate-cookie");
+       ctx.env.authenticated = cgit_close_filter(ctx.cfg.auth_filter);
+}
+
+static void process_request(void)
 {
-       struct cgit_context *ctx = cbdata;
        struct cgit_cmd *cmd;
 
-       cmd = cgit_get_cmd(ctx);
+       /* If we're not yet authenticated, no matter what page we're on,
+        * display the authentication body from the auth_filter. This should
+        * never be cached. */
+       if (!ctx.env.authenticated) {
+               ctx.page.title = "Authentication Required";
+               cgit_print_http_headers();
+               cgit_print_docstart();
+               cgit_print_pageheader();
+               open_auth_filter("body");
+               cgit_close_filter(ctx.cfg.auth_filter);
+               cgit_print_docend();
+               return;
+       }
+
+       cmd = cgit_get_cmd();
        if (!cmd) {
-               ctx->page.title = "cgit error";
-               ctx->page.status = 404;
-               ctx->page.statusmsg = "Not found";
-               cgit_print_http_headers(ctx);
-               cgit_print_docstart(ctx);
-               cgit_print_pageheader(ctx);
+               ctx.page.title = "cgit error";
+               ctx.page.status = 404;
+               ctx.page.statusmsg = "Not found";
+               cgit_print_http_headers();
+               cgit_print_docstart();
+               cgit_print_pageheader();
                cgit_print_error("Invalid request");
                cgit_print_docend();
                return;
        }
 
-       if (!ctx->cfg.enable_http_clone && cmd->is_clone) {
+       if (!ctx.cfg.enable_http_clone && cmd->is_clone) {
                html_status(404, "Not found", 0);
                return;
        }
 
-       /* If cmd->want_vpath is set, assume ctx->qry.path contains a "virtual"
-        * in-project path limit to be made available at ctx->qry.vpath.
-        * Otherwise, no path limit is in effect (ctx->qry.vpath = NULL).
+       /* If cmd->want_vpath is set, assume ctx.qry.path contains a "virtual"
+        * in-project path limit to be made available at ctx.qry.vpath.
+        * Otherwise, no path limit is in effect (ctx.qry.vpath = NULL).
         */
-       ctx->qry.vpath = cmd->want_vpath ? ctx->qry.path : NULL;
+       ctx.qry.vpath = cmd->want_vpath ? ctx.qry.path : NULL;
 
-       if (cmd->want_repo && !ctx->repo) {
-               cgit_print_http_headers(ctx);
-               cgit_print_docstart(ctx);
-               cgit_print_pageheader(ctx);
+       if (cmd->want_repo && !ctx.repo) {
+               cgit_print_http_headers();
+               cgit_print_docstart();
+               cgit_print_pageheader();
                cgit_print_error("No repository selected");
                cgit_print_docend();
                return;
        }
 
-       if (ctx->repo && prepare_repo_cmd(ctx))
+       if (ctx.repo && prepare_repo_cmd())
                return;
 
        if (cmd->want_layout) {
-               cgit_print_http_headers(ctx);
-               cgit_print_docstart(ctx);
-               cgit_print_pageheader(ctx);
+               cgit_print_http_headers();
+               cgit_print_docstart();
+               cgit_print_pageheader();
        }
 
-       cmd->fn(ctx);
+       cmd->fn();
 
        if (cmd->want_layout)
                cgit_print_docend();
@@ -736,11 +792,13 @@ static void print_repo(FILE *f, struct cgit_repo *repo)
        fprintf(f, "repo.enable-log-linecount=%d\n",
                repo->enable_log_linecount);
        if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter)
-               fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd);
+               cgit_fprintf_filter(repo->about_filter, f, "repo.about-filter=");
        if (repo->commit_filter && repo->commit_filter != ctx.cfg.commit_filter)
-               fprintf(f, "repo.commit-filter=%s\n", repo->commit_filter->cmd);
+               cgit_fprintf_filter(repo->commit_filter, f, "repo.commit-filter=");
        if (repo->source_filter && repo->source_filter != ctx.cfg.source_filter)
-               fprintf(f, "repo.source-filter=%s\n", repo->source_filter->cmd);
+               cgit_fprintf_filter(repo->source_filter, f, "repo.source-filter=");
+       if (repo->email_filter && repo->email_filter != ctx.cfg.email_filter)
+               cgit_fprintf_filter(repo->email_filter, f, "repo.email-filter=");
        if (repo->snapshots != ctx.cfg.snapshots) {
                char *tmp = build_snapshot_setting(repo->snapshots);
                fprintf(f, "repo.snapshots=%s\n", tmp ? tmp : "");
@@ -865,43 +923,36 @@ static void cgit_parse_args(int argc, const char **argv)
        for (i = 1; i < argc; i++) {
                if (!prefixcmp(argv[i], "--cache=")) {
                        ctx.cfg.cache_root = xstrdup(argv[i] + 8);
-               }
-               if (!strcmp(argv[i], "--nocache")) {
+               } else if (!strcmp(argv[i], "--nocache")) {
                        ctx.cfg.nocache = 1;
-               }
-               if (!strcmp(argv[i], "--nohttp")) {
+               } else if (!strcmp(argv[i], "--nohttp")) {
                        ctx.env.no_http = "1";
-               }
-               if (!prefixcmp(argv[i], "--query=")) {
+               } else if (!prefixcmp(argv[i], "--query=")) {
                        ctx.qry.raw = xstrdup(argv[i] + 8);
-               }
-               if (!prefixcmp(argv[i], "--repo=")) {
+               } else if (!prefixcmp(argv[i], "--repo=")) {
                        ctx.qry.repo = xstrdup(argv[i] + 7);
-               }
-               if (!prefixcmp(argv[i], "--page=")) {
+               } else if (!prefixcmp(argv[i], "--page=")) {
                        ctx.qry.page = xstrdup(argv[i] + 7);
-               }
-               if (!prefixcmp(argv[i], "--head=")) {
+               } else if (!prefixcmp(argv[i], "--head=")) {
                        ctx.qry.head = xstrdup(argv[i] + 7);
                        ctx.qry.has_symref = 1;
-               }
-               if (!prefixcmp(argv[i], "--sha1=")) {
+               } else if (!prefixcmp(argv[i], "--sha1=")) {
                        ctx.qry.sha1 = xstrdup(argv[i] + 7);
                        ctx.qry.has_sha1 = 1;
-               }
-               if (!prefixcmp(argv[i], "--ofs=")) {
+               } else if (!prefixcmp(argv[i], "--ofs=")) {
                        ctx.qry.ofs = atoi(argv[i] + 6);
-               }
-               if (!prefixcmp(argv[i], "--scan-tree=") ||
-                   !prefixcmp(argv[i], "--scan-path=")) {
-                       /* HACK: the global snapshot bitmask defines the
-                        * set of allowed snapshot formats, but the config
-                        * file hasn't been parsed yet so the mask is
-                        * currently 0. By setting all bits high before
-                        * scanning we make sure that any in-repo cgitrc
-                        * snapshot setting is respected by scan_tree().
-                        * BTW: we assume that there'll never be more than
-                        * 255 different snapshot formats supported by cgit...
+               } else if (!prefixcmp(argv[i], "--scan-tree=") ||
+                          !prefixcmp(argv[i], "--scan-path=")) {
+                       /*
+                        * HACK: The global snapshot bit mask defines the set
+                        * of allowed snapshot formats, but the config file
+                        * hasn't been parsed yet so the mask is currently 0.
+                        * By setting all bits high before scanning we make
+                        * sure that any in-repo cgitrc snapshot setting is
+                        * respected by scan_tree().
+                        *
+                        * NOTE: We assume that there aren't more than 8
+                        * different snapshot formats supported by cgit...
                         */
                        ctx.cfg.snapshots = 0xFF;
                        scan++;
@@ -941,7 +992,10 @@ int main(int argc, const char **argv)
        const char *path;
        int err, ttl;
 
-       prepare_context(&ctx);
+       cgit_init_filters();
+       atexit(cgit_cleanup_filters);
+
+       prepare_context();
        cgit_repolist.length = 0;
        cgit_repolist.count = 0;
        cgit_repolist.repos = NULL;
@@ -977,17 +1031,23 @@ int main(int argc, const char **argv)
                cgit_parse_url(ctx.qry.url);
        }
 
+       /* Before we go any further, we set ctx.env.authenticated by checking to see
+        * if the supplied cookie is valid. All cookies are valid if there is no
+        * auth_filter. If there is an auth_filter, the filter decides. */
+       authenticate_cookie();
+
        ttl = calc_ttl();
        if (ttl < 0)
                ctx.page.expires += 10 * 365 * 24 * 60 * 60; /* 10 years */
        else
                ctx.page.expires += ttl * 60;
-       if (ctx.env.request_method && !strcmp(ctx.env.request_method, "HEAD"))
+       if (!ctx.env.authenticated || (ctx.env.request_method && !strcmp(ctx.env.request_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,
-                           ctx.qry.raw, ttl, process_request, &ctx);
+                           ctx.qry.raw, ttl, process_request);
+       cgit_cleanup_filters();
        if (err)
                cgit_print_error("Error processing page: %s (%d)",
                                 strerror(err), err);