X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/5ce3a0130030f3b07e163727f16d212b2fda6259..dae4a144e7219ce596f9d96206176a3d1d1ad4a5:/IkiWiki/CGI.pm?ds=sidebyside

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index f23d44fd6..f2a32a958 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -15,13 +15,14 @@ sub printheader ($) {
 	if ($config{sslcookie}) {
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1, -secure => 1));
-	} else {
+	}
+	else {
 		print $session->header(-charset => 'utf-8',
 			-cookie => $session->cookie(-httponly => 1));
 	}
 }
 
-sub showform ($$$$;@) {
+sub prepform {
 	my $form=shift;
 	my $buttons=shift;
 	my $session=shift;
@@ -34,13 +35,24 @@ sub showform ($$$$;@) {
 		});
 	}
 
+	return $form;
+}
+
+sub showform ($$$$;@) {
+	my $form=prepform(@_);
+	shift;
+	my $buttons=shift;
+	my $session=shift;
+	my $cgi=shift;
+
 	printheader($session);
 	print misctemplate($form->title, $form->render(submit => $buttons), @_);
 }
 
 sub redirect ($$) {
 	my $q=shift;
-	my $url=shift;
+	eval q{use URI};
+	my $url=URI->new(shift);
 	if (! $config{w3mmode}) {
 		print $q->redirect($url);
 	}
@@ -51,7 +63,7 @@ sub redirect ($$) {
 }
 
 sub decode_cgi_utf8 ($) {
-	# decode_form_utf8 method is needed for 5.10
+	# decode_form_utf8 method is needed for 5.01
 	if ($] < 5.01) {
 		my $cgi = shift;
 		foreach my $f ($cgi->param) {
@@ -64,8 +76,9 @@ sub decode_form_utf8 ($) {
 	if ($] >= 5.01) {
 		my $form = shift;
 		foreach my $f ($form->field) {
+			my @value=map { decode_utf8($_) } $form->field($f);
 			$form->field(name  => $f,
-			             value => decode_utf8($form->field($f)),
+			             value => \@value,
 		                     force => 1,
 			);
 		}
@@ -87,9 +100,10 @@ sub needsignin ($$) {
 	}
 }
 
-sub cgi_signin ($$) {
+sub cgi_signin ($$;$) {
 	my $q=shift;
 	my $session=shift;
+	my $returnhtml=shift;
 
 	decode_cgi_utf8($q);
 	eval q{use CGI::FormBuilder};
@@ -105,13 +119,10 @@ sub cgi_signin ($$) {
 		action => $config{cgiurl},
 		header => 0,
 		template => {type => 'div'},
-		stylesheet => baseurl()."style.css",
+		stylesheet => 1,
 	);
 	my $buttons=["Login"];
 	
-	if ($q->param("do") ne "signin" && !$form->submitted) {
-		$form->text(gettext("You need to log in first."));
-	}
 	$form->field(name => "do", type => "hidden", value => "signin",
 		force => 1);
 	
@@ -126,6 +137,11 @@ sub cgi_signin ($$) {
 		$form->validate;
 	}
 
+	if ($returnhtml) {
+		$form=prepform($form, $buttons, $session, $q);
+		return $form->render(submit => $buttons);
+	}
+
 	showform($form, $buttons, $session, $q);
 }
 
@@ -142,7 +158,12 @@ sub cgi_postsignin ($$) {
 		exit;
 	}
 	else {
-		error(gettext("login failed, perhaps you need to turn on cookies?"));
+		if ($config{sslcookie} && ! $q->https()) {
+			error(gettext("probable misconfiguration: sslcookie is set, but you are attempting to login via http, not https"));
+		}
+		else {
+			error(gettext("login failed, perhaps you need to turn on cookies?"));
+		}
 	}
 }
 
@@ -179,7 +200,7 @@ sub cgi_prefs ($$) {
 		params => $q,
 		action => $config{cgiurl},
 		template => {type => 'div'},
-		stylesheet => baseurl()."style.css",
+		stylesheet => 1,
 		fieldsets => [
 			[login => gettext("Login")],
 			[preferences => gettext("Preferences")],
@@ -226,23 +247,57 @@ sub cgi_prefs ($$) {
 		$form->text(gettext("Preferences saved."));
 	}
 	
-	showform($form, $buttons, $session, $q);
+	showform($form, $buttons, $session, $q,
+		prefsurl => "", # avoid showing the preferences link
+	);
+}
+
+sub cgi_custom_failure ($$$) {
+	my $q=shift;
+	my $httpstatus=shift;
+	my $message=shift;
+
+	print $q->header(
+		-status => $httpstatus,
+		-charset => 'utf-8',
+	);
+	print $message;
+
+	# Internet Explod^Hrer won't show custom 404 responses
+	# unless they're >= 512 bytes
+	print ' ' x 512;
+
+	exit;
 }
 
 sub check_banned ($$) {
 	my $q=shift;
 	my $session=shift;
 
+	my $banned=0;
 	my $name=$session->param("name");
-	if (defined $name) {
-		if (grep { $name eq $_ } @{$config{banned_users}}) {
-			print $q->header(-status => "403 Forbidden");
-			$session->delete();
-			print gettext("You are banned.");
-			cgi_savesession($session);
-			exit;
+	if (defined $name && 
+	    grep { $name eq $_ } @{$config{banned_users}}) {
+		$banned=1;
+	}
+
+	foreach my $b (@{$config{banned_users}}) {
+		if (pagespec_match("", $b,
+			ip => $session->remote_addr(),
+			name => defined $name ? $name : "",
+		)) {
+			$banned=1;
+			last;
 		}
 	}
+
+	if ($banned) {
+		$session->delete();
+		cgi_savesession($session);
+		cgi_custom_failure(
+			$q, "403 Forbidden",
+			gettext("You are banned."));
+	}
 }
 
 sub cgi_getsession ($) {
@@ -291,47 +346,6 @@ sub cgi_savesession ($) {
 	umask($oldmask);
 }
 
-# cgi_goto(CGI, [page])
-# Redirect to a specified page, or display "not found". If not specified,
-# the page param from the CGI object is used.
-sub cgi_goto ($;$) {
-	my $q = shift;
-	my $page = shift;
-
-	if (!defined $page) {
-		$page = decode_utf8($q->param("page"));
-
-		if (!defined $page) {
-			error("missing page parameter");
-		}
-	}
-
-	loadindex();
-
-	# If the page is internal (like a comment), see if it has a
-	# permalink. Comments do.
-	if (isinternal($page) &&
-	    defined $pagestate{$page}{meta}{permalink}) {
-		redirect($q, $pagestate{$page}{meta}{permalink});
-	}
-
-	my $link = bestlink("", $page);
-
-	if (! length $link) {
-		print "Content-type: text/html\n\n";
-		print misctemplate(gettext("missing page"),
-			"<p>".
-			sprintf(gettext("The page %s does not exist."),
-				htmllink("", "", $page)).
-			"</p>");
-	}
-	else {
-		redirect($q, urlto($link, undef, 1));
-	}
-
-	exit;
-}
-
 sub cgi (;$$) {
 	my $q=shift;
 	my $session=shift;
@@ -359,13 +373,6 @@ sub cgi (;$$) {
 		}
 	}
 
-	# goto is the preferred name for this; recentchanges_link and
-	# commenter are for compatibility with any saved URLs
-	if ($do eq 'goto' || $do eq 'recentchanges_link' ||
-	    $do eq 'commenter') {
-		cgi_goto($q);
-	}
-
 	# Need to lock the wiki before getting a session.
 	lockwiki();
 	loadindex();