tested

[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 e386a8d964b37d4362486b0bd22becd44894ff63..1940fdad8d5869513f447b5c9a61552a996e2fa8 100644 (file)
--- a/doc/bugs/anonok_vs._httpauth.mdwn
+++ b/doc/bugs/anonok_vs._httpauth.mdwn
@@ -54,3 +54,52 @@ and a whitelist of OpenIDs in `locked_pages`...)
 >>>>>> change. And then the Edit link for Discussion subpages could do
 >>>>>> as you suggest, adding one click for the httpauth user, who won't
 >>>>>> often need to edit those subpages. --[[schmonz]]
+
+>> 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..c181164 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,10 +35,20 @@ sub auth ($$) {
+       if (defined $cgi->remote_user()) {
+               $session->param("name", $cgi->remote_user());
+       }
+-      elsif (defined $config{cgiauthurl}) {
++}
++
++sub canedit ($$$) {
++      my $page=shift;
++      my $cgi=shift;
++      my $session=shift;
++
++      if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+               IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
+               exit;
+       }
++      else {
++              return undef;
++      }
+}
+ 
+ 1
+</pre>
+
+> With `anonok` enabled, this works for anonymous editing of an
+> existing Discussion page. auth is still needed to create one. --[[schmonz]]