X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8e92468eae9ac0ab8161a0c71ff6c6a0a8aef07a..33f42db2ea0422551223c255d85d9f4e45ee404b:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 04f24b04f..52cafade0 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -143,7 +143,7 @@ sub cgi_postsignin ($$) {
 	}
 	else {
 		if ($config{sslcookie} && ! $q->https()) {
-			error(gettext("probable misconfiguration: sslcookie is set, but you are attepting to login via http, not 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?"));
@@ -252,16 +252,30 @@ 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}}) {
-			$session->delete();
-			cgi_savesession($session);
-			cgi_custom_failure(
-				$q->header(-status => "403 Forbidden"),
-				gettext("You are banned."));
+	if (defined $name && 
+	    grep { $name eq $_ } @{$config{banned_users}}) {
+		$banned=1;
+	}
+
+	foreach my $b (@{$config{banned_users}}) {
+		if (pagespec_match("", $b,
+			ip => $ENV{REMOTE_ADDR},
+			name => defined $name ? $name : "",
+		)) {
+			$banned=1;
+			last;
 		}
 	}
+
+	if ($banned) {
+		$session->delete();
+		cgi_savesession($session);
+		cgi_custom_failure(
+			$q->header(-status => "403 Forbidden"),
+			gettext("You are banned."));
+	}
 }
 
 sub cgi_getsession ($) {