mirror of https://git.zx2c4.com/cgit/
Compare commits
102 Commits
Author | SHA1 | Date |
---|---|---|
Samuel Lidén Borell | 00ecfaadea | 1 year ago |
Andy Green | 907134b7a2 | 2 years ago |
Andy Green | aee39b4e9a | 2 years ago |
Andy Green | 093ac96970 | 2 years ago |
Christian Hesse | 91f25909b9 | 2 years ago |
Hristo Venev | 852cb3b0e2 | 2 years ago |
John Keeping | 4c520cefc9 | 2 years ago |
John Keeping | d071f28cfa | 2 years ago |
John Keeping | c1a1d23111 | 2 years ago |
Christian Hesse | a0f6669bdb | 2 years ago |
Peter Prohaska | ce2062d9e2 | 2 years ago |
June McEnroe | 4e4b30effb | 2 years ago |
June McEnroe | 3295155a0c | 2 years ago |
Chris Mayo | e32f8416e8 | 2 years ago |
Chris Mayo | afffc3e772 | 2 years ago |
June McEnroe | fd20a5475e | 2 years ago |
June McEnroe | bcffc52366 | 2 years ago |
June McEnroe | cc6d9cc7fc | 2 years ago |
Christian Hesse | e10159691e | 2 years ago |
Christian Hesse | 979cf4a753 | 2 years ago |
Christian Hesse | 6ac984b51d | 2 years ago |
Christian Hesse | 33efb5fec5 | 2 years ago |
Christian Hesse | e5c868f109 | 2 years ago |
Christian Hesse | 43df01c10f | 2 years ago |
Christian Hesse | 89ee517122 | 2 years ago |
Christian Hesse | 2486d70752 | 2 years ago |
Christian Hesse | bcdfb2197f | 2 years ago |
June McEnroe | b9ff119549 | 2 years ago |
Christian Hesse | bb02e24ec2 | 2 years ago |
Christian Hesse | cc9b717c87 | 2 years ago |
Christian Hesse | 9761994243 | 2 years ago |
Christian Hesse | bbbaa29a96 | 2 years ago |
Christian Hesse | 73e98c16e8 | 2 years ago |
Christian Hesse | 11be5b8182 | 3 years ago |
Christian Hesse | b8f2b675df | 3 years ago |
Christian Hesse | 45eff40655 | 3 years ago |
Christian Hesse | 5258c297ba | 3 years ago |
Christian Hesse | 6dbbffe015 | 3 years ago |
Christian Hesse | 62eb8db452 | 3 years ago |
Christian Hesse | d889cae811 | 3 years ago |
Christian Hesse | 4ffadc1e0c | 3 years ago |
Todd Zullinger | bd6f5683f6 | 3 years ago |
Jason A. Donenfeld | f69626c68e | 4 years ago |
Christian Hesse | cef27b670a | 4 years ago |
Christian Hesse | b1739247b1 | 4 years ago |
Christian Hesse | fe99c76ee4 | 4 years ago |
Christian Hesse | adcc4f822f | 4 years ago |
Christian Hesse | a1039ab175 | 4 years ago |
Christian Hesse | a4de0e810b | 4 years ago |
Christian Hesse | 779631c6dc | 4 years ago |
Christian Hesse | 629659d2cf | 4 years ago |
Christian Hesse | 205837d468 | 4 years ago |
Christian Hesse | f780396c0a | 4 years ago |
Christian Hesse | 0462f08d85 | 4 years ago |
Jason A. Donenfeld | 55fa25adb0 | 4 years ago |
Jason A. Donenfeld | 6a8d6d4b50 | 4 years ago |
Christian Hesse | 892ba8c3cc | 4 years ago |
Christian Hesse | cc230bf044 | 4 years ago |
Hanspeter Portner | 06671f4b21 | 4 years ago |
Christian Hesse | fde897b817 | 4 years ago |
Christian Hesse | 5e49023b01 | 4 years ago |
Jason A. Donenfeld | fa146ccabd | 4 years ago |
Christian Hesse | bd68c98879 | 4 years ago |
Christian Hesse | ca98c9e7bf | 5 years ago |
Christian Hesse | d8e5dd25a0 | 5 years ago |
Christian Hesse | 583aa5d80e | 5 years ago |
Christian Hesse | bfabd4519c | 5 years ago |
Christian Hesse | 8fc0c81bbb | 5 years ago |
Christian Hesse | 034e3c7d56 | 5 years ago |
Christian Hesse | e1ad15d368 | 5 years ago |
Christian Hesse | 27a6d69ab3 | 5 years ago |
Christian Hesse | 985fba80d0 | 5 years ago |
Christian Hesse | 68de710c1c | 5 years ago |
Christian Hesse | ccba7eb9d0 | 5 years ago |
Jason A. Donenfeld | 54c407a74a | 5 years ago |
Chris Mayo | bd0293f570 | 5 years ago |
Chris Mayo | 5bd7e9bc1b | 5 years ago |
Jason A. Donenfeld | 7d87cd3a21 | 6 years ago |
Jason A. Donenfeld | e23f63461f | 6 years ago |
Christian Hesse | 55ebd5e97c | 6 years ago |
Jason A. Donenfeld | 441dac1d74 | 6 years ago |
Jason A. Donenfeld | 898b9e19e0 | 6 years ago |
Christian Hesse | a22855747e | 6 years ago |
Christian Hesse | 2c9f56f3e1 | 6 years ago |
Christian Hesse | a96f2890f4 | 6 years ago |
Christian Hesse | 0899eb644f | 6 years ago |
Christian Hesse | 2fc008d6de | 6 years ago |
Christian Hesse | edb3403f00 | 6 years ago |
Christian Hesse | 7f75647b55 | 6 years ago |
Christian Hesse | 71ba7187e5 | 6 years ago |
Christian Hesse | 60a930044d | 6 years ago |
Christian Hesse | 7cde5885d8 | 6 years ago |
Christian Hesse | b0fc647fe6 | 6 years ago |
Jason A. Donenfeld | 824138e591 | 6 years ago |
Jason A. Donenfeld | 53efaf30b5 | 6 years ago |
Konstantin Ryabitsev | c679d90104 | 6 years ago |
Jason A. Donenfeld | 77b6f83344 | 6 years ago |
Jason A. Donenfeld | 82856923bf | 6 years ago |
Jason A. Donenfeld | b73df8098f | 6 years ago |
Jason A. Donenfeld | c4d23d02ec | 6 years ago |
Jason A. Donenfeld | 93a2c33051 | 6 years ago |
Jason A. Donenfeld | c3b5b5f648 | 6 years ago |
@ -0,0 +1,68 @@
|
||||
/* cgit.js: javacript functions for cgit
|
||||
*
|
||||
* Copyright (C) 2006-2018 cgit Development Team <cgit@lists.zx2c4.com>
|
||||
*
|
||||
* Licensed under GNU General Public License v2
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
(function () {
|
||||
|
||||
/* This follows the logic and suffixes used in ui-shared.c */
|
||||
|
||||
var age_classes = [ "age-mins", "age-hours", "age-days", "age-weeks", "age-months", "age-years" ];
|
||||
var age_suffix = [ "min.", "hours", "days", "weeks", "months", "years", "years" ];
|
||||
var age_next = [ 60, 3600, 24 * 3600, 7 * 24 * 3600, 30 * 24 * 3600, 365 * 24 * 3600, 365 * 24 * 3600 ];
|
||||
var age_limit = [ 7200, 24 * 7200, 7 * 24 * 7200, 30 * 24 * 7200, 365 * 25 * 7200, 365 * 25 * 7200 ];
|
||||
var update_next = [ 10, 5 * 60, 1800, 24 * 3600, 24 * 3600, 24 * 3600, 24 * 3600 ];
|
||||
|
||||
function render_age(e, age) {
|
||||
var t, n;
|
||||
|
||||
for (n = 0; n < age_classes.length; n++)
|
||||
if (age < age_limit[n])
|
||||
break;
|
||||
|
||||
t = Math.round(age / age_next[n]) + " " + age_suffix[n];
|
||||
|
||||
if (e.textContent != t) {
|
||||
e.textContent = t;
|
||||
if (n == age_classes.length)
|
||||
n--;
|
||||
if (e.className != age_classes[n])
|
||||
e.className = age_classes[n];
|
||||
}
|
||||
}
|
||||
|
||||
function aging() {
|
||||
var n, next = 24 * 3600,
|
||||
now_ut = Math.round((new Date().getTime() / 1000));
|
||||
|
||||
for (n = 0; n < age_classes.length; n++) {
|
||||
var m, elems = document.getElementsByClassName(age_classes[n]);
|
||||
|
||||
if (elems.length && update_next[n] < next)
|
||||
next = update_next[n];
|
||||
|
||||
for (m = 0; m < elems.length; m++) {
|
||||
var age = now_ut - elems[m].getAttribute("data-ut");
|
||||
|
||||
render_age(elems[m], age);
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* We only need to come back when the age might have changed.
|
||||
* Eg, if everything is counted in hours already, once per
|
||||
* 5 minutes is accurate enough.
|
||||
*/
|
||||
|
||||
window.setTimeout(aging, next * 1000);
|
||||
}
|
||||
|
||||
document.addEventListener("DOMContentLoaded", function() {
|
||||
/* we can do the aging on DOM content load since no layout dependency */
|
||||
aging();
|
||||
}, false);
|
||||
|
||||
})();
|
@ -0,0 +1,359 @@
|
||||
-- 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
|
@ -1 +1 @@
|
||||
Subproject commit 53f9a3e157dbbc901a02ac2c73346d375e24978c
|
||||
Subproject commit c48035d29b4e524aed3a32f0403676f0d9128863
|
@ -1,3 +1,4 @@
|
||||
User-agent: *
|
||||
Disallow: /*/snapshot/*
|
||||
Disallow: /*/blame/*
|
||||
Allow: /
|
||||
|
@ -1,6 +1,6 @@
|
||||
#ifndef UI_ATOM_H
|
||||
#define UI_ATOM_H
|
||||
|
||||
extern void cgit_print_atom(char *tip, char *path, int max_count);
|
||||
extern void cgit_print_atom(char *tip, const char *path, int max_count);
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue