X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/d3c0370a3f108121642d02bbd190ce676bb4772b..eeaffc33432d3cf91902cac3eab50c0598bdaa19:/filter.c

diff --git a/filter.c b/filter.c
index 4d4acaf..270f009 100644
--- a/filter.c
+++ b/filter.c
@@ -38,6 +38,7 @@ 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.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);
@@ -106,7 +107,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 +115,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);
 
 }
 
@@ -209,7 +210,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;
-	
+
 	save_filter_write = filter_write;
 	save_filter = current_write_filter;
 	unhook_write();
@@ -244,6 +245,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 +285,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 +323,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 +417,10 @@ struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
 		colon = NULL;
 
 	switch (filtertype) {
+		case AUTH:
+			argument_count = 12;
+			break;
+
 		case EMAIL:
 			argument_count = 2;
 			break;