diff options
| author | Joey Hess <joey@kitenet.net> | 2010-08-30 18:32:32 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-30 18:33:00 -0400 |
| commit | f55c7d13966ff1cd90ddf50e05829f6bb3eda557 (patch) | |
| tree | 1107d6c0672474bf53ea54960c580a8b23e858b2 | |
| parent | 2df0999e4033278a6cc8f6e2d00449224aa09efa (diff) | |
| download | ikiwiki-f55c7d13966ff1cd90ddf50e05829f6bb3eda557.tar ikiwiki-f55c7d13966ff1cd90ddf50e05829f6bb3eda557.tar.gz | |
httpauth: Avoid redirecting the user to the cgiauthurl if they already have a login session.
| -rw-r--r-- | IkiWiki/Plugin/httpauth.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm index 868862f4f..cb488449d 100644 --- a/IkiWiki/Plugin/httpauth.pm +++ b/IkiWiki/Plugin/httpauth.pm @@ -84,6 +84,8 @@ sub canedit ($$$) { my $session=shift; if (! defined $cgi->remote_user() && + (! defined $session->param("name") || + ! IkiWiki::userinfo_get($session->param("name"), "regdate")) && defined $config{httpauth_pagespec} && length $config{httpauth_pagespec} && defined $config{cgiauthurl} && diff --git a/debian/changelog b/debian/changelog index a1ef33b22..44b54b123 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,8 +23,8 @@ ikiwiki (3.20100816) UNRELEASED; urgency=low setup. (intrigeri) * t/bazaar.t: Work around bzr 2.2.0's new requirement to configure 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. + * httpauth: Avoid redirecting the user to the cgiauthurl if + they already have a login session. -- Joey Hess <joeyh@debian.org> Sun, 15 Aug 2010 11:45:48 -0400 |