simple-authentication.lua: tie secure cookies to field names

[ps-cgit] / filter.c

diff --git a/filter.c b/filter.c
index 0cce7bb6a4d6e42ec018c009df1abfc55e652a31..9f433dbc178df40259245ba7b8b18702920e33fd 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -38,11 +38,14 @@ void cgit_cleanup_filters(void)
        reap_filter(ctx.cfg.commit_filter);
        reap_filter(ctx.cfg.source_filter);
        reap_filter(ctx.cfg.email_filter);
        reap_filter(ctx.cfg.commit_filter);
        reap_filter(ctx.cfg.source_filter);
        reap_filter(ctx.cfg.email_filter);

+       reap_filter(ctx.cfg.owner_filter);
+       reap_filter(ctx.cfg.auth_filter);

        for (i = 0; i < cgit_repolist.count; ++i) {
                reap_filter(cgit_repolist.repos[i].about_filter);
                reap_filter(cgit_repolist.repos[i].commit_filter);
                reap_filter(cgit_repolist.repos[i].source_filter);
                reap_filter(cgit_repolist.repos[i].email_filter);
        for (i = 0; i < cgit_repolist.count; ++i) {
                reap_filter(cgit_repolist.repos[i].about_filter);
                reap_filter(cgit_repolist.repos[i].commit_filter);
                reap_filter(cgit_repolist.repos[i].source_filter);
                reap_filter(cgit_repolist.repos[i].email_filter);

+               reap_filter(cgit_repolist.repos[i].owner_filter);

        }
 }
 
        }
 }
 


@@ -209,7 +212,7 @@ static inline int hook_lua_filter(lua_State *lua_state, void (*fn)(const char *t
        str = lua_tostring(lua_state, 1);
        if (!str)
                return 0;
        str = lua_tostring(lua_state, 1);
        if (!str)
                return 0;

-       
+

        save_filter_write = filter_write;
        save_filter = current_write_filter;
        unhook_write();
        save_filter_write = filter_write;
        save_filter = current_write_filter;
        unhook_write();


@@ -244,6 +247,11 @@ static int html_url_arg_lua_filter(lua_State *lua_state)
        return hook_lua_filter(lua_state, html_url_arg);
 }
 
        return hook_lua_filter(lua_state, html_url_arg);
 }
 

+static int html_include_lua_filter(lua_State *lua_state)
+{
+       return hook_lua_filter(lua_state, (void (*)(const char *))html_include);
+}
+

 static void cleanup_lua_filter(struct cgit_filter *base)
 {
        struct lua_filter *filter = (struct lua_filter *)base;
 static void cleanup_lua_filter(struct cgit_filter *base)
 {
        struct lua_filter *filter = (struct lua_filter *)base;


@@ -279,6 +287,8 @@ static int init_lua_filter(struct lua_filter *filter)
        lua_setglobal(filter->lua_state, "html_url_path");
        lua_pushcfunction(filter->lua_state, html_url_arg_lua_filter);
        lua_setglobal(filter->lua_state, "html_url_arg");
        lua_setglobal(filter->lua_state, "html_url_path");
        lua_pushcfunction(filter->lua_state, html_url_arg_lua_filter);
        lua_setglobal(filter->lua_state, "html_url_arg");

+       lua_pushcfunction(filter->lua_state, html_include_lua_filter);
+       lua_setglobal(filter->lua_state, "html_include");

 
        if (luaL_dofile(filter->lua_state, filter->script_file)) {
                error_lua_filter(filter);
 
        if (luaL_dofile(filter->lua_state, filter->script_file)) {
                error_lua_filter(filter);


@@ -409,10 +419,18 @@ struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
                colon = NULL;
 
        switch (filtertype) {
                colon = NULL;
 
        switch (filtertype) {

+               case AUTH:
+                       argument_count = 12;
+                       break;
+

                case EMAIL:
                        argument_count = 2;
                        break;
 
                case EMAIL:
                        argument_count = 2;
                        break;
 

+               case OWNER:
+                       argument_count = 0;
+                       break;
+

                case SOURCE:
                case ABOUT:
                        argument_count = 1;
                case SOURCE:
                case ABOUT:
                        argument_count = 1;