X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/33f60260b233d0310ce6dd4304304a516595b906..5d44bf4b5c97220daec4066b7d3c758fc3f136c2:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 0224c2aac..2c5b4a84d 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,18 +58,10 @@ sub cgitemplate ($$$;@) {
 	
 	my $template=template("page.tmpl");
 
-	my $topurl = $config{url};
-	if (defined $cgi && ! $config{w3mmode} && ! $config{reverse_proxy}) {
-		$topurl = $cgi->url;
-	}
-
 	my $page="";
 	if (exists $params{page}) {
 		$page=delete $params{page};
 		$params{forcebaseurl}=urlto($page);
-		if (! $config{html5}) {
-			$params{forcebaseurl}=urlabs($params{forcebaseurl}, $topurl);
-		}
 	}
 	run_hooks(pagetemplate => sub {
 		shift->(
@@ -81,9 +73,6 @@ sub cgitemplate ($$$;@) {
 	templateactions($template, "");
 
 	my $baseurl = baseurl();
-	if (! $config{html5}) {
-		$baseurl = urlabs($baseurl, $topurl),
-	}
 
 	$template->param(
 		dynamic => 1,
@@ -102,7 +91,7 @@ sub redirect ($$) {
 	my $q=shift;
 	eval q{use URI};
 
-	my $topurl;
+	my $topurl = $config{cgiurl};
 	if (defined $q && ! $config{w3mmode} && ! $config{reverse_proxy}) {
 		$topurl = $q->url;
 	}
@@ -122,16 +111,15 @@ sub decode_cgi_utf8 ($) {
 	if ($] < 5.01) {
 		my $cgi = shift;
 		foreach my $f ($cgi->param) {
-			$cgi->param($f, map { decode_utf8 $_ } $cgi->param($f));
+			$cgi->param($f, map { decode_utf8 $_ }
+				@{$cgi->param_fetch($f)});
 		}
 	}
 }
 
 sub safe_decode_utf8 ($) {
     my $octets = shift;
-    # call decode_utf8 on >= 5.20 only if it's not already decoded,
-    # otherwise it balks, on < 5.20, always call it
-    if ($] < 5.02 || !Encode::is_utf8($octets)) {
+    if (!Encode::is_utf8($octets)) {
         return decode_utf8($octets);
     }
     else {
@@ -158,7 +146,7 @@ sub needsignin ($$) {
 	my $q=shift;
 	my $session=shift;
 
-	if (! defined $session->param("name") ||
+	if (! length $session->param("name") ||
 	    ! userinfo_get($session->param("name"), "regdate")) {
 		$session->param(postsignin => $q->query_string);
 		cgi_signin($q, $session);
@@ -229,7 +217,7 @@ sub cgi_postsignin ($$) {
 			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?"));
+			error(gettext("Login succeeded, but I don't remember why you were logging in, so you'll have to navigate back to whatever you were doing. (This should not normally happen. Perhaps you need to enable cookies?)"));
 		}
 	}
 }
@@ -306,8 +294,9 @@ sub cgi_prefs ($$) {
 		return;
 	}
 	elsif ($form->submitted eq 'Save Preferences' && $form->validate) {
-		if (defined $form->field('email')) {
-			userinfo_set($user_name, 'email', $form->field('email')) ||
+		my $email = $form->field('email');
+		if (defined $email) {
+			userinfo_set($user_name, 'email', $email) ||
 				error("failed to set email");
 		}
 
@@ -343,16 +332,19 @@ sub check_banned ($$) {
 
 	my $banned=0;
 	my $name=$session->param("name");
+	my $cloak=cloak($name) if defined $name;
 	if (defined $name && 
-	    grep { $name eq $_ } @{$config{banned_users}}) {
+	    grep { $name eq $_ || $cloak eq $_ } @{$config{banned_users}}) {
 		$banned=1;
 	}
 
 	foreach my $b (@{$config{banned_users}}) {
 		if (pagespec_match("", $b,
 			ip => $session->remote_addr(),
-			name => defined $name ? $name : "",
-		)) {
+			name => defined $name ? $name : "")
+		   || pagespec_match("", $b,
+		   	ip => cloak($session->remote_addr()),
+			name => defined $cloak ? $cloak : "")) {
 			$banned=1;
 			last;
 		}
@@ -399,7 +391,7 @@ sub checksessionexpiry ($$) {
 
 	if (defined $session->param("name")) {
 		my $sid=$q->param('sid');
-		if (! defined $sid || $sid ne $session->id) {
+		if (! defined $sid || $sid ne $session->id || ! length $session->param("name")) {
 			error(gettext("Your login session has expired."));
 		}
 	}
@@ -420,7 +412,9 @@ sub cgi (;$$) {
 
 	eval q{use CGI};
 	error($@) if $@;
+	no warnings "once";
 	$CGI::DISABLE_UPLOADS=$config{cgi_disable_uploads};
+	use warnings;
 
 	if (! $q) {
 		binmode(STDIN);
@@ -450,11 +444,11 @@ sub cgi (;$$) {
 	}
 	
 	# Auth hooks can sign a user in.
-	if ($do ne 'signin' && ! defined $session->param("name")) {
+	if ($do ne 'signin' && ! length $session->param("name")) {
 		run_hooks(auth => sub {
 			shift->($q, $session)
 		});
-		if (defined $session->param("name")) {
+		if (length $session->param("name")) {
 			# Make sure whatever user was authed is in the
 			# userinfo db.
 			if (! userinfo_get($session->param("name"), "regdate")) {
@@ -490,10 +484,14 @@ sub cgi (;$$) {
 sub cgierror ($) {
 	my $message=shift;
 
+	eval q{use HTML::Entities};
+	$message = encode_entities($message);
+
 	print "Content-type: text/html\n\n";
 	print cgitemplate(undef, gettext("Error"),
 		"<p class=\"error\">".gettext("Error").": $message</p>");
-	die $@;
+
+	die $message;
 }
 
 1