Schaffenburg/abrechenbarkeit
3
0
Fork 0
mirror of https://codeberg.org/metamuffin/abrechenbarkeit.git synced 2025-01-01 09:14:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move username validation to dedicated function; unify error messages into boxes

Browse source
This commit is contained in:
Riley L. 2024-11-04 14:44:56 +01:00
parent 373242c40a
commit e93520702a
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
abrechenbarkeit.lua
View file

@ -112,9 +112,13 @@ local function respond(status, title, body)
)) ))
end end
local function error_box(message)
return string.format([[<div class="notif error"><p>Error: %s</p></div>]], message)
end
local function respond_error(message) local function respond_error(message)
respond(400, "Error", function() respond(400, "Error", function()
print(string.format("<p>Error: %s</p>", escape(message))) print(error_box(message))
end) end)
end end
@ -213,10 +217,6 @@ local function get_active_users()
return users return users
end end
local function error_box(message)
return string.format([[<div class="notif error"><p>Error: %s</p></div>]], message)
end
local function r_user_post(username) local function r_user_post(username)
local data = form_data() local data = form_data()
local amount = tonumber(data.amount) local amount = tonumber(data.amount)
@ -425,10 +425,17 @@ local function r_index()
end) end)
end end
local function validate_username(username)
-- disallow leading or traling whitespace
return username ~= nil
and username:match("^([%w_ -]+)$") ~= nil
and username:match("^%s") == nil
and username:match("%s$") == nil
end
local function r_create_user() local function r_create_user()
local username = query.create_user local username = query.create_user
-- gsub to remove whitespace. disallows username made up entirely of whitespace if not validate_username(username) then
if username:gsub("%s+", ""):match("^([%w_ -]+)$") == nil then
return respond_error("invalid username " .. username) return respond_error("invalid username " .. username)
end end
return redirect(string.format("/%s", urlencode(username))) return redirect(string.format("/%s", urlencode(username)))
@ -550,7 +557,7 @@ if path == "/" then
end end
else else
local username = extract_username() local username = extract_username()
if username == nil then if username == nil or not validate_username(username) then
return respond_error("username invalid") return respond_error("username invalid")
elseif query.log then elseif query.log then
return r_log(username) return r_log(username)