git: update to v2.28.0

[cgit.git] / filter.c

diff --git a/filter.c b/filter.c
index 08ce7a5a021a598bc304f42d3760ac9eda0bfefa..70f5b749989c27e8bf1e87070066614805dbf5d6 100644 (file)
--- a/filter.c
+++ b/filter.c
@@ -8,23 +8,13 @@
 
 #include "cgit.h"
 #include "html.h"
 
 #include "cgit.h"
 #include "html.h"

-#include <sys/types.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <string.h>
-#include <stdlib.h>
-#include <dlfcn.h>
-#include <errno.h>

 #ifndef NO_LUA
 #ifndef NO_LUA

+#include <dlfcn.h>

 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 #endif
 
 #include <lua.h>
 #include <lualib.h>
 #include <lauxlib.h>
 #endif
 

-static ssize_t (*libc_write)(int fd, const void *buf, size_t count);
-static ssize_t (*filter_write)(struct cgit_filter *base, const void *buf, size_t count) = NULL;
-static struct cgit_filter *current_write_filter = NULL;
-

 static inline void reap_filter(struct cgit_filter *filter)
 {
        if (filter && filter->cleanup)
 static inline void reap_filter(struct cgit_filter *filter)
 {
        if (filter && filter->cleanup)


@@ -38,75 +28,48 @@ 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);

        }
 }
 
        }
 }
 

-void cgit_init_filters(void)
-{
-       libc_write = dlsym(RTLD_NEXT, "write");
-       if (!libc_write)
-               die("Could not locate libc's write function");
-}
-
-ssize_t write(int fd, const void *buf, size_t count)
-{
-       if (fd != STDOUT_FILENO || !filter_write)
-               return libc_write(fd, buf, count);
-       return filter_write(current_write_filter, buf, count);
-}
-
-static inline void hook_write(struct cgit_filter *filter, ssize_t (*new_write)(struct cgit_filter *base, const void *buf, size_t count))
-{
-       /* We want to avoid buggy nested patterns. */
-       assert(filter_write == NULL);
-       assert(current_write_filter == NULL);
-       current_write_filter = filter;
-       filter_write = new_write;
-}
-
-static inline void unhook_write()
-{
-       assert(filter_write != NULL);
-       assert(current_write_filter != NULL);
-       filter_write = NULL;
-       current_write_filter = NULL;
-}
-

 static int open_exec_filter(struct cgit_filter *base, va_list ap)
 {
 static int open_exec_filter(struct cgit_filter *base, va_list ap)
 {

-       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
+       int pipe_fh[2];

        int i;
 
        for (i = 0; i < filter->base.argument_count; i++)
        int i;
 
        for (i = 0; i < filter->base.argument_count; i++)

-               filter->argv[i+1] = va_arg(ap, char *);
+               filter->argv[i + 1] = va_arg(ap, char *);

 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
                "Unable to duplicate STDOUT");
 
        filter->old_stdout = chk_positive(dup(STDOUT_FILENO),
                "Unable to duplicate STDOUT");

-       chk_zero(pipe(filter->pipe_fh), "Unable to create pipe to subprocess");
+       chk_zero(pipe(pipe_fh), "Unable to create pipe to subprocess");

        filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
        if (filter->pid == 0) {
        filter->pid = chk_non_negative(fork(), "Unable to create subprocess");
        if (filter->pid == 0) {

-               close(filter->pipe_fh[1]);
-               chk_non_negative(dup2(filter->pipe_fh[0], STDIN_FILENO),
+               close(pipe_fh[1]);
+               chk_non_negative(dup2(pipe_fh[0], STDIN_FILENO),

                        "Unable to use pipe as STDIN");
                execvp(filter->cmd, filter->argv);
                die_errno("Unable to exec subprocess %s", filter->cmd);
        }
                        "Unable to use pipe as STDIN");
                execvp(filter->cmd, filter->argv);
                die_errno("Unable to exec subprocess %s", filter->cmd);
        }

-       close(filter->pipe_fh[0]);
-       chk_non_negative(dup2(filter->pipe_fh[1], STDOUT_FILENO),
+       close(pipe_fh[0]);
+       chk_non_negative(dup2(pipe_fh[1], STDOUT_FILENO),

                "Unable to use pipe as STDOUT");
                "Unable to use pipe as STDOUT");

-       close(filter->pipe_fh[1]);
+       close(pipe_fh[1]);

        return 0;
 }
 
 static int close_exec_filter(struct cgit_filter *base)
 {
        return 0;
 }
 
 static int close_exec_filter(struct cgit_filter *base)
 {

-       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
-       int i, exit_status;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;
+       int i, exit_status = 0;

 
        chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
                "Unable to restore STDOUT");
 
        chk_non_negative(dup2(filter->old_stdout, STDOUT_FILENO),
                "Unable to restore STDOUT");


@@ -114,26 +77,26 @@ static int close_exec_filter(struct cgit_filter *base)
        if (filter->pid < 0)
                goto done;
        waitpid(filter->pid, &exit_status, 0);
        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++)
                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;
+               filter->argv[i + 1] = NULL;
+       return WEXITSTATUS(exit_status);

 
 }
 
 static void fprintf_exec_filter(struct cgit_filter *base, FILE *f, const char *prefix)
 {
 
 }
 
 static void fprintf_exec_filter(struct cgit_filter *base, FILE *f, const char *prefix)
 {

-       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;

        fprintf(f, "%sexec:%s\n", prefix, filter->cmd);
 }
 
 static void cleanup_exec_filter(struct cgit_filter *base)
 {
        fprintf(f, "%sexec:%s\n", prefix, filter->cmd);
 }
 
 static void cleanup_exec_filter(struct cgit_filter *base)
 {

-       struct cgit_exec_filter *filter = (struct cgit_exec_filter *) base;
+       struct cgit_exec_filter *filter = (struct cgit_exec_filter *)base;

        if (filter->argv) {
                free(filter->argv);
                filter->argv = NULL;
        if (filter->argv) {
                free(filter->argv);
                filter->argv = NULL;


@@ -173,7 +136,48 @@ void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **ar
        filter->base.argument_count = 0;
 }
 
        filter->base.argument_count = 0;
 }
 

+#ifdef NO_LUA
+void cgit_init_filters(void)
+{
+}
+#endif
+

 #ifndef NO_LUA
 #ifndef NO_LUA

+static ssize_t (*libc_write)(int fd, const void *buf, size_t count);
+static ssize_t (*filter_write)(struct cgit_filter *base, const void *buf, size_t count) = NULL;
+static struct cgit_filter *current_write_filter = NULL;
+
+void cgit_init_filters(void)
+{
+       libc_write = dlsym(RTLD_NEXT, "write");
+       if (!libc_write)
+               die("Could not locate libc's write function");
+}
+
+ssize_t write(int fd, const void *buf, size_t count)
+{
+       if (fd != STDOUT_FILENO || !filter_write)
+               return libc_write(fd, buf, count);
+       return filter_write(current_write_filter, buf, count);
+}
+
+static inline void hook_write(struct cgit_filter *filter, ssize_t (*new_write)(struct cgit_filter *base, const void *buf, size_t count))
+{
+       /* We want to avoid buggy nested patterns. */
+       assert(filter_write == NULL);
+       assert(current_write_filter == NULL);
+       current_write_filter = filter;
+       filter_write = new_write;
+}
+
+static inline void unhook_write(void)
+{
+       assert(filter_write != NULL);
+       assert(current_write_filter != NULL);
+       filter_write = NULL;
+       current_write_filter = NULL;
+}
+

 struct lua_filter {
        struct cgit_filter base;
        char *script_file;
 struct lua_filter {
        struct cgit_filter base;
        char *script_file;


@@ -188,7 +192,7 @@ static void error_lua_filter(struct lua_filter *filter)
 
 static ssize_t write_lua_filter(struct cgit_filter *base, const void *buf, size_t count)
 {
 
 static ssize_t write_lua_filter(struct cgit_filter *base, const void *buf, size_t count)
 {

-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;

 
        lua_getglobal(filter->lua_state, "filter_write");
        lua_pushlstring(filter->lua_state, buf, count);
 
        lua_getglobal(filter->lua_state, "filter_write");
        lua_pushlstring(filter->lua_state, buf, count);


@@ -209,7 +213,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,9 +248,14 @@ 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)
 {
 static void cleanup_lua_filter(struct cgit_filter *base)
 {

-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;

 
        if (!filter->lua_state)
                return;
 
        if (!filter->lua_state)
                return;


@@ -279,6 +288,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);


@@ -291,7 +302,7 @@ static int init_lua_filter(struct lua_filter *filter)
 
 static int open_lua_filter(struct cgit_filter *base, va_list ap)
 {
 
 static int open_lua_filter(struct cgit_filter *base, va_list ap)
 {

-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;

        int i;
 
        if (init_lua_filter(filter))
        int i;
 
        if (init_lua_filter(filter))


@@ -311,21 +322,25 @@ static int open_lua_filter(struct cgit_filter *base, va_list ap)
 
 static int close_lua_filter(struct cgit_filter *base)
 {
 
 static int close_lua_filter(struct cgit_filter *base)
 {

-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;

        int ret = 0;
 
        lua_getglobal(filter->lua_state, "filter_close");
        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);
                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;
 }
 
 static void fprintf_lua_filter(struct cgit_filter *base, FILE *f, const char *prefix)
 {
        unhook_write();
        return ret;
 }
 
 static void fprintf_lua_filter(struct cgit_filter *base, FILE *f, const char *prefix)
 {

-       struct lua_filter *filter = (struct lua_filter *) base;
+       struct lua_filter *filter = (struct lua_filter *)base;

        fprintf(f, "%slua:%s\n", prefix, filter->script_file);
 }
 
        fprintf(f, "%slua:%s\n", prefix, filter->script_file);
 }
 


@@ -405,7 +420,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:
                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;