auth: add basic authentication filter framework

[ps-cgit] / filter.c

diff --git a/filter.c b/filter.c
index 4d4acaf195a5e922d40f3f70256a2a95720dde63..a5e5e4b93ef6b25718bf18e7b1c2fe8d51a03098 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -106,7 +106,7 @@ static int open_exec_filter(struct cgit_filter *base, va_list ap)
 static int close_exec_filter(struct cgit_filter *base)
 {
        struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
-       int i, exit_status;
+       int i, exit_status = 0;
 
        chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
                "Unable to restore STDOUT");
@@ -114,14 +114,14 @@ static int close_exec_filter(struct cgit_filter *base)
        if (filter->pid < 0)
                goto done;
        waitpid(filter->pid, &exit_status, 0);
-       if (WIFEXITED(exit_status) && !WEXITSTATUS(exit_status))
+       if (WIFEXITED(exit_status))
                goto done;
        die("Subprocess %s exited abnormally", filter->cmd);
 
 done:
        for (i = 0; i < filter->base.argument_count; i++)
                filter->argv[i + 1] = NULL;
-       return 0;
+       return WEXITSTATUS(exit_status);
 
 }
 
@@ -244,6 +244,11 @@ static int html_url_arg_lua_filter(lua_State *lua_state)
        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;
@@ -279,6 +284,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_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);
@@ -315,10 +322,14 @@ static int close_lua_filter(struct cgit_filter *base)
        int ret = 0;
 
        lua_getglobal(filter->lua_state, "filter_close");
-       if (lua_pcall(filter->lua_state, 0, 0, 0)) {
+       if (lua_pcall(filter->lua_state, 0, 1, 0)) {
                error_lua_filter(filter);
-               ret = 1;
+               ret = -1;
+       } else {
+               ret = lua_tonumber(filter->lua_state, -1);
+               lua_pop(filter->lua_state, 1);
        }
+
        unhook_write();
        return ret;
 }
@@ -405,6 +416,10 @@ struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
                colon = NULL;
 
        switch (filtertype) {
+               case AUTH:
+                       argument_count = 11;
+                       break;
+
                case EMAIL:
                        argument_count = 2;
                        break;