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

Avoid trying to log the user in when receiving anonymous pushes from git and a plugin like httpauth returns a login function. 

Just use check_canedit in nonfatal mode.
master
Joey Hess 2010-08-30 16:05:15 -04:00
parent 75382bd374
commit a330b1ee74
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
IkiWiki/Receive.pm
View File

@ -95,8 +95,7 @@ sub test () {
if ($change->{action} eq 'change' || if ($change->{action} eq 'change' ||
$change->{action} eq 'add') { $change->{action} eq 'add') {
if (defined $page) { if (defined $page) {
IkiWiki::check_canedit($page, $cgi, $session); next if IkiWiki::check_canedit($page, $cgi, $session, 1);
next;
} }
else { else {
if (IkiWiki::Plugin::attachment->can("check_canattach")) { if (IkiWiki::Plugin::attachment->can("check_canattach")) {

2
debian/changelog vendored
View File

@ -23,6 +23,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low
setup. (intrigeri) setup. (intrigeri)
* t/bazaar.t: Work around bzr 2.2.0's new requirement to configure * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure
bzr whoami before committing. bzr whoami before committing.
* Avoid trying to log the user in when receiving anonymous pushes
from git and a plugin like httpauth returns a login function.
-- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:45:48 -0400 -- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:45:48 -0400

2
doc/bugs/httpauth_conflicts_with_git_anon_push.mdwn
View File

@ -22,4 +22,4 @@ Analysis:
So, all these calls need to avoid running the error handler So, all these calls need to avoid running the error handler
functions returned by canedit hooks, and just return error functions returned by canedit hooks, and just return error
messages. messages. [[done]] --[[Joey]]