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 a18f8ca54619c146093498891f67057fd6c2b9e5..d0d4da0b74e6b7925ae8b85b6ef43d3cb6cff36c 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -11,6 +11,8 @@ sub import {
        hook(type => "auth", id => "httpauth", call => \&auth);
        hook(type => "canedit", id => "httpauth", call => \&canedit,
                last => 1);
        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 () {
 }
 
 sub getsetup () {


@@ -27,6 +29,14 @@ sub getsetup () {
                        rebuild => 0,
                },
 }
                        rebuild => 0,
                },
 }

+                       
+sub redir_cgiauthurl ($$) {
+       my $cgi=shift;
+       my $params=shift;
+
+       IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params);
+       exit;
+}

 
 sub auth ($$) {
        my $cgi=shift;
 
 sub auth ($$) {
        my $cgi=shift;


@@ -43,14 +53,31 @@ sub canedit ($$$) {
        my $session=shift;
 
        if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
        my $session=shift;
 
        if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {

-               return sub {
-                       IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
-                       exit;
-               };
+               return sub { redir_cgiauthurl($cgi, $cgi->query_string()) };

        }
        else {
                return undef;
        }
 }
 
        }
        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;
+               }
+       }
+}
+

 1
 1