diff --git a/README b/README
index 7a6b4a4..371cf21 100644
--- a/README
+++ b/README
@@ -32,18 +32,6 @@ This will install `cgit.cgi` and `cgit.css` into `/var/www/htdocs/cgit`. You
can configure this location (and a few other things) by providing a `cgit.conf`
file (see the Makefile for details).
-If you'd like to compile without Lua support, you may use:
-
- $ make NO_LUA=1
-
-And if you'd like to specify a Lua implementation, you may use:
-
- $ make LUA_PKGCONFIG=lua5.1
-
-If this is not specified, the Lua implementation will be auto-detected,
-preferring LuaJIT if many are present. Acceptable values are generally "lua",
-"luajit", "lua5.1", and "lua5.2".
-
Dependencies
------------
@@ -51,7 +39,6 @@ Dependencies
* libzip
* libcrypto (OpenSSL)
* libssl (OpenSSL)
-* optional: luajit or lua, most reliably used when pkg-config is available
Apache configuration
--------------------
diff --git a/cgit.c b/cgit.c
index 5a5e3c8..2e5ebc1 100644
--- a/cgit.c
+++ b/cgit.c
@@ -973,12 +973,6 @@ static void cgit_parse_args(int argc, const char **argv)
for (i = 1; i < argc; i++) {
if (!strcmp(argv[i], "--version")) {
printf("CGit %s | https://git.zx2c4.com/cgit/\n\nCompiled in features:\n", CGIT_VERSION);
-#ifdef NO_LUA
- printf("[-] ");
-#else
- printf("[+] ");
-#endif
- printf("Lua scripting\n");
#ifndef HAVE_LINUX_SENDFILE
printf("[-] ");
#else
@@ -1060,7 +1054,6 @@ int cmd_main(int argc, const char **argv)
const char *path;
int err, ttl;
- cgit_init_filters();
atexit(cgit_cleanup_filters);
prepare_context();
diff --git a/cgit.h b/cgit.h
index e0d286d..dafc8c4 100644
--- a/cgit.h
+++ b/cgit.h
@@ -391,7 +391,6 @@ extern void cgit_fprintf_filter(struct cgit_filter *filter, FILE *f, const char
extern void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **argv);
extern struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype);
extern void cgit_cleanup_filters(void);
-extern void cgit_init_filters(void);
extern void cgit_prepare_repo_env(struct cgit_repo * repo);
diff --git a/cgit.mk b/cgit.mk
index 3fcc1ca..5b9ed5b 100644
--- a/cgit.mk
+++ b/cgit.mk
@@ -27,32 +27,6 @@ ifdef NO_C99_FORMAT
CFLAGS += -DNO_C99_FORMAT
endif
-ifdef NO_LUA
- LUA_MESSAGE := linking without specified Lua support
- CGIT_CFLAGS += -DNO_LUA
-else
-ifeq ($(LUA_PKGCONFIG),)
- LUA_PKGCONFIG := $(shell for pc in luajit lua lua5.2 lua5.1; do \
- $(PKG_CONFIG) --exists $$pc 2>/dev/null && echo $$pc && break; \
- done)
- LUA_MODE := autodetected
-else
- LUA_MODE := specified
-endif
-ifneq ($(LUA_PKGCONFIG),)
- LUA_MESSAGE := linking with $(LUA_MODE) $(LUA_PKGCONFIG)
- LUA_LIBS := $(shell $(PKG_CONFIG) --libs $(LUA_PKGCONFIG) 2>/dev/null)
- LUA_CFLAGS := $(shell $(PKG_CONFIG) --cflags $(LUA_PKGCONFIG) 2>/dev/null)
- CGIT_LIBS += $(LUA_LIBS)
- CGIT_CFLAGS += $(LUA_CFLAGS)
-else
- LUA_MESSAGE := linking without autodetected Lua support
- NO_LUA := YesPlease
- CGIT_CFLAGS += -DNO_LUA
-endif
-
-endif
-
# Add -ldl to linker flags on systems that commonly use GNU libc.
ifneq (,$(filter $(uname_S),Linux GNU GNU/kFreeBSD))
CGIT_LIBS += -ldl
@@ -130,7 +104,6 @@ $(CGIT_OBJS): %.o: %.c GIT-CFLAGS $(CGIT_PREFIX)CGIT-CFLAGS $(missing_dep_dirs)
$(QUIET_CC)$(CC) -o $*.o -c $(dep_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $(CGIT_CFLAGS) $<
$(CGIT_PREFIX)cgit: $(CGIT_OBJS) GIT-LDFLAGS $(GITLIBS)
- @echo 1>&1 " * $(LUA_MESSAGE)"
$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(LIBS) $(CGIT_LIBS)
CGIT_SP_OBJS := $(patsubst %.o,%.sp,$(CGIT_OBJS))
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 24ed09f..1ac9882 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -639,37 +639,6 @@ specification with the relevant string; available values are:
'exec:'::
The default "one process per filter" mode.
-'lua:'::
- Executes the script using a built-in Lua interpreter. The script is
- loaded once per execution of cgit, and may be called multiple times
- during cgit's lifetime, making it a good choice for repeated filters
- such as the 'email filter'. It responds to three functions:
-
- 'filter_open(argument1, argument2, argument3, ...)'::
- This is called upon activation of the filter for a particular
- set of data.
- 'filter_write(buffer)'::
- This is called whenever cgit writes data to the webpage.
- 'filter_close()'::
- This is called when the current filtering operation is
- completed. It must return an integer value. Usually 0
- indicates success.
-
- Additionally, cgit exposes to the Lua the following built-in functions:
-
- 'html(str)'::
- Writes 'str' to the webpage.
- 'html_txt(str)'::
- HTML escapes and writes 'str' to the webpage.
- 'html_attr(str)'::
- HTML escapes for an attribute and writes "str' to the webpage.
- 'html_url_path(str)'::
- URL escapes for a path and writes 'str' to the webpage.
- 'html_url_arg(str)'::
- URL escapes for an argument and writes 'str' to the webpage.
- 'html_include(file)'::
- Includes 'file' in webpage.
-
Parameters are provided to filters as follows.
@@ -703,9 +672,6 @@ auth filter::
with a 302 redirect, and write to output one or more "Set-Cookie"
HTTP headers, each followed by a newline.
- Please see `filters/simple-authentication.lua` for a clear example
- script that may be modified.
-
commit filter::
This filter is given no arguments. The commit message text that is to
be filtered is available on standard input and the filtered text is
diff --git a/filter.c b/filter.c
index abdd4b0..8fc14e1 100644
--- a/filter.c
+++ b/filter.c
@@ -8,12 +8,6 @@
#include "cgit.h"
#include "html.h"
-#ifndef NO_LUA
-#include <dlfcn.h>
-#include <lua.h>
-#include <lualib.h>
-#include <lauxlib.h>
-#endif
static inline void reap_filter(struct cgit_filter *filter)
{
@@ -138,252 +132,6 @@ void cgit_exec_filter_init(struct cgit_exec_filter *filter, char *cmd, char **ar
filter->base.argument_count = 0;
}
-#ifdef NO_LUA
-void cgit_init_filters(void)
-{
-}
-#endif
-
-#ifndef NO_LUA
-static size_t (*libc_fwrite)(const void *buf, size_t size, size_t n, FILE *);
-static ssize_t (*libc_write)(int fd, const void *buf, size_t size);
-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)
-{
- /*
- * we need to wrap both functions since the Lua filter may
- * have code which calls write(2) directly, bypassing fwrite(3)
- */
- libc_fwrite = dlsym(RTLD_NEXT, "fwrite");
- if (!libc_fwrite)
- die("Could not locate libc's write function");
- libc_write = dlsym(RTLD_NEXT, "write");
- if (!libc_write)
- die("Could not locate libc's write function");
-}
-
-size_t fwrite(const void *buf, size_t size, size_t n, FILE *f)
-{
- if (f != stdout || !filter_write)
- return libc_fwrite(buf, size, n, f);
- return filter_write(current_write_filter, buf, size * n);
-}
-
-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;
- lua_State *lua_state;
-};
-
-static void error_lua_filter(struct lua_filter *filter)
-{
- die("Lua error in %s: %s", filter->script_file, lua_tostring(filter->lua_state, -1));
- lua_pop(filter->lua_state, 1);
-}
-
-static ssize_t write_lua_filter(struct cgit_filter *base, const void *buf, size_t count)
-{
- struct lua_filter *filter = (struct lua_filter *)base;
-
- lua_getglobal(filter->lua_state, "filter_write");
- lua_pushlstring(filter->lua_state, buf, count);
- if (lua_pcall(filter->lua_state, 1, 0, 0)) {
- error_lua_filter(filter);
- errno = EIO;
- return -1;
- }
- return count;
-}
-
-static inline int hook_lua_filter(lua_State *lua_state, void (*fn)(const char *txt))
-{
- const char *str;
- ssize_t (*save_filter_write)(struct cgit_filter *base, const void *buf, size_t count);
- struct cgit_filter *save_filter;
-
- str = lua_tostring(lua_state, 1);
- if (!str)
- return 0;
-
- save_filter_write = filter_write;
- save_filter = current_write_filter;
- unhook_write();
- fn(str);
- hook_write(save_filter, save_filter_write);
-
- return 0;
-}
-
-static int html_lua_filter(lua_State *lua_state)
-{
- return hook_lua_filter(lua_state, html);
-}
-
-static int html_txt_lua_filter(lua_State *lua_state)
-{
- return hook_lua_filter(lua_state, html_txt);
-}
-
-static int html_attr_lua_filter(lua_State *lua_state)
-{
- return hook_lua_filter(lua_state, html_attr);
-}
-
-static int html_url_path_lua_filter(lua_State *lua_state)
-{
- return hook_lua_filter(lua_state, html_url_path);
-}
-
-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;
-
- if (!filter->lua_state)
- return;
-
- lua_close(filter->lua_state);
- filter->lua_state = NULL;
- if (filter->script_file) {
- free(filter->script_file);
- filter->script_file = NULL;
- }
-}
-
-static int init_lua_filter(struct lua_filter *filter)
-{
- if (filter->lua_state)
- return 0;
-
- if (!(filter->lua_state = luaL_newstate()))
- return 1;
-
- luaL_openlibs(filter->lua_state);
-
- lua_pushcfunction(filter->lua_state, html_lua_filter);
- lua_setglobal(filter->lua_state, "html");
- lua_pushcfunction(filter->lua_state, html_txt_lua_filter);
- lua_setglobal(filter->lua_state, "html_txt");
- lua_pushcfunction(filter->lua_state, html_attr_lua_filter);
- lua_setglobal(filter->lua_state, "html_attr");
- lua_pushcfunction(filter->lua_state, html_url_path_lua_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);
- lua_close(filter->lua_state);
- filter->lua_state = NULL;
- return 1;
- }
- return 0;
-}
-
-static int open_lua_filter(struct cgit_filter *base, va_list ap)
-{
- struct lua_filter *filter = (struct lua_filter *)base;
- int i;
-
- if (fflush(stdout))
- return 1;
-
- if (init_lua_filter(filter))
- return 1;
-
- hook_write(base, write_lua_filter);
-
- lua_getglobal(filter->lua_state, "filter_open");
- for (i = 0; i < filter->base.argument_count; ++i)
- lua_pushstring(filter->lua_state, va_arg(ap, char *));
- if (lua_pcall(filter->lua_state, filter->base.argument_count, 0, 0)) {
- error_lua_filter(filter);
- return 1;
- }
- return 0;
-}
-
-static int close_lua_filter(struct cgit_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, 1, 0)) {
- error_lua_filter(filter);
- 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;
- fprintf(f, "%slua:%s\n", prefix, filter->script_file);
-}
-
-
-static struct cgit_filter *new_lua_filter(const char *cmd, int argument_count)
-{
- struct lua_filter *filter;
-
- filter = xmalloc(sizeof(*filter));
- memset(filter, 0, sizeof(*filter));
- filter->base.open = open_lua_filter;
- filter->base.close = close_lua_filter;
- filter->base.fprintfp = fprintf_lua_filter;
- filter->base.cleanup = cleanup_lua_filter;
- filter->base.argument_count = argument_count;
- filter->script_file = xstrdup(cmd);
-
- return &filter->base;
-}
-
-#endif
-
-
int cgit_open_filter(struct cgit_filter *filter, ...)
{
int result;
@@ -415,9 +163,6 @@ static const struct {
struct cgit_filter *(*ctor)(const char *cmd, int argument_count);
} filter_specs[] = {
{ "exec", new_exec_filter },
-#ifndef NO_LUA
- { "lua", new_lua_filter },
-#endif
};
struct cgit_filter *cgit_new_filter(const char *cmd, filter_type filtertype)
diff --git a/filters/email-gravatar.lua b/filters/email-gravatar.lua
deleted file mode 100644
index c39b490..0000000
--- a/filters/email-gravatar.lua
+++ /dev/null
@@ -1,35 +0,0 @@
--- This script may be used with the email-filter or repo.email-filter settings in cgitrc.
--- It adds gravatar icons to author names. It is designed to be used with the lua:
--- prefix in filters. It is much faster than the corresponding python script.
---
--- Requirements:
--- luaossl
--- <http://25thandclement.com/~william/projects/luaossl.html>
---
-
-local digest = require("openssl.digest")
-
-function md5_hex(input)
- local b = digest.new("md5"):final(input)
- local x = ""
- for i = 1, #b do
- x = x .. string.format("%.2x", string.byte(b, i))
- end
- return x
-end
-
-function filter_open(email, page)
- buffer = ""
- md5 = md5_hex(email:sub(2, -2):lower())
-end
-
-function filter_close()
- html("<img src='//www.gravatar.com/avatar/" .. md5 .. "?s=13&d=retro' width='13' height='13' alt='Gravatar' /> " .. buffer)
- return 0
-end
-
-function filter_write(str)
- buffer = buffer .. str
-end
-
-
diff --git a/filters/email-gravatar.py b/filters/email-gravatar.py
index d70440e..012113c 100755
--- a/filters/email-gravatar.py
+++ b/filters/email-gravatar.py
@@ -1,8 +1,5 @@
#!/usr/bin/env python3
-# Please prefer the email-gravatar.lua using lua: as a prefix over this script. This
-# script is very slow, in comparison.
-#
# This script may be used with the email-filter or repo.email-filter settings in cgitrc.
#
# The following environment variables can be used to retrieve the configuration
diff --git a/filters/email-libravatar.lua b/filters/email-libravatar.lua
deleted file mode 100644
index 7336baf..0000000
--- a/filters/email-libravatar.lua
+++ /dev/null
@@ -1,36 +0,0 @@
--- This script may be used with the email-filter or repo.email-filter settings in cgitrc.
--- It adds libravatar icons to author names. It is designed to be used with the lua:
--- prefix in filters.
---
--- Requirements:
--- luaossl
--- <http://25thandclement.com/~william/projects/luaossl.html>
---
-
-local digest = require("openssl.digest")
-
-function md5_hex(input)
- local b = digest.new("md5"):final(input)
- local x = ""
- for i = 1, #b do
- x = x .. string.format("%.2x", string.byte(b, i))
- end
- return x
-end
-
-function filter_open(email, page)
- buffer = ""
- md5 = md5_hex(email:sub(2, -2):lower())
-end
-
-function filter_close()
- baseurl = os.getenv("HTTPS") and "https://seccdn.libravatar.org/" or "http://cdn.libravatar.org/"
- html("<img src='" .. baseurl .. "avatar/" .. md5 .. "?s=13&d=retro' width='13' height='13' alt='Libravatar' /> " .. buffer)
- return 0
-end
-
-function filter_write(str)
- buffer = buffer .. str
-end
-
-
diff --git a/filters/file-authentication.lua b/filters/file-authentication.lua
deleted file mode 100644
index 0248804..0000000
--- a/filters/file-authentication.lua
+++ /dev/null
@@ -1,359 +0,0 @@
--- This script may be used with the auth-filter.
---
--- Requirements:
--- luaossl
--- <http://25thandclement.com/~william/projects/luaossl.html>
--- luaposix
--- <https://github.com/luaposix/luaposix>
---
-local sysstat = require("posix.sys.stat")
-local unistd = require("posix.unistd")
-local rand = require("openssl.rand")
-local hmac = require("openssl.hmac")
-
--- This file should contain a series of lines in the form of:
--- username1:hash1
--- username2:hash2
--- username3:hash3
--- ...
--- Hashes can be generated using something like `mkpasswd -m sha-512 -R 300000`.
--- This file should not be world-readable.
-local users_filename = "/etc/cgit-auth/users"
-
--- This file should contain a series of lines in the form of:
--- groupname1:username1,username2,username3,...
--- ...
-local groups_filename = "/etc/cgit-auth/groups"
-
--- This file should contain a series of lines in the form of:
--- reponame1:groupname1,groupname2,groupname3,...
--- ...
-local repos_filename = "/etc/cgit-auth/repos"
-
--- Set this to a path this script can write to for storing a persistent
--- cookie secret, which should not be world-readable.
-local secret_filename = "/var/cache/cgit/auth-secret"
-
---
---
--- Authentication functions follow below. Swap these out if you want different authentication semantics.
---
---
-
--- Looks up a hash for a given user.
-function lookup_hash(user)
- local line
- for line in io.lines(users_filename) do
- local u, h = string.match(line, "(.-):(.+)")
- if u:lower() == user:lower() then
- return h
- end
- end
- return nil
-end
-
--- Looks up users for a given repo.
-function lookup_users(repo)
- local users = nil
- local groups = nil
- local line, group, user
- for line in io.lines(repos_filename) do
- local r, g = string.match(line, "(.-):(.+)")
- if r == repo then
- groups = { }
- for group in string.gmatch(g, "([^,]+)") do
- groups[group:lower()] = true
- end
- break
- end
- end
- if groups == nil then
- return nil
- end
- for line in io.lines(groups_filename) do
- local g, u = string.match(line, "(.-):(.+)")
- if groups[g:lower()] then
- if users == nil then
- users = { }
- end
- for user in string.gmatch(u, "([^,]+)") do
- users[user:lower()] = true
- end
- end
- end
- return users
-end
-
-
--- Sets HTTP cookie headers based on post and sets up redirection.
-function authenticate_post()
- local hash = lookup_hash(post["username"])
- local redirect = validate_value("redirect", post["redirect"])
-
- if redirect == nil then
- not_found()
- return 0
- end
-
- redirect_to(redirect)
-
- if hash == nil or hash ~= unistd.crypt(post["password"], hash) then
- set_cookie("cgitauth", "")
- else
- -- One week expiration time
- local username = secure_value("username", post["username"], os.time() + 604800)
- set_cookie("cgitauth", username)
- end
-
- html("\n")
- return 0
-end
-
-
--- Returns 1 if the cookie is valid and 0 if it is not.
-function authenticate_cookie()
- accepted_users = lookup_users(cgit["repo"])
- if accepted_users == nil then
- -- We return as valid if the repo is not protected.
- return 1
- end
-
- local username = validate_value("username", get_cookie(http["cookie"], "cgitauth"))
- if username == nil or not accepted_users[username:lower()] then
- return 0
- else
- return 1
- end
-end
-
--- Prints the html for the login form.
-function body()
- html("<h2>Authentication Required</h2>")
- html("<form method='post' action='")
- html_attr(cgit["login"])
- html("'>")
- html("<input type='hidden' name='redirect' value='")
- html_attr(secure_value("redirect", cgit["url"], 0))
- html("' />")
- html("<table>")
- html("<tr><td><label for='username'>Username:</label></td><td><input id='username' name='username' autofocus /></td></tr>")
- html("<tr><td><label for='password'>Password:</label></td><td><input id='password' name='password' type='password' /></td></tr>")
- html("<tr><td colspan='2'><input value='Login' type='submit' /></td></tr>")
- html("</table></form>")
-
- return 0
-end
-
-
-
---
---
--- Wrapper around filter API, exposing the http table, the cgit table, and the post table to the above functions.
---
---
-
-local actions = {}
-actions["authenticate-post"] = authenticate_post
-actions["authenticate-cookie"] = authenticate_cookie
-actions["body"] = body
-
-function filter_open(...)
- action = actions[select(1, ...)]
-
- http = {}
- http["cookie"] = select(2, ...)
- http["method"] = select(3, ...)
- http["query"] = select(4, ...)
- http["referer"] = select(5, ...)
- http["path"] = select(6, ...)
- http["host"] = select(7, ...)
- http["https"] = select(8, ...)
-
- cgit = {}
- cgit["repo"] = select(9, ...)
- cgit["page"] = select(10, ...)
- cgit["url"] = select(11, ...)
- cgit["login"] = select(12, ...)
-
-end
-
-function filter_close()
- return action()
-end
-
-function filter_write(str)
- post = parse_qs(str)
-end
-
-
---
---
--- Utility functions based on keplerproject/wsapi.
---
---
-
-function url_decode(str)
- if not str then
- return ""
- end
- str = string.gsub(str, "+", " ")
- str = string.gsub(str, "%%(%x%x)", function(h) return string.char(tonumber(h, 16)) end)
- str = string.gsub(str, "\r\n", "\n")
- return str
-end
-
-function url_encode(str)
- if not str then
- return ""
- end
- str = string.gsub(str, "\n", "\r\n")
- str = string.gsub(str, "([^%w ])", function(c) return string.format("%%%02X", string.byte(c)) end)
- str = string.gsub(str, " ", "+")
- return str
-end
-
-function parse_qs(qs)
- local tab = {}
- for key, val in string.gmatch(qs, "([^&=]+)=([^&=]*)&?") do
- tab[url_decode(key)] = url_decode(val)
- end
- return tab
-end
-
-function get_cookie(cookies, name)
- cookies = string.gsub(";" .. cookies .. ";", "%s*;%s*", ";")
- return url_decode(string.match(cookies, ";" .. name .. "=(.-);"))
-end
-
-function tohex(b)
- local x = ""
- for i = 1, #b do
- x = x .. string.format("%.2x", string.byte(b, i))
- end
- return x
-end
-
---
---
--- Cookie construction and validation helpers.
---
---
-
-local secret = nil
-
--- Loads a secret from a file, creates a secret, or returns one from memory.
-function get_secret()
- if secret ~= nil then
- return secret
- end
- local secret_file = io.open(secret_filename, "r")
- if secret_file == nil then
- local old_umask = sysstat.umask(63)
- local temporary_filename = secret_filename .. ".tmp." .. tohex(rand.bytes(16))
- local temporary_file = io.open(temporary_filename, "w")
- if temporary_file == nil then
- os.exit(177)
- end
- temporary_file:write(tohex(rand.bytes(32)))
- temporary_file:close()
- unistd.link(temporary_filename, secret_filename) -- Intentionally fails in the case that another process is doing the same.
- unistd.unlink(temporary_filename)
- sysstat.umask(old_umask)
- secret_file = io.open(secret_filename, "r")
- end
- if secret_file == nil then
- os.exit(177)
- end
- secret = secret_file:read()
- secret_file:close()
- if secret:len() ~= 64 then
- os.exit(177)
- end
- return secret
-end
-
--- Returns value of cookie if cookie is valid. Otherwise returns nil.
-function validate_value(expected_field, cookie)
- local i = 0
- local value = ""
- local field = ""
- local expiration = 0
- local salt = ""
- local chmac = ""
-
- if cookie == nil or cookie:len() < 3 or cookie:sub(1, 1) == "|" then
- return nil
- end
-
- for component in string.gmatch(cookie, "[^|]+") do
- if i == 0 then
- field = component
- elseif i == 1 then
- value = component
- elseif i == 2 then
- expiration = tonumber(component)
- if expiration == nil then
- expiration = -1
- end
- elseif i == 3 then
- salt = component
- elseif i == 4 then
- chmac = component
- else
- break
- end
- i = i + 1
- end
-
- if chmac == nil or chmac:len() == 0 then
- return nil
- end
-
- -- Lua hashes strings, so these comparisons are time invariant.
- if chmac ~= tohex(hmac.new(get_secret(), "sha256"):final(field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt)) then
- return nil
- end
-
- if expiration == -1 or (expiration ~= 0 and expiration <= os.time()) then
- return nil
- end
-
- if url_decode(field) ~= expected_field then
- return nil
- end
-
- return url_decode(value)
-end
-
-function secure_value(field, value, expiration)
- if value == nil or value:len() <= 0 then
- return ""
- end
-
- local authstr = ""
- local salt = tohex(rand.bytes(16))
- value = url_encode(value)
- field = url_encode(field)
- authstr = field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt
- authstr = authstr .. "|" .. tohex(hmac.new(get_secret(), "sha256"):final(authstr))
- return authstr
-end
-
-function set_cookie(cookie, value)
- html("Set-Cookie: " .. cookie .. "=" .. value .. "; HttpOnly")
- if http["https"] == "yes" or http["https"] == "on" or http["https"] == "1" then
- html("; secure")
- end
- html("\n")
-end
-
-function redirect_to(url)
- html("Status: 302 Redirect\n")
- html("Cache-Control: no-cache, no-store\n")
- html("Location: " .. url .. "\n")
-end
-
-function not_found()
- html("Status: 404 Not Found\n")
- html("Cache-Control: no-cache, no-store\n\n")
-end
diff --git a/filters/gentoo-ldap-authentication.lua b/filters/gentoo-ldap-authentication.lua
deleted file mode 100644
index 673c88d..0000000
--- a/filters/gentoo-ldap-authentication.lua
+++ /dev/null
@@ -1,360 +0,0 @@
--- This script may be used with the auth-filter. Be sure to configure it as you wish.
---
--- Requirements:
--- luaossl
--- <http://25thandclement.com/~william/projects/luaossl.html>
--- lualdap >= 1.2
--- <https://git.zx2c4.com/lualdap/about/>
--- luaposix
--- <https://github.com/luaposix/luaposix>
---
-local sysstat = require("posix.sys.stat")
-local unistd = require("posix.unistd")
-local lualdap = require("lualdap")
-local rand = require("openssl.rand")
-local hmac = require("openssl.hmac")
-
---
---
--- Configure these variables for your settings.
---
---
-
--- A list of password protected repositories, with which gentooAccess
--- group is allowed to access each one.
-local protected_repos = {
- glouglou = "infra",
- portage = "dev"
-}
-
--- Set this to a path this script can write to for storing a persistent
--- cookie secret, which should be guarded.
-local secret_filename = "/var/cache/cgit/auth-secret"
-
-
---
---
--- Authentication functions follow below. Swap these out if you want different authentication semantics.
---
---
-
--- Sets HTTP cookie headers based on post and sets up redirection.
-function authenticate_post()
- local redirect = validate_value("redirect", post["redirect"])
-
- if redirect == nil then
- not_found()
- return 0
- end
-
- redirect_to(redirect)
-
- local groups = gentoo_ldap_user_groups(post["username"], post["password"])
- if groups == nil then
- set_cookie("cgitauth", "")
- else
- -- One week expiration time
- set_cookie("cgitauth", secure_value("gentoogroups", table.concat(groups, ","), os.time() + 604800))
- end
-
- html("\n")
- return 0
-end
-
-
--- Returns 1 if the cookie is valid and 0 if it is not.
-function authenticate_cookie()
- local required_group = protected_repos[cgit["repo"]]
- if required_group == nil then
- -- We return as valid if the repo is not protected.
- return 1
- end
-
- local user_groups = validate_value("gentoogroups", get_cookie(http["cookie"], "cgitauth"))
- if user_groups == nil or user_groups == "" then
- return 0
- end
- for group in string.gmatch(user_groups, "[^,]+") do
- if group == required_group then
- return 1
- end
- end
- return 0
-end
-
--- Prints the html for the login form.
-function body()
- html("<h2>Gentoo LDAP Authentication Required</h2>")
- html("<form method='post' action='")
- html_attr(cgit["login"])
- html("'>")
- html("<input type='hidden' name='redirect' value='")
- html_attr(secure_value("redirect", cgit["url"], 0))
- html("' />")
- html("<table>")
- html("<tr><td><label for='username'>Username:</label></td><td><input id='username' name='username' autofocus /></td></tr>")
- html("<tr><td><label for='password'>Password:</label></td><td><input id='password' name='password' type='password' /></td></tr>")
- html("<tr><td colspan='2'><input value='Login' type='submit' /></td></tr>")
- html("</table></form>")
-
- return 0
-end
-
---
---
--- Gentoo LDAP support.
---
---
-
-function gentoo_ldap_user_groups(username, password)
- -- Ensure the user is alphanumeric
- if username == nil or username:match("%W") then
- return nil
- end
-
- local who = "uid=" .. username .. ",ou=devs,dc=gentoo,dc=org"
-
- local ldap, err = lualdap.open_simple {
- uri = "ldap://ldap1.gentoo.org",
- who = who,
- password = password,
- starttls = true,
- certfile = "/var/www/uwsgi/cgit/gentoo-ldap/star.gentoo.org.crt",
- keyfile = "/var/www/uwsgi/cgit/gentoo-ldap/star.gentoo.org.key",
- cacertfile = "/var/www/uwsgi/cgit/gentoo-ldap/ca.pem"
- }
- if ldap == nil then
- return nil
- end
-
- local group_suffix = ".group"
- local group_suffix_len = group_suffix:len()
- local groups = {}
- for dn, attribs in ldap:search { base = who, scope = "subtree" } do
- local access = attribs["gentooAccess"]
- if dn == who and access ~= nil then
- for i, v in ipairs(access) do
- local vlen = v:len()
- if vlen > group_suffix_len and v:sub(-group_suffix_len) == group_suffix then
- table.insert(groups, v:sub(1, vlen - group_suffix_len))
- end
- end
- end
- end
-
- ldap:close()
-
- return groups
-end
-
---
---
--- Wrapper around filter API, exposing the http table, the cgit table, and the post table to the above functions.
---
---
-
-local actions = {}
-actions["authenticate-post"] = authenticate_post
-actions["authenticate-cookie"] = authenticate_cookie
-actions["body"] = body
-
-function filter_open(...)
- action = actions[select(1, ...)]
-
- http = {}
- http["cookie"] = select(2, ...)
- http["method"] = select(3, ...)
- http["query"] = select(4, ...)
- http["referer"] = select(5, ...)
- http["path"] = select(6, ...)
- http["host"] = select(7, ...)
- http["https"] = select(8, ...)
-
- cgit = {}
- cgit["repo"] = select(9, ...)
- cgit["page"] = select(10, ...)
- cgit["url"] = select(11, ...)
- cgit["login"] = select(12, ...)
-
-end
-
-function filter_close()
- return action()
-end
-
-function filter_write(str)
- post = parse_qs(str)
-end
-
-
---
---
--- Utility functions based on keplerproject/wsapi.
---
---
-
-function url_decode(str)
- if not str then
- return ""
- end
- str = string.gsub(str, "+", " ")
- str = string.gsub(str, "%%(%x%x)", function(h) return string.char(tonumber(h, 16)) end)
- str = string.gsub(str, "\r\n", "\n")
- return str
-end
-
-function url_encode(str)
- if not str then
- return ""
- end
- str = string.gsub(str, "\n", "\r\n")
- str = string.gsub(str, "([^%w ])", function(c) return string.format("%%%02X", string.byte(c)) end)
- str = string.gsub(str, " ", "+")
- return str
-end
-
-function parse_qs(qs)
- local tab = {}
- for key, val in string.gmatch(qs, "([^&=]+)=([^&=]*)&?") do
- tab[url_decode(key)] = url_decode(val)
- end
- return tab
-end
-
-function get_cookie(cookies, name)
- cookies = string.gsub(";" .. cookies .. ";", "%s*;%s*", ";")
- return string.match(cookies, ";" .. name .. "=(.-);")
-end
-
-function tohex(b)
- local x = ""
- for i = 1, #b do
- x = x .. string.format("%.2x", string.byte(b, i))
- end
- return x
-end
-
---
---
--- Cookie construction and validation helpers.
---
---
-
-local secret = nil
-
--- Loads a secret from a file, creates a secret, or returns one from memory.
-function get_secret()
- if secret ~= nil then
- return secret
- end
- local secret_file = io.open(secret_filename, "r")
- if secret_file == nil then
- local old_umask = sysstat.umask(63)
- local temporary_filename = secret_filename .. ".tmp." .. tohex(rand.bytes(16))
- local temporary_file = io.open(temporary_filename, "w")
- if temporary_file == nil then
- os.exit(177)
- end
- temporary_file:write(tohex(rand.bytes(32)))
- temporary_file:close()
- unistd.link(temporary_filename, secret_filename) -- Intentionally fails in the case that another process is doing the same.
- unistd.unlink(temporary_filename)
- sysstat.umask(old_umask)
- secret_file = io.open(secret_filename, "r")
- end
- if secret_file == nil then
- os.exit(177)
- end
- secret = secret_file:read()
- secret_file:close()
- if secret:len() ~= 64 then
- os.exit(177)
- end
- return secret
-end
-
--- Returns value of cookie if cookie is valid. Otherwise returns nil.
-function validate_value(expected_field, cookie)
- local i = 0
- local value = ""
- local field = ""
- local expiration = 0
- local salt = ""
- local chmac = ""
-
- if cookie == nil or cookie:len() < 3 or cookie:sub(1, 1) == "|" then
- return nil
- end
-
- for component in string.gmatch(cookie, "[^|]+") do
- if i == 0 then
- field = component
- elseif i == 1 then
- value = component
- elseif i == 2 then
- expiration = tonumber(component)
- if expiration == nil then
- expiration = -1
- end
- elseif i == 3 then
- salt = component
- elseif i == 4 then
- chmac = component
- else
- break
- end
- i = i + 1
- end
-
- if chmac == nil or chmac:len() == 0 then
- return nil
- end
-
- -- Lua hashes strings, so these comparisons are time invariant.
- if chmac ~= tohex(hmac.new(get_secret(), "sha256"):final(field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt)) then
- return nil
- end
-
- if expiration == -1 or (expiration ~= 0 and expiration <= os.time()) then
- return nil
- end
-
- if url_decode(field) ~= expected_field then
- return nil
- end
-
- return url_decode(value)
-end
-
-function secure_value(field, value, expiration)
- if value == nil or value:len() <= 0 then
- return ""
- end
-
- local authstr = ""
- local salt = tohex(rand.bytes(16))
- value = url_encode(value)
- field = url_encode(field)
- authstr = field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt
- authstr = authstr .. "|" .. tohex(hmac.new(get_secret(), "sha256"):final(authstr))
- return authstr
-end
-
-function set_cookie(cookie, value)
- html("Set-Cookie: " .. cookie .. "=" .. value .. "; HttpOnly")
- if http["https"] == "yes" or http["https"] == "on" or http["https"] == "1" then
- html("; secure")
- end
- html("\n")
-end
-
-function redirect_to(url)
- html("Status: 302 Redirect\n")
- html("Cache-Control: no-cache, no-store\n")
- html("Location: " .. url .. "\n")
-end
-
-function not_found()
- html("Status: 404 Not Found\n")
- html("Cache-Control: no-cache, no-store\n\n")
-end
diff --git a/filters/owner-example.lua b/filters/owner-example.lua
deleted file mode 100644
index 50fc25a..0000000
--- a/filters/owner-example.lua
+++ /dev/null
@@ -1,17 +0,0 @@
--- This script is an example of an owner-filter. It replaces the
--- usual query link with one to a fictional homepage. This script may
--- be used with the owner-filter or repo.owner-filter settings in
--- cgitrc with the `lua:` prefix.
-
-function filter_open()
- buffer = ""
-end
-
-function filter_close()
- html(string.format("<a href=\"%s\">%s</a>", "http://wiki.example.com/about/" .. buffer, buffer))
- return 0
-end
-
-function filter_write(str)
- buffer = buffer .. str
-end
diff --git a/filters/simple-authentication.lua b/filters/simple-authentication.lua
deleted file mode 100644
index 23d3457..0000000
--- a/filters/simple-authentication.lua
+++ /dev/null
@@ -1,314 +0,0 @@
--- This script may be used with the auth-filter. Be sure to configure it as you wish.
---
--- Requirements:
--- luaossl
--- <http://25thandclement.com/~william/projects/luaossl.html>
--- luaposix
--- <https://github.com/luaposix/luaposix>
---
-local sysstat = require("posix.sys.stat")
-local unistd = require("posix.unistd")
-local rand = require("openssl.rand")
-local hmac = require("openssl.hmac")
-
---
---
--- Configure these variables for your settings.
---
---
-
--- A list of password protected repositories along with the users who can access them.
-local protected_repos = {
- glouglou = { laurent = true, jason = true },
- qt = { jason = true, bob = true }
-}
-
--- A list of users and hashes, generated with `mkpasswd -m sha-512 -R 300000`.
-local users = {
- jason = "$6$rounds=300000$YYJct3n/o.ruYK$HhpSeuCuW1fJkpvMZOZzVizeLsBKcGA/aF2UPuV5v60JyH2MVSG6P511UMTj2F3H75.IT2HIlnvXzNb60FcZH1",
- laurent = "$6$rounds=300000$dP0KNHwYb3JKigT$pN/LG7rWxQ4HniFtx5wKyJXBJUKP7R01zTNZ0qSK/aivw8ywGAOdfYiIQFqFhZFtVGvr11/7an.nesvm8iJUi.",
- bob = "$6$rounds=300000$jCLCCt6LUpTz$PI1vvd1yaVYcCzqH8QAJFcJ60b6W/6sjcOsU7mAkNo7IE8FRGW1vkjF8I/T5jt/auv5ODLb1L4S2s.CAyZyUC"
-}
-
--- Set this to a path this script can write to for storing a persistent
--- cookie secret, which should be guarded.
-local secret_filename = "/var/cache/cgit/auth-secret"
-
---
---
--- Authentication functions follow below. Swap these out if you want different authentication semantics.
---
---
-
--- Sets HTTP cookie headers based on post and sets up redirection.
-function authenticate_post()
- local hash = users[post["username"]]
- local redirect = validate_value("redirect", post["redirect"])
-
- if redirect == nil then
- not_found()
- return 0
- end
-
- redirect_to(redirect)
-
- if hash == nil or hash ~= unistd.crypt(post["password"], hash) then
- set_cookie("cgitauth", "")
- else
- -- One week expiration time
- local username = secure_value("username", post["username"], os.time() + 604800)
- set_cookie("cgitauth", username)
- end
-
- html("\n")
- return 0
-end
-
-
--- Returns 1 if the cookie is valid and 0 if it is not.
-function authenticate_cookie()
- accepted_users = protected_repos[cgit["repo"]]
- if accepted_users == nil then
- -- We return as valid if the repo is not protected.
- return 1
- end
-
- local username = validate_value("username", get_cookie(http["cookie"], "cgitauth"))
- if username == nil or not accepted_users[username:lower()] then
- return 0
- else
- return 1
- end
-end
-
--- Prints the html for the login form.
-function body()
- html("<h2>Authentication Required</h2>")
- html("<form method='post' action='")
- html_attr(cgit["login"])
- html("'>")
- html("<input type='hidden' name='redirect' value='")
- html_attr(secure_value("redirect", cgit["url"], 0))
- html("' />")
- html("<table>")
- html("<tr><td><label for='username'>Username:</label></td><td><input id='username' name='username' autofocus /></td></tr>")
- html("<tr><td><label for='password'>Password:</label></td><td><input id='password' name='password' type='password' /></td></tr>")
- html("<tr><td colspan='2'><input value='Login' type='submit' /></td></tr>")
- html("</table></form>")
-
- return 0
-end
-
-
-
---
---
--- Wrapper around filter API, exposing the http table, the cgit table, and the post table to the above functions.
---
---
-
-local actions = {}
-actions["authenticate-post"] = authenticate_post
-actions["authenticate-cookie"] = authenticate_cookie
-actions["body"] = body
-
-function filter_open(...)
- action = actions[select(1, ...)]
-
- http = {}
- http["cookie"] = select(2, ...)
- http["method"] = select(3, ...)
- http["query"] = select(4, ...)
- http["referer"] = select(5, ...)
- http["path"] = select(6, ...)
- http["host"] = select(7, ...)
- http["https"] = select(8, ...)
-
- cgit = {}
- cgit["repo"] = select(9, ...)
- cgit["page"] = select(10, ...)
- cgit["url"] = select(11, ...)
- cgit["login"] = select(12, ...)
-
-end
-
-function filter_close()
- return action()
-end
-
-function filter_write(str)
- post = parse_qs(str)
-end
-
-
---
---
--- Utility functions based on keplerproject/wsapi.
---
---
-
-function url_decode(str)
- if not str then
- return ""
- end
- str = string.gsub(str, "+", " ")
- str = string.gsub(str, "%%(%x%x)", function(h) return string.char(tonumber(h, 16)) end)
- str = string.gsub(str, "\r\n", "\n")
- return str
-end
-
-function url_encode(str)
- if not str then
- return ""
- end
- str = string.gsub(str, "\n", "\r\n")
- str = string.gsub(str, "([^%w ])", function(c) return string.format("%%%02X", string.byte(c)) end)
- str = string.gsub(str, " ", "+")
- return str
-end
-
-function parse_qs(qs)
- local tab = {}
- for key, val in string.gmatch(qs, "([^&=]+)=([^&=]*)&?") do
- tab[url_decode(key)] = url_decode(val)
- end
- return tab
-end
-
-function get_cookie(cookies, name)
- cookies = string.gsub(";" .. cookies .. ";", "%s*;%s*", ";")
- return url_decode(string.match(cookies, ";" .. name .. "=(.-);"))
-end
-
-function tohex(b)
- local x = ""
- for i = 1, #b do
- x = x .. string.format("%.2x", string.byte(b, i))
- end
- return x
-end
-
---
---
--- Cookie construction and validation helpers.
---
---
-
-local secret = nil
-
--- Loads a secret from a file, creates a secret, or returns one from memory.
-function get_secret()
- if secret ~= nil then
- return secret
- end
- local secret_file = io.open(secret_filename, "r")
- if secret_file == nil then
- local old_umask = sysstat.umask(63)
- local temporary_filename = secret_filename .. ".tmp." .. tohex(rand.bytes(16))
- local temporary_file = io.open(temporary_filename, "w")
- if temporary_file == nil then
- os.exit(177)
- end
- temporary_file:write(tohex(rand.bytes(32)))
- temporary_file:close()
- unistd.link(temporary_filename, secret_filename) -- Intentionally fails in the case that another process is doing the same.
- unistd.unlink(temporary_filename)
- sysstat.umask(old_umask)
- secret_file = io.open(secret_filename, "r")
- end
- if secret_file == nil then
- os.exit(177)
- end
- secret = secret_file:read()
- secret_file:close()
- if secret:len() ~= 64 then
- os.exit(177)
- end
- return secret
-end
-
--- Returns value of cookie if cookie is valid. Otherwise returns nil.
-function validate_value(expected_field, cookie)
- local i = 0
- local value = ""
- local field = ""
- local expiration = 0
- local salt = ""
- local chmac = ""
-
- if cookie == nil or cookie:len() < 3 or cookie:sub(1, 1) == "|" then
- return nil
- end
-
- for component in string.gmatch(cookie, "[^|]+") do
- if i == 0 then
- field = component
- elseif i == 1 then
- value = component
- elseif i == 2 then
- expiration = tonumber(component)
- if expiration == nil then
- expiration = -1
- end
- elseif i == 3 then
- salt = component
- elseif i == 4 then
- chmac = component
- else
- break
- end
- i = i + 1
- end
-
- if chmac == nil or chmac:len() == 0 then
- return nil
- end
-
- -- Lua hashes strings, so these comparisons are time invariant.
- if chmac ~= tohex(hmac.new(get_secret(), "sha256"):final(field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt)) then
- return nil
- end
-
- if expiration == -1 or (expiration ~= 0 and expiration <= os.time()) then
- return nil
- end
-
- if url_decode(field) ~= expected_field then
- return nil
- end
-
- return url_decode(value)
-end
-
-function secure_value(field, value, expiration)
- if value == nil or value:len() <= 0 then
- return ""
- end
-
- local authstr = ""
- local salt = tohex(rand.bytes(16))
- value = url_encode(value)
- field = url_encode(field)
- authstr = field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt
- authstr = authstr .. "|" .. tohex(hmac.new(get_secret(), "sha256"):final(authstr))
- return authstr
-end
-
-function set_cookie(cookie, value)
- html("Set-Cookie: " .. cookie .. "=" .. value .. "; HttpOnly")
- if http["https"] == "yes" or http["https"] == "on" or http["https"] == "1" then
- html("; secure")
- end
- html("\n")
-end
-
-function redirect_to(url)
- html("Status: 302 Redirect\n")
- html("Cache-Control: no-cache, no-store\n")
- html("Location: " .. url .. "\n")
-end
-
-function not_found()
- html("Status: 404 Not Found\n")
- html("Cache-Control: no-cache, no-store\n\n")
-end
diff --git a/tests/filters/dump.lua b/tests/filters/dump.lua
deleted file mode 100644
index 1f15c93..0000000
--- a/tests/filters/dump.lua
+++ /dev/null
@@ -1,17 +0,0 @@
-function filter_open(...)
- buffer = ""
- for i = 1, select("#", ...) do
- buffer = buffer .. select(i, ...) .. " "
- end
-end
-
-function filter_close()
- html(buffer)
- return 0
-end
-
-function filter_write(str)
- buffer = buffer .. string.upper(str)
-end
-
-
diff --git a/tests/setup.sh b/tests/setup.sh
index 8db810f..31e7d5b 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -60,12 +60,6 @@ fi
FILTER_DIRECTORY=$(cd ../filters && pwd)
-if cgit --version | grep -F -q "[+] Lua scripting"; then
- export CGIT_HAS_LUA=1
-else
- export CGIT_HAS_LUA=0
-fi
-
mkrepo() {
name=$1
count=$2
@@ -144,19 +138,6 @@ repo.email-filter=exec:$FILTER_DIRECTORY/dump.sh
repo.source-filter=exec:$FILTER_DIRECTORY/dump.sh
repo.readme=master:a+b
EOF
-
- if [ $CGIT_HAS_LUA -eq 1 ]; then
- cat >>cgitrc <<EOF
-repo.url=filter-lua
-repo.path=$PWD/repos/filter/.git
-repo.desc=filtered repo
-repo.about-filter=lua:$FILTER_DIRECTORY/dump.lua
-repo.commit-filter=lua:$FILTER_DIRECTORY/dump.lua
-repo.email-filter=lua:$FILTER_DIRECTORY/dump.lua
-repo.source-filter=lua:$FILTER_DIRECTORY/dump.lua
-repo.readme=master:a+b
-EOF
- fi
}
cgit_query()
diff --git a/tests/t0111-filter.sh b/tests/t0111-filter.sh
index 2fdc366..e5d3575 100755
--- a/tests/t0111-filter.sh
+++ b/tests/t0111-filter.sh
@@ -4,9 +4,6 @@ test_description='Check filtered content'
. ./setup.sh
prefixes="exec"
-if [ $CGIT_HAS_LUA -eq 1 ]; then
- prefixes="$prefixes lua"
-fi
for prefix in $prefixes
do
|
