Files
@ 070b8c39736f
Branch filter:
Location: kallithea/scripts/update-copyrights.py
070b8c39736f
6.4 KiB
text/x-python
auth: only use X- headers instead of wsgi.url_scheme if explicitly told so in url_scheme_header - drop https_fixup setting
Before, several X- headers would be trusted to overrule the actual connection
protocol (http or https) seen by the Kallithea WSGI server. That was mainly
when https_fixup were set, but it incorrectly also kicked in if https_fixup or
use_htsts were configured. The ambiguity of which headers were used also made
it less reliable. The proxy server not only had to be configured to set one of
the headers correctly, it also had to make sure other headers were not passed
on from the client. It would thus in some cases be possible for clients to fake
the connection scheme, and thus potentially be possible to bypass restrictions
configured in Kallithea.
Fixed by making it configurable which WSGI environment variable to use for the
protocol. Users can configure url_scheme_header to for example
HTTP_X_FORWARDED_PROTO instead of using the default wsgi.url_scheme .
This change is a bit similar to what is going on in the https_fixup middleware,
but is doing a bit more of what for example is happening in similar code in
werkzeug/middleware/proxy_fix.py .
The semantics of the old https_fixup were unsafe, so it has been dropped.
Admins that are upgrading must change their configuration to use the new
url_scheme_header option.
Before, several X- headers would be trusted to overrule the actual connection
protocol (http or https) seen by the Kallithea WSGI server. That was mainly
when https_fixup were set, but it incorrectly also kicked in if https_fixup or
use_htsts were configured. The ambiguity of which headers were used also made
it less reliable. The proxy server not only had to be configured to set one of
the headers correctly, it also had to make sure other headers were not passed
on from the client. It would thus in some cases be possible for clients to fake
the connection scheme, and thus potentially be possible to bypass restrictions
configured in Kallithea.
Fixed by making it configurable which WSGI environment variable to use for the
protocol. Users can configure url_scheme_header to for example
HTTP_X_FORWARDED_PROTO instead of using the default wsgi.url_scheme .
This change is a bit similar to what is going on in the https_fixup middleware,
but is doing a bit more of what for example is happening in similar code in
werkzeug/middleware/proxy_fix.py .
The semantics of the old https_fixup were unsafe, so it has been dropped.
Admins that are upgrading must change their configuration to use the new
url_scheme_header option.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | #!/usr/bin/env python3
# -*- coding: utf-8 -*-
"""
Kallithea script for maintaining contributor lists from version control
history.
This script and the data in it is a best effort attempt at reverse engineering
previous attributions and correlate that with version control history while
preserving all existing copyright statements and attribution. This script is
processing and summarizing information found elsewhere - it is not by itself
making any claims. Comments in the script are an attempt at reverse engineering
possible explanations - they are not showing any intent or confirming it is
correct.
Three files are generated / modified by this script:
kallithea/templates/about.html claims to show copyright holders, and the GPL
license requires such existing "legal notices" to be preserved. We also try to
keep it updated with copyright holders, but do not claim it is a correct list.
CONTRIBUTORS has the purpose of giving credit where credit is due and list all
the contributor names in the source.
kallithea/templates/base/base.html contains the copyright years in the page
footer.
Both make a best effort of listing all copyright holders, but revision control
history might be a better and more definitive source.
Contributors are sorted "fairly" by copyright year and amount of
contribution.
New contributors are listed, without considering if the contribution contains
copyrightable work.
When the copyright might belong to a different legal entity than the
contributor, the legal entity is given credit too.
"""
import os
import re
from collections import defaultdict
import contributor_data
def sortkey(x):
"""Return key for sorting contributors "fairly":
* latest contribution
* first contribution
* number of contribution years
* name (with some unicode normalization)
The entries must be 2-tuples of a list of string years and the name"""
years, name = x
if not years:
years = ['0']
return (-int(years[-1]), # primarily sort by latest contribution
int(years[0]), # then sort by first contribution
-len(years), # then sort by length of contribution (no gaps)
name.lower().replace('\xe9', 'e').replace('\u0142', 'l') # finally sort by name
)
def nice_years(l, dash='-', join=' '):
"""Convert a list of years into brief range like '1900-1901, 1921'."""
if not l:
return ''
start = end = int(l[0])
ranges = []
for year in l[1:] + [0]:
year = int(year)
if year == end + 1:
end = year
continue
if start == end:
ranges.append('%s' % start)
else:
ranges.append('%s%s%s' % (start, dash, end))
start = end = year
assert start == 0 and end == 0, (start, end)
return join.join(ranges)
def insert_entries(
filename,
all_entries,
no_entries,
domain_extra,
split_re,
normalize_name,
format_f):
"""Update file with contributor information.
all_entries: list of tuples with year and name
no_entries: set of names or name and year tuples to ignore
domain_extra: map domain name to extra credit name
split_re: regexp matching the part of file to rewrite
normalize_name: function to normalize names for grouping and display
format_f: function formatting year list and name to a string
"""
name_years = defaultdict(set)
for year, name in all_entries:
if name in no_entries or (name, year) in no_entries:
continue
parts = name.split(' <', 1)
if len(parts) == 2:
name = parts[0] + ' <' + parts[1].lower()
domain = name.split('@', 1)[-1].rstrip('>')
if domain in domain_extra:
name_years[domain_extra[domain]].add(year)
name_years[normalize_name(name)].add(year)
l = [(list(sorted(year for year in years if year)), name)
for name, years in name_years.items()]
l.sort(key=sortkey)
with open(filename) as f:
pre, post = re.split(split_re, f.read())
with open(filename, 'w') as f:
f.write(pre +
''.join(format_f(years, name) for years, name in l) +
post)
def main():
repo_entries = [
(year, contributor_data.name_fixes.get(name) or contributor_data.name_fixes.get(name.rsplit('<', 1)[0].strip()) or name)
for year, name in
(line.strip().split(' ', 1)
for line in os.popen("""hg log -r '::.' -T '{date(date,"%Y")} {author}\n'""").readlines())
]
insert_entries(
filename='kallithea/templates/about.html',
all_entries=repo_entries + contributor_data.other_about + contributor_data.other,
no_entries=contributor_data.no_about,
domain_extra=contributor_data.domain_extra,
split_re=r'(?: <li>Copyright © [^\n]+</li>\n)+',
normalize_name=lambda name: name.split('<', 1)[0].strip(),
format_f=lambda years, name: ' <li>Copyright © %s, %s</li>\n' % (nice_years(years, '–', ', '), name),
)
insert_entries(
filename='CONTRIBUTORS',
all_entries=repo_entries + contributor_data.other_contributors + contributor_data.other,
no_entries=contributor_data.total_ignore,
domain_extra=contributor_data.domain_extra,
split_re=r'(?: [^\n]+\n)+',
normalize_name=lambda name: name,
format_f=lambda years, name: (' %s%s%s\n' % (name, ' ' if years else '', nice_years(years))),
)
insert_entries(
filename='kallithea/templates/base/base.html',
all_entries=repo_entries,
no_entries=contributor_data.total_ignore,
domain_extra={},
split_re=r'(?<=©) .+ (?=by various authors)',
normalize_name=lambda name: '',
format_f=lambda years, name: ' ' + nice_years(years, '–', ', ') + ' ',
)
#docs/conf.py:copyright = u'2010-2016 by various authors, licensed as GPLv3.'
insert_entries(
filename='docs/conf.py',
all_entries=repo_entries,
no_entries=contributor_data.total_ignore,
domain_extra={},
split_re=r"(?<=copyright = ').+(?= by various authors)",
normalize_name=lambda name: '',
format_f=lambda years, name: nice_years(years, '-', ', '),
)
if __name__ == '__main__':
main()
# To list new contributors since last tagging:
# { hg log -r '::tagged()' -T ' {author}\n {author}\n'; hg log -r '::.' -T ' {author}\n' | sort | uniq; } | sort | uniq -u
|