X-Git-Url: https://git.cameronkatri.com/cgit.git/blobdiff_plain/a5e15537268410e268c7b26aa69d03b347c326c8..bb3cc0d9666553608b7c89aef84d21d3312ce488:/filter.c?ds=sidebyside

diff --git a/filter.c b/filter.c
index 08ce7a5..90b9d68 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);
@@ -79,11 +80,11 @@ static inline void unhook_write()
 
 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 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");
@@ -105,8 +106,8 @@ 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;
+	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");
@@ -114,26 +115,26 @@ 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;
+		filter->argv[i + 1] = NULL;
+	return WEXITSTATUS(exit_status);
 
 }
 
 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)
 {
-	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;
@@ -188,7 +189,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)
 {
-	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);
@@ -244,9 +245,14 @@ 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;
+	struct lua_filter *filter = (struct lua_filter *)base;
 
 	if (!filter->lua_state)
 		return;
@@ -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);
@@ -291,7 +299,7 @@ static int init_lua_filter(struct lua_filter *filter)
 
 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))
@@ -311,21 +319,25 @@ static int open_lua_filter(struct cgit_filter *base, va_list ap)
 
 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");
-	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;
 }
 
 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);
 }
 
@@ -405,7 +417,14 @@ 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;
+
 		case SOURCE:
 		case ABOUT:
 			argument_count = 1;