httpauth: Avoid redirecting the user to the cgiauthurl if they already have a login...

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 868862f4fa56cb1053babc756f2608409608ca4d..cb488449dd680b2ae36aefde23636ba3fdfe6ab8 100644 (file)
--- 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 a1ef33b225cd5b4339490838927144305a764d91..44b54b1236626f5882c77485ae7580b809466296 100644 (file)
--- 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