urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git: do not fail to commit if committer is anonymous

master
Simon McVittie 2016-12-24 14:35:01 +00:00
parent a67f4d3944
commit e193c75b7d
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
IkiWiki/Plugin/git.pm
View File

@ -600,18 +600,24 @@ sub rcs_commit_helper (@) {
elsif (defined $params{session}->remote_addr()) {
$u=$params{session}->remote_addr();
}
if (defined $u) {
if (length $u) {
$u=encode_utf8(IkiWiki::cloak($u));
$ENV{GIT_AUTHOR_NAME}=$u;
}
else {
$u = 'anonymous';
}
if (defined $params{session}->param("nickname")) {
$u=encode_utf8($params{session}->param("nickname"));
$u=~s/\s+/_/g;
$u=~s/[^-_0-9[:alnum:]]+//g;
}
if (defined $u) {
if (length $u) {
$ENV{GIT_AUTHOR_EMAIL}="$u\@web";
}
else {
$ENV{GIT_AUTHOR_EMAIL}='anonymous@web';
}
}
ensure_committer();

2
debian/changelog vendored
View File

@ -3,6 +3,8 @@ ikiwiki (3.20161220) UNRELEASED; urgency=medium
* Add CVE references for CVE-2016-10026
* Add missing ikiwiki.setup for the manual test for CVE-2016-10026
* git: don't issue a warning if the rcsinfo CGI parameter is undefined
* git: do not fail to commit changes with a recent git version
and an anonymous committer
-- Simon McVittie <smcv@debian.org> Wed, 21 Dec 2016 13:03:07 +0000