httpauth: When cgiauthurl is configured, httpauth can now be used alongside other...

[ikiwiki.git] / IkiWiki / Plugin / httpauth.pm

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 127c321f0491978c9b88760685963f785cd1062e..d0d4da0b74e6b7925ae8b85b6ef43d3cb6cff36c 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,6 +9,10 @@ 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);
+       hook(type => "formbuilder_setup", id => "httpauth",
+               call => \&formbuilder_setup);
 }
 
 sub getsetup () {
@@ -25,6 +29,14 @@ sub getsetup () {
                        rebuild => 0,
                },
 }
+                       
+sub redir_cgiauthurl ($$) {
+       my $cgi=shift;
+       my $params=shift;
+
+       IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params);
+       exit;
+}
 
 sub auth ($$) {
        my $cgi=shift;
@@ -33,9 +45,38 @@ 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 { redir_cgiauthurl($cgi, $cgi->query_string()) };
+       }
+       else {
+               return undef;
+       }
+}
+
+sub formbuilder_setup (@) {
+       my %params=@_;
+
+       my $form=$params{form};
+       my $session=$params{session};
+       my $cgi=$params{cgi};
+       my $buttons=$params{buttons};
+
+       if ($form->title eq "signin" &&
+           ! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+               my $button_text="Login with HTTP auth";
+               push @$buttons, $button_text;
+
+               if ($form->submitted && $form->submitted eq $button_text) {
+                       redir_cgiauthurl($cgi, "do=postsignin");
+                       exit;
+               }
        }
 }