add Makefile

Makefile

@@ -0,0 +1,6 @@
+testdeps:
+	luarocks-5.1 install --local luaunit
+	luarocks-5.1 install --local lrexlib-PCRE2
+
+test:
+	luajit test.lua

README.md

@@ -13,9 +13,10 @@ on top of ActivityPub implementations.
 
 ## Testing
 
-```
+requires luajit
-luarocks-5.1 install --local luaunit
+
-luarocks-5.1 install --local lrexlib-PCRE2
+```sh
+make testdeps
 eval (luarocks-5.1 path --bin)
-lua5.1 test.lua
+make test
 ```

conf.lua

@@ -0,0 +1,6 @@
+return {
+    version = 1,
+    wantedScripts = {
+        ['webfinger_allowlist'] = {accounts = {"example@example.com"}}
+    }
+}

config.lua

@@ -0,0 +1,36 @@
+local env_config_path = os.getenv('APROXY_CONFIG_PATH')
+local DEFAULT_CONFIG_PATH = ".;/etc/aproxy"
+local config_path = env_config_path or DEFAULT_CONFIG_PATH
+
+function mysplit (inputstr, sep)
+        if sep == nil then
+                sep = "%s"
+        end
+        local t={}
+        for str in string.gmatch(inputstr, "([^"..sep.."]+)") do
+                table.insert(t, str)
+        end
+        return t
+end
+
+local function findConfigFile()
+    for _, config_directory in ipairs(mysplit(config_path, ";")) do
+        local possible_config_path = config_directory .. "/" .. "conf.lua"
+        local fd = io.open(possible_config_path, "rb")
+        if fd then
+            local data = fd:read("*a")
+            fd:close()
+            return data
+        end
+    end
+
+    return nil
+end
+
+local function loadConfigFile()
+    local config_file_data = assert(findConfigFile(), 'no config file found, config path: ' .. config_path)
+    local config_file_function = assert(loadstring(config_file_data))
+    return config_file_function()
+end
+
+return loadConfigFile()

ctx.lua

@@ -8,10 +8,15 @@ function ctx:setWantedScripts(graph)
     self._wanted_scripts = graph
 end
 
+function ctx:loadFromConfig(conf)
+    ctx:setWantedScripts(conf.wantedScripts)
+    ctx:loadChain()
+end
+
 function ctx:loadChain()
     self.compiled_chain = {}
     for module_name, module_config in pairs(self._wanted_scripts) do
-        local module = require(module_name)
+        local module = require('scripts.' .. module_name)
         local module_state = module.init(module_config)
         -- TODO is it possible to make module_config readonly?
         table.insert(self.compiled_chain, {module, module_config, module_state})

docker-compose.yaml

@@ -8,4 +8,5 @@ services:
       - 'LUA_PATH=/?.lua;/aproxy/?.lua'
     volumes:
       - ./nginx.conf:/etc/nginx/conf.d/default.conf:ro
+      - ./conf.lua:/etc/aproxy/conf.lua:ro
       - .:/aproxy:ro

main.lua

@@ -1,4 +1,3 @@
-local CONFIG_PATH = ".;/etc/aproxy"
 
 -- function loadConfig()
 --     -- TODO load config_path
@@ -8,11 +7,9 @@ local CONFIG_PATH = ".;/etc/aproxy"
 -- local config = loadConfig()
 
 local ctx = require('ctx')
+local conf = require('config')
 
-ctx:setWantedScripts({
+ctx:loadFromConfig(conf)
-    ['scripts.webfinger_allowlist'] = {accounts = {"example@example.com"}}
-})
-ctx:loadChain()
 
 return function()
     ctx:onRequest()

scripts/webfinger_allowlist.lua

@@ -25,12 +25,12 @@ return {
     author='luna@l4.pm',
     title='Webfinger Allowlist',
     description=[[
-    Prevent unecessary DB load by discarding requests to users that we know
+    Prevent unnecessary DB load by discarding requests to users that we know
     won't exist.
 
     Useful for small instances.
     ]],
-    apiVersion=1,
+    version=1,
     init=webfingerInit,
     callbacks = {
         ['/.well-known/webfinger'] = webfingerCallback