X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/f2d6d4f6b24bb399481c40dc6eb6f3fe25190c5d..011d88052d6dacb6a9d84b1489d37eefeb992da1:/IkiWiki/Plugin/httpauth.pm

diff --git a/IkiWiki/Plugin/httpauth.pm b/IkiWiki/Plugin/httpauth.pm
index a18f8ca54..478f67446 100644
--- a/IkiWiki/Plugin/httpauth.pm
+++ b/IkiWiki/Plugin/httpauth.pm
@@ -9,8 +9,10 @@ use IkiWiki 3.00;
 sub import {
 	hook(type => "getsetup", id => "httpauth", call => \&getsetup);
 	hook(type => "auth", id => "httpauth", call => \&auth);
+	hook(type => "formbuilder_setup", id => "httpauth",
+		call => \&formbuilder_setup);
 	hook(type => "canedit", id => "httpauth", call => \&canedit,
-		last => 1);
+		first => 1);
 }
 
 sub getsetup () {
@@ -18,6 +20,7 @@ sub getsetup () {
 		plugin => {
 			safe => 1,
 			rebuild => 0,
+			section => "auth",
 		},
 		cgiauthurl => {
 			type => "string",
@@ -26,6 +29,23 @@ sub getsetup () {
 			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 redir_cgiauthurl ($;@) {
+	my $cgi=shift;
+
+	IkiWiki::redirect($cgi, 
+		@_ > 1 ? IkiWiki::cgiurl(cgiurl => $config{cgiauthurl}, @_)
+		       : $config{cgiauthurl}."?@_"
+	);
+	exit;
 }
 
 sub auth ($$) {
@@ -37,15 +57,47 @@ sub auth ($$) {
 	}
 }
 
+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) {
+			# bounce thru cgiauthurl and then back to
+			# the stored postsignin action
+			redir_cgiauthurl($cgi, do => "postsignin");
+		}
+	}
+}
+
+sub test_httpauth_pagespec ($) {
+	my $page=shift;
+
+	return (
+       );
+}
+
 sub canedit ($$$) {
 	my $page=shift;
 	my $cgi=shift;
 	my $session=shift;
 
-	if (! defined $cgi->remote_user() && defined $config{cgiauthurl}) {
+	if (! defined $cgi->remote_user() &&
+	    defined $config{httpauth_pagespec} &&
+	    length $config{httpauth_pagespec} &&
+	    defined $config{cgiauthurl} &&
+	    pagespec_match($page, $config{httpauth_pagespec})) {
 		return sub {
-			IkiWiki::redirect($cgi, $config{cgiauthurl}.'?'.$cgi->query_string());
-			exit;
+			# bounce thru cgiauthurl and back to edit action
+			redir_cgiauthurl($cgi, $cgi->query_string());
 		};
 	}
 	else {