Merge branch 'restrict-comment-formats' of git://rtime.felk.cvut.cz/sojka/ikiwiki

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

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index d0d4da0b74e6b7925ae8b85b6ef43d3cb6cff36c..76d574b2a899df7e77cb71f2a4f27ee078e76b43 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -7,12 +7,13 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
 use IkiWiki 3.00;
 
 sub import {

+       hook(type => "checkconfig", id => "httpauth", call => \&checkconfig);

        hook(type => "getsetup", id => "httpauth", call => \&getsetup);
        hook(type => "auth", id => "httpauth", call => \&auth);
        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);
        hook(type => "formbuilder_setup", id => "httpauth",
                call => \&formbuilder_setup);

+       hook(type => "canedit", id => "httpauth", call => \&canedit,
+               first => 1);

 }
 
 sub getsetup () {
 }
 
 sub getsetup () {


@@ -20,6 +21,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => 0,
                plugin => {
                        safe => 1,
                        rebuild => 0,

+                       section => "auth",

                },
                cgiauthurl => {
                        type => "string",
                },
                cgiauthurl => {
                        type => "string",


@@ -28,13 +30,35 @@ sub getsetup () {
                        safe => 1,
                        rebuild => 0,
                },
                        safe => 1,
                        rebuild => 0,
                },

+               httpauth_pagespec => {
+                       type => "pagespec",
+                       example => "!*/Discussion",
+                       description => "PageSpec of pages where only httpauth will be used for authentication",
+                       safe => 0,
+                       rebuild => 0,
+               },
+}
+
+sub checkconfig () {
+       if ($config{cgi} && defined $config{cgiauthurl} &&
+           keys %{$IkiWiki::hooks{auth}} < 2) {
+               # There are no other auth hooks registered, so avoid
+               # the normal signin form, and jump right to httpauth.
+               require IkiWiki::CGI;
+               inject(name => "IkiWiki::cgi_signin", call => sub ($$) {
+                       my $cgi=shift;
+                       redir_cgiauthurl($cgi, $cgi->query_string());
+               });
+       }

 }
                        
 }
                        

-sub redir_cgiauthurl ($$) {
+sub redir_cgiauthurl ($;@) {

        my $cgi=shift;
        my $cgi=shift;

-       my $params=shift;

 
 

-       IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$params);
+       IkiWiki::redirect($cgi, 
+               @_ > 1 ? IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_)
+                      : $config{cgiauthurl}."?@_"
+       );

        exit;
 }
 
        exit;
 }
 


@@ -47,19 +71,6 @@ sub auth ($$) {
        }
 }
 
        }
 }
 

-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=@_;
 
 sub formbuilder_setup (@) {
        my %params=@_;
 


@@ -74,10 +85,33 @@ sub formbuilder_setup (@) {
                push @$buttons, $button_text;
 
                if ($form->submitted && $form->submitted eq $button_text) {
                push @$buttons, $button_text;
 
                if ($form->submitted && $form->submitted eq $button_text) {

-                       redir_cgiauthurl($cgi, "do=postsignin");
-                       exit;
+                       # bounce thru cgiauthurl and then back to
+                       # the stored postsignin action
+                       redir_cgiauthurl($cgi, do => "postsignin");

                }
        }
 }
 
                }
        }
 }
 

+sub canedit ($$$) {
+       my $page=shift;
+       my $cgi=shift;
+       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} &&
+           pagespec_match($page, $config{httpauth_pagespec})) {
+               return sub {
+                       # bounce thru cgiauthurl and back to edit action
+                       redir_cgiauthurl($cgi, $cgi->query_string());
+               };
+       }
+       else {
+               return undef;
+       }
+}
+

 1
 1