git: update to v2.24.0

[cgit.git] / filters / simple-authentication.lua

diff --git a/filters/simple-authentication.lua b/filters/simple-authentication.lua
index bf356324e2b00865d727cb3e9065b094286c0a73..23d345763bf6b7426157f2e74489786476199f77 100644 (file)
--- a/filters/simple-authentication.lua
+++ b/filters/simple-authentication.lua
@@ -1,15 +1,15 @@
 -- This script may be used with the auth-filter. Be sure to configure it as you wish.
 --
 -- Requirements:
---     luacrypto >= 0.3
---     <http://mkottman.github.io/luacrypto/>
+--     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 crypto = require("crypto")
-
+local rand = require("openssl.rand")
+local hmac = require("openssl.hmac")
 
 --
 --
@@ -23,17 +23,11 @@ local protected_repos = {
        qt              = { jason = true, bob = true }
 }
 
--- Please note that, in production, you'll want to replace this simple lookup
--- table with either a table of salted and hashed passwords (using something
--- smart like scrypt), or replace this table lookup with an external support,
--- such as consulting your system's pam / shadow system, or an external
--- database, or an external validating web service. For testing, or for
--- extremely low-security usage, you may be able, however, to get away with
--- compromising on hardcoding the passwords in cleartext, as we have done here.
+-- A list of users and hashes, generated with `mkpasswd -m sha-512 -R 300000`.
 local users = {
-       jason           = "secretpassword",
-       laurent         = "s3cr3t",
-       bob             = "ilikelua"
+       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
@@ -48,7 +42,7 @@ local secret_filename = "/var/cache/cgit/auth-secret"
 
 -- Sets HTTP cookie headers based on post and sets up redirection.
 function authenticate_post()
-       local password = users[post["username"]]
+       local hash = users[post["username"]]
        local redirect = validate_value("redirect", post["redirect"])
 
        if redirect == nil then
@@ -58,8 +52,7 @@ function authenticate_post()
 
        redirect_to(redirect)
 
-       -- Lua hashes strings, so these comparisons are time invariant.
-       if password == nil or password ~= post["password"] then
+       if hash == nil or hash ~= unistd.crypt(post["password"], hash) then
                set_cookie("cgitauth", "")
        else
                -- One week expiration time
@@ -187,6 +180,13 @@ function get_cookie(cookies, name)
        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
 
 --
 --
@@ -204,12 +204,12 @@ function get_secret()
        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." .. crypto.hex(crypto.rand.bytes(16))
+               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(crypto.hex(crypto.rand.bytes(32)))
+               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)
@@ -234,7 +234,7 @@ function validate_value(expected_field, cookie)
        local field = ""
        local expiration = 0
        local salt = ""
-       local hmac = ""
+       local chmac = ""
 
        if cookie == nil or cookie:len() < 3 or cookie:sub(1, 1) == "|" then
                return nil
@@ -253,19 +253,19 @@ function validate_value(expected_field, cookie)
                elseif i == 3 then
                        salt = component
                elseif i == 4 then
-                       hmac = component
+                       chmac = component
                else
                        break
                end
                i = i + 1
        end
 
-       if hmac == nil or hmac:len() == 0 then
+       if chmac == nil or chmac:len() == 0 then
                return nil
        end
 
        -- Lua hashes strings, so these comparisons are time invariant.
-       if hmac ~= crypto.hmac.digest("sha256", field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt, get_secret()) then
+       if chmac ~= tohex(hmac.new(get_secret(), "sha256"):final(field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt)) then
                return nil
        end
 
@@ -286,11 +286,11 @@ function secure_value(field, value, expiration)
        end
 
        local authstr = ""
-       local salt = crypto.hex(crypto.rand.bytes(16))
+       local salt = tohex(rand.bytes(16))
        value = url_encode(value)
        field = url_encode(field)
        authstr = field .. "|" .. value .. "|" .. tostring(expiration) .. "|" .. salt
-       authstr = authstr .. "|" .. crypto.hmac.digest("sha256", authstr, get_secret())
+       authstr = authstr .. "|" .. tohex(hmac.new(get_secret(), "sha256"):final(authstr))
        return authstr
 end