(no commit message)

[ikiwiki.git] / doc / bugs / anonok_vs._httpauth.mdwn

diff --git a/doc/bugs/anonok_vs._httpauth.mdwn b/doc/bugs/anonok_vs._httpauth.mdwn
index 0a62164cb8480d7858b4f978f00e642ba7b70d9e..bff37e18bc7f2bad326e997d7a08f7ed79a415f1 100644 (file)
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -58,3 +58,61 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >> On reflection, I've stopped being bothered by the
 >> redirect-to-signin-page approach. (It only needs to happen once per
 >> browser session, anyway.) Can we try that? --[[schmonz]]
+
+Here is an attempt. With this httpauth will only redirect to the
+`cgiauth_url` when a page is edited, and it will defer to other plugins
+like anonok first. I have not tested this. --[[Joey]] 
+
+<pre>
+diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
+index 127c321..a18f8ca 100644
+--- a/IkiWiki/Plugin/httpauth.pm
++++ b/IkiWiki/Plugin/httpauth.pm
+@@ -9,6 +9,8 @@ use IkiWiki 3.00;
+ sub import {
+       hook(type => "getsetup", id => "httpauth", call => \&getsetup);
+       hook(type => "auth", id => "httpauth", call => \&auth);
++      hook(type => "canedit", id => "httpauth", call => \&canedit,
++              last => 1);
+ }
+ 
+ sub getsetup () {
+@@ -33,9 +35,21 @@ sub auth ($$) {
+       if (defined $cgi->remote_user()) {
+               $session->param("name", $cgi->remote_user());
+       }
+-      elsif (defined $config{cgiauthurl}) {
+-              IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+-              exit;
++}
++
++sub canedit ($$$) {
++      my $page=shift;
++      my $cgi=shift;
++      my $session=shift;
++
++      if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
++              return sub {
++                      IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
++                      exit;
++              };
++      }
++      else {
++              return undef;
+       }
+ }
+ 
+</pre>
+
+> With `anonok` enabled, this works for anonymous editing of an
+> existing Discussion page. auth is still needed to create one. --[[schmonz]]
+
+>> Refreshed above patch to fix that. --[[Joey]] 
+
+>> Remaining issue: This patch will work with anonok, but not openid or
+>> passwordauth, both of which want to display a login page at the same
+>> time that httpauth is redirecting to the cgiauthurl. As mentioned above,
+>> the only way to deal with that would be to add a link to the signin page
+>> that does the httpauth signin. --[[Joey]] 
+
+>>> That's dealt with in final version. [[done]] --[[Joey]]