mirror of https://git.zx2c4.com/cgit/
Compare commits
169 Commits
Author | SHA1 | Date |
---|---|---|
Samuel Lidén Borell | 00ecfaadea | 1 year ago |
Andy Green | 907134b7a2 | 1 year ago |
Andy Green | aee39b4e9a | 1 year ago |
Andy Green | 093ac96970 | 1 year ago |
Christian Hesse | 91f25909b9 | 1 year ago |
Hristo Venev | 852cb3b0e2 | 1 year ago |
John Keeping | 4c520cefc9 | 1 year ago |
John Keeping | d071f28cfa | 1 year ago |
John Keeping | c1a1d23111 | 1 year ago |
Christian Hesse | a0f6669bdb | 1 year ago |
Peter Prohaska | ce2062d9e2 | 1 year ago |
June McEnroe | 4e4b30effb | 1 year ago |
June McEnroe | 3295155a0c | 1 year ago |
Chris Mayo | e32f8416e8 | 1 year ago |
Chris Mayo | afffc3e772 | 1 year ago |
June McEnroe | fd20a5475e | 1 year ago |
June McEnroe | bcffc52366 | 1 year ago |
June McEnroe | cc6d9cc7fc | 1 year ago |
Christian Hesse | e10159691e | 1 year ago |
Christian Hesse | 979cf4a753 | 1 year ago |
Christian Hesse | 6ac984b51d | 1 year ago |
Christian Hesse | 33efb5fec5 | 1 year ago |
Christian Hesse | e5c868f109 | 1 year ago |
Christian Hesse | 43df01c10f | 1 year ago |
Christian Hesse | 89ee517122 | 1 year ago |
Christian Hesse | 2486d70752 | 1 year ago |
Christian Hesse | bcdfb2197f | 1 year ago |
June McEnroe | b9ff119549 | 1 year 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 | 3 years ago |
Christian Hesse | cef27b670a | 3 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 | 5 years ago |
Jason A. Donenfeld | e23f63461f | 5 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 |
Jason A. Donenfeld | c132ef2462 | 6 years ago |
Todd Zullinger | 5dec7f4a91 | 6 years ago |
Jason A. Donenfeld | 089b29a7e1 | 6 years ago |
Jason A. Donenfeld | 22583c4992 | 6 years ago |
Jason A. Donenfeld | 08a2b1b8f8 | 6 years ago |
Jason A. Donenfeld | c4167cbd65 | 6 years ago |
Christian Hesse | 7ba41963dd | 6 years ago |
Jason A. Donenfeld | b522a302c9 | 6 years ago |
John Keeping | c4fbb99cee | 6 years ago |
Andy Green | 9086260329 | 6 years ago |
John Keeping | b31e99887b | 6 years ago |
Christian Hesse | 255b78ff52 | 6 years ago |
Christian Hesse | 54d37dc154 | 6 years ago |
Christian Hesse | 2f8648ff7f | 6 years ago |
Christian Hesse | 30a378b571 | 6 years ago |
John Keeping | c712d5ac43 | 6 years ago |
John Keeping | 71d14d9c98 | 6 years ago |
John Keeping | e491eaa5df | 6 years ago |
John Keeping | 5b1f42ffee | 6 years ago |
John Keeping | 82aadcfc51 | 6 years ago |
John Keeping | 63da41a915 | 6 years ago |
John Keeping | f0047d2d94 | 6 years ago |
John Keeping | 00ad47bbfa | 6 years ago |
John Keeping | c1572bb5ec | 6 years ago |
John Keeping | d85e8a9810 | 6 years ago |
John Keeping | bd1b281478 | 6 years ago |
Christian Hesse | 0bb34ef130 | 6 years ago |
Christian Hesse | e65ea965a0 | 6 years ago |
Christian Hesse | fb804a3537 | 6 years ago |
Andy Green | b759189574 | 6 years ago |
Jon DeVree | 26610aff34 | 6 years ago |
Andy Green | 7708859c4d | 6 years ago |
John Keeping | 48f175083a | 6 years ago |
Todd Zullinger | 33414d7869 | 6 years ago |
Jason A. Donenfeld | 03f6e34bb9 | 6 years ago |
Jeff Smith | dbaee2672b | 6 years ago |
Jeff Smith | aafc42d808 | 6 years ago |
Jeff Smith | 2b95c9d49c | 6 years ago |
Jeff Smith | 6b5b655f6d | 6 years ago |
Christian Hesse | 1dd53e3a2f | 6 years ago |
Christian Hesse | 5d947ba3f0 | 7 years ago |
Ville Skyttä | 67d0f87050 | 7 years ago |
Ville Skyttä | 98abe5bb9e | 7 years ago |
Jason A. Donenfeld | fd069b4ca0 | 7 years ago |
John Keeping | 9d751e7eec | 7 years ago |
Jeff Smith | 1649afdc9b | 7 years ago |
Jeff Smith | c1cd290d1f | 7 years ago |
Jeff Smith | f6ffe40d1a | 7 years ago |
Jeff Smith | 9337c7ee83 | 7 years ago |
Jeff Smith | 70787254b2 | 7 years ago |
John Keeping | 3b485cc542 | 7 years ago |
Daniel M. Weeks | de29788338 | 7 years ago |
John Keeping | 51cc456b77 | 7 years ago |
John Keeping | 113f4b8588 | 7 years ago |
John Keeping | c699866699 | 7 years ago |
John Keeping | 1b4ef6783a | 7 years ago |
John Keeping | 6d3c8bc37f | 7 years ago |
Jeff Smith | 86a6d358f7 | 7 years ago |
Christian Hesse | 3d33b46df2 | 7 years ago |
Lukas Fleischer | 7ce19ba550 | 7 years ago |
Lukas Fleischer | 7ebdb30fdf | 7 years ago |
Jason A. Donenfeld | 87c47488d0 | 7 years ago |
Lukas Fleischer | be39d22328 | 7 years ago |
Jason A. Donenfeld | 5564a5d066 | 7 years ago |
Christian Hesse | 91153fd02e | 8 years ago |
Peter Colberg | 2b993402c7 | 8 years ago |
John Keeping | 5ccd965258 | 8 years ago |
@ -1,3 +1,3 @@
|
||||
[submodule "git"]
|
||||
url = git://git.kernel.org/pub/scm/git/git.git
|
||||
url = https://git.kernel.org/pub/scm/git/git.git
|
||||
path = git
|
||||
|
@ -1,3 +0,0 @@
|
||||
div.variablelist dt {
|
||||
margin-top: 1em;
|
||||
}
|
@ -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 6406bdc0b95715a087fdeeb0f6adf3deb80a25b8
|
||||
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
|
||||
|
@ -0,0 +1,315 @@
|
||||
/* ui-blame.c: functions for blame output
|
||||
*
|
||||
* Copyright (C) 2006-2017 cgit Development Team <cgit@lists.zx2c4.com>
|
||||
*
|
||||
* Licensed under GNU General Public License v2
|
||||
* (see COPYING for full license text)
|
||||
*/
|
||||
|
||||
#include "cgit.h"
|
||||
#include "ui-blame.h"
|
||||
#include "html.h"
|
||||
#include "ui-shared.h"
|
||||
#include "strvec.h"
|
||||
#include "blame.h"
|
||||
|
||||
|
||||
static char *emit_suspect_detail(struct blame_origin *suspect)
|
||||
{
|
||||
struct commitinfo *info;
|
||||
struct strbuf detail = STRBUF_INIT;
|
||||
|
||||
info = cgit_parse_commit(suspect->commit);
|
||||
|
||||
strbuf_addf(&detail, "author %s", info->author);
|
||||
if (!ctx.cfg.noplainemail)
|
||||
strbuf_addf(&detail, " %s", info->author_email);
|
||||
strbuf_addf(&detail, " %s\n",
|
||||
show_date(info->author_date, info->author_tz,
|
||||
cgit_date_mode(DATE_ISO8601)));
|
||||
|
||||
strbuf_addf(&detail, "committer %s", info->committer);
|
||||
if (!ctx.cfg.noplainemail)
|
||||
strbuf_addf(&detail, " %s", info->committer_email);
|
||||
strbuf_addf(&detail, " %s\n\n",
|
||||
show_date(info->committer_date, info->committer_tz,
|
||||
cgit_date_mode(DATE_ISO8601)));
|
||||
|
||||
strbuf_addstr(&detail, info->subject);
|
||||
|
||||
cgit_free_commitinfo(info);
|
||||
return strbuf_detach(&detail, NULL);
|
||||
}
|
||||
|
||||
static void emit_blame_entry_hash(struct blame_entry *ent)
|
||||
{
|
||||
struct blame_origin *suspect = ent->suspect;
|
||||
struct object_id *oid = &suspect->commit->object.oid;
|
||||
unsigned long line = 0;
|
||||
|
||||
char *detail = emit_suspect_detail(suspect);
|
||||
html("<span class='oid'>");
|
||||
cgit_commit_link(find_unique_abbrev(oid, DEFAULT_ABBREV), detail,
|
||||
NULL, ctx.qry.head, oid_to_hex(oid), suspect->path);
|
||||
html("</span>");
|
||||
free(detail);
|
||||
|
||||
if (!parse_commit(suspect->commit) && suspect->commit->parents) {
|
||||
struct commit *parent = suspect->commit->parents->item;
|
||||
|
||||
html(" ");
|
||||
cgit_blame_link("^", "Blame the previous revision", NULL,
|
||||
ctx.qry.head, oid_to_hex(&parent->object.oid),
|
||||
suspect->path);
|
||||
}
|
||||
|
||||
while (line++ < ent->num_lines)
|
||||
html("\n");
|
||||
}
|
||||
|
||||
static void emit_blame_entry_linenumber(struct blame_entry *ent)
|
||||
{
|
||||
const char *numberfmt = "<a id='n%1$d' href='#n%1$d'>%1$d</a>\n";
|
||||
|
||||
unsigned long lineno = ent->lno;
|
||||
while (lineno < ent->lno + ent->num_lines)
|
||||
htmlf(numberfmt, ++lineno);
|
||||
}
|
||||
|
||||
static void emit_blame_entry_line_background(struct blame_scoreboard *sb,
|
||||
struct blame_entry *ent)
|
||||
{
|
||||
unsigned long line;
|
||||
size_t len, maxlen = 2;
|
||||
const char* pos, *endpos;
|
||||
|
||||
for (line = ent->lno; line < ent->lno + ent->num_lines; line++) {
|
||||
html("\n");
|
||||
pos = blame_nth_line(sb, line);
|
||||
endpos = blame_nth_line(sb, line + 1);
|
||||
len = 0;
|
||||
while (pos < endpos) {
|
||||
len++;
|
||||
if (*pos++ == '\t')
|
||||
len = (len + 7) & ~7;
|
||||
}
|
||||
if (len > maxlen)
|
||||
maxlen = len;
|
||||
}
|
||||
|
||||
for (len = 0; len < maxlen - 1; len++)
|
||||
html(" ");
|
||||
}
|
||||
|
||||
struct walk_tree_context {
|
||||
char *curr_rev;
|
||||
int match_baselen;
|
||||
int state;
|
||||
};
|
||||
|
||||
static void print_object(const struct object_id *oid, const char *path,
|
||||
const char *basename, const char *rev)
|
||||
{
|
||||
enum object_type type;
|
||||
char *buf;
|
||||
unsigned long size;
|
||||
struct strvec rev_argv = STRVEC_INIT;
|
||||
struct rev_info revs;
|
||||
struct blame_scoreboard sb;
|
||||
struct blame_origin *o;
|
||||
struct blame_entry *ent = NULL;
|
||||
|
||||
type = oid_object_info(the_repository, oid, &size);
|
||||
if (type == OBJ_BAD) {
|
||||
cgit_print_error_page(404, "Not found", "Bad object name: %s",
|
||||
oid_to_hex(oid));
|
||||
return;
|
||||
}
|
||||
|
||||
buf = read_object_file(oid, &type, &size);
|
||||
if (!buf) {
|
||||
cgit_print_error_page(500, "Internal server error",
|
||||
"Error reading object %s", oid_to_hex(oid));
|
||||
return;
|
||||
}
|
||||
|
||||
strvec_push(&rev_argv, "blame");
|
||||
strvec_push(&rev_argv, rev);
|
||||
init_revisions(&revs, NULL);
|
||||
revs.diffopt.flags.allow_textconv = 1;
|
||||
setup_revisions(rev_argv.nr, rev_argv.v, &revs, NULL);
|
||||
init_scoreboard(&sb);
|
||||
sb.revs = &revs;
|
||||
sb.repo = the_repository;
|
||||
sb.path = path;
|
||||
setup_scoreboard(&sb, &o);
|
||||
o->suspects = blame_entry_prepend(NULL, 0, sb.num_lines, o);
|
||||
prio_queue_put(&sb.commits, o->commit);
|
||||
blame_origin_decref(o);
|
||||
sb.ent = NULL;
|
||||
sb.path = path;
|
||||
assign_blame(&sb, 0);
|
||||
blame_sort_final(&sb);
|
||||
blame_coalesce(&sb);
|
||||
|
||||
cgit_set_title_from_path(path);
|
||||
|
||||
cgit_print_layout_start();
|
||||
htmlf("blob: %s (", oid_to_hex(oid));
|
||||
cgit_plain_link("plain", NULL, NULL, ctx.qry.head, rev, path);
|
||||
html(") (");
|
||||
cgit_tree_link("tree", NULL, NULL, ctx.qry.head, rev, path);
|
||||
html(")\n");
|
||||
|
||||
if (buffer_is_binary(buf, size)) {
|
||||
html("<div class='error'>blob is binary.</div>");
|
||||
goto cleanup;
|
||||
}
|
||||
if (ctx.cfg.max_blob_size && size / 1024 > ctx.cfg.max_blob_size) {
|
||||
htmlf("<div class='error'>blob size (%ldKB)"
|
||||
" exceeds display size limit (%dKB).</div>",
|
||||
size / 1024, ctx.cfg.max_blob_size);
|
||||
goto cleanup;
|
||||
}
|
||||
|
||||
html("<table class='blame blob'>\n<tr>\n");
|
||||
|
||||
/* Commit hashes */
|
||||
html("<td class='hashes'>");
|
||||
for (ent = sb.ent; ent; ent = ent->next) {
|
||||
html("<div class='alt'><pre>");
|
||||
emit_blame_entry_hash(ent);
|
||||
html("</pre></div>");
|
||||
}
|
||||
html("</td>\n");
|
||||
|
||||
/* Line numbers */
|
||||
if (ctx.cfg.enable_tree_linenumbers) {
|
||||
html("<td class='linenumbers'>");
|
||||
for (ent = sb.ent; ent; ent = ent->next) {
|
||||
html("<div class='alt'><pre>");
|
||||
emit_blame_entry_linenumber(ent);
|
||||
html("</pre></div>");
|
||||
}
|
||||
html("</td>\n");
|
||||
}
|
||||
|
||||
html("<td class='lines'><div>");
|
||||
|
||||
/* Colored bars behind lines */
|
||||
html("<div>");
|
||||
for (ent = sb.ent; ent; ) {
|
||||
struct blame_entry *e = ent->next;
|
||||
html("<div class='alt'><pre>");
|
||||
emit_blame_entry_line_background(&sb, ent);
|
||||
html("</pre></div>");
|
||||
free(ent);
|
||||
ent = e;
|
||||
}
|
||||
html("</div>");
|
||||
|
||||
free((void *)sb.final_buf);
|
||||
|
||||
/* Lines */
|
||||
html("<pre><code>");
|
||||
if (ctx.repo->source_filter) {
|
||||
char *filter_arg = xstrdup(basename);
|
||||
cgit_open_filter(ctx.repo->source_filter, filter_arg);
|
||||
html_raw(buf, size);
|
||||
cgit_close_filter(ctx.repo->source_filter);
|
||||
free(filter_arg);
|
||||
} else {
|
||||
html_txt(buf);
|
||||
}
|
||||
html("</code></pre>");
|
||||
|
||||
html("</div></td>\n");
|
||||
|
||||
html("</tr>\n</table>\n");
|
||||
|
||||
cgit_print_layout_end();
|
||||
|
||||
cleanup:
|
||||
free(buf);
|
||||
}
|
||||
|
||||
static int walk_tree(const struct object_id *oid, struct strbuf *base,
|
||||
const char *pathname, unsigned mode, void *cbdata)
|
||||
{
|
||||
struct walk_tree_context *walk_tree_ctx = cbdata;
|
||||
|
||||
if (base->len == walk_tree_ctx->match_baselen) {
|
||||
if (S_ISREG(mode)) {
|
||||
struct strbuf buffer = STRBUF_INIT;
|
||||
strbuf_addbuf(&buffer, base);
|
||||
strbuf_addstr(&buffer, pathname);
|
||||
print_object(oid, buffer.buf, pathname,
|
||||
walk_tree_ctx->curr_rev);
|
||||
strbuf_release(&buffer);
|
||||
walk_tree_ctx->state = 1;
|
||||
} else if (S_ISDIR(mode)) {
|
||||
walk_tree_ctx->state = 2;
|
||||
}
|
||||
} else if (base->len < INT_MAX
|
||||
&& (int)base->len > walk_tree_ctx->match_baselen) {
|
||||
walk_tree_ctx->state = 2;
|
||||
} else if (S_ISDIR(mode)) {
|
||||
return READ_TREE_RECURSIVE;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int basedir_len(const char *path)
|
||||
{
|
||||
char *p = strrchr(path, '/');
|
||||
if (p)
|
||||
return p - path + 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void cgit_print_blame(void)
|
||||
{
|
||||
const char *rev = ctx.qry.oid;
|
||||
struct object_id oid;
|
||||
struct commit *commit;
|
||||
struct pathspec_item path_items = {
|
||||
.match = ctx.qry.path,
|
||||
.len = ctx.qry.path ? strlen(ctx.qry.path) : 0
|
||||
};
|
||||
struct pathspec paths = {
|
||||
.nr = 1,
|
||||
.items = &path_items
|
||||
};
|
||||
struct walk_tree_context walk_tree_ctx = {
|
||||
.state = 0
|
||||
};
|
||||
|
||||
if (!rev)
|
||||
rev = ctx.qry.head;
|
||||
|
||||
if (get_oid(rev, &oid)) {
|
||||
cgit_print_error_page(404, "Not found",
|
||||
"Invalid revision name: %s", rev);
|
||||
return;
|
||||
}
|
||||
commit = lookup_commit_reference(the_repository, &oid);
|
||||
if (!commit || parse_commit(commit)) {
|
||||
cgit_print_error_page(404, "Not found",
|
||||
"Invalid commit reference: %s", rev);
|
||||
return;
|
||||
}
|
||||
|
||||
walk_tree_ctx.curr_rev = xstrdup(rev);
|
||||
walk_tree_ctx.match_baselen = (path_items.match) ?
|
||||
basedir_len(path_items.match) : -1;
|
||||
|
||||
read_tree(the_repository, repo_get_commit_tree(the_repository, commit),
|
||||
&paths, walk_tree, &walk_tree_ctx);
|
||||
if (!walk_tree_ctx.state)
|
||||
cgit_print_error_page(404, "Not found", "Not found");
|
||||
else if (walk_tree_ctx.state == 2)
|
||||
cgit_print_error_page(404, "No blame for folders",
|
||||
"Blame is not available for folders.");
|
||||
|
||||
free(walk_tree_ctx.curr_rev);
|
||||
}
|
@ -0,0 +1,6 @@
|
||||
#ifndef UI_BLAME_H
|
||||
#define UI_BLAME_H
|
||||
|
||||
extern void cgit_print_blame(void);
|
||||
|
||||
#endif /* UI_BLAME_H */
|
Loading…
Reference in New Issue