sadly still lost

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

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index 478f6744656f5bdbd4baa00f79cadb9a74ebd255..76d574b2a899df7e77cb71f2a4f27ee078e76b43 100644 (file)
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -7,6 +7,7 @@ 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 => "formbuilder_setup", id => "httpauth",
        hook(type => "getsetup", id => "httpauth", call => \&getsetup);
        hook(type => "auth", id => "httpauth", call => \&auth);
        hook(type => "formbuilder_setup", id => "httpauth",


@@ -37,6 +38,19 @@ sub getsetup () {
                        rebuild => 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 ($;@) {
        my $cgi=shift;
                        
 sub redir_cgiauthurl ($;@) {
        my $cgi=shift;


@@ -78,19 +92,14 @@ sub formbuilder_setup (@) {
        }
 }
 
        }
 }
 

-sub test_httpauth_pagespec ($) {
-       my $page=shift;
-
-       return (
-       );
-}
-

 sub canedit ($$$) {
        my $page=shift;
        my $cgi=shift;
        my $session=shift;
 
        if (! defined $cgi->remote_user() &&
 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} &&
            defined $config{httpauth_pagespec} &&
            length $config{httpauth_pagespec} &&
            defined $config{cgiauthurl} &&