Whitelisting enabled

2025-10-24 10:02:56 +02:00
parent cdc02cd4c3
commit 2c64126222
3 changed files with 387 additions and 5 deletions
--- a/action.php
+++ b/action.php
@@ -43,6 +43,7 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 	/* session information */
 	private $sessionId = null;
 	private $sessionType = '';
+	private $showCaptcha = '-';

 	/**
 	 * Inserts tracking code to the page header
@@ -118,8 +119,8 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 			$_SERVER['HTTP_REFERER'] ?? '', /* HTTP Referrer */
 			substr($conf['lang'],0,2), /* page language */
 			implode(',', array_unique(array_map( function($it) { return substr(trim($it),0,2); }, explode(',',trim($_SERVER['HTTP_ACCEPT_LANGUAGE'], " \t;,*"))))), /* accepted client languages */
-			$this->getCountryCode() /* GeoIP country code */
-		);
+			$this->getCountryCode(), /* GeoIP country code */
+			$this->showCaptcha /* show captcha? */		);

 		//* create the log line */
 		$filename = __DIR__ .'/logs/' . gmdate('Y-m-d') . '.srv.txt'; /* use GMT date for filename */
@@ -191,7 +192,10 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {

 		$useCaptcha = $this->getConf('useCaptcha');

-		if ($useCaptcha !== 'disabled' && $this->checkCaptchaCookie()) {
+		if ($useCaptcha !== 'disabled' && $this->checkCaptchaCookie() && !$this->captchaWhitelisted()) {
+
+			$this->showCaptcha = 'Y'; // captcha will be shown.
+
 			echo '<h1 class="sectionedit1">'; tpl_pagetitle(); echo "</h1>\n"; // always show the original page title
 			$event->preventDefault(); // don't show normal content
 			switch ($useCaptcha) {
@@ -203,6 +207,8 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 					break;
 			}
 			$this->insertCaptchaLoader(); // and load the captcha
+		} else {
+			$this->showCaptcha = 'N'; // do not show a captcha
 		}
 	}

@@ -220,6 +226,42 @@ class action_plugin_botmon extends DokuWiki_Action_Plugin {
 		return $cookieVal !== $expected;
 	}

+	// check if the visitor's IP is on a whitelist:
+	private function captchaWhitelisted() {
+
+		// normalise IP address:
+		$ip = inet_pton($_SERVER['REMOTE_ADDR']);
+
+		// find which file to open:
+		$prefixes = ['user', 'default'];
+		foreach ($prefixes as $pre) {
+			$filename = __DIR__ .'/config/' . $pre . '-whitelist.txt';
+			if (file_exists($filename)) {
+				break;
+			}
+		}
+
+		if (file_exists($filename)) {
+			$lines = file($filename, FILE_SKIP_EMPTY_LINES);
+			foreach ($lines as $line) {
+				if (trim($line) !== '' && !str_starts_with($line, '#')) {
+					$col = explode("\t", $line);
+					if (count($col) >= 2) {						
+						$from = inet_pton($col[0]);
+						$to = inet_pton($col[1]);
+
+						if ($ip >= $from && $ip <= $to) {
+							//echo "<p>Found my IP in range: " . $col[0] . " - " . $col[1] . "</p>";
+							return true;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
 	private function insertCaptchaLoader() {
 		echo '<script>' . NL;

--- a/config/default-whitelist.txt
+++ b/config/default-whitelist.txt
@@ -0,0 +1,340 @@
+# Bing Bot IP ranges - taken from https://www.bing.com/toolbox/bingbot.json
+157.55.39.0	157.55.39.255	24
+207.46.13.0	207.46.13.255	24
+40.77.167.0	40.77.167.255	24
+13.66.139.0	13.66.139.255	24
+13.66.144.0	13.66.144.255	24
+52.167.144.0	52.167.144.255	24
+13.67.10.16	13.67.10.31	28
+13.69.66.240	13.69.66.255	28
+13.71.172.224	13.71.172.239	28
+139.217.52.0	139.217.52.15	28
+191.233.204.224	191.233.204.239	28
+20.36.108.32	20.36.108.47	28
+20.43.120.16	20.43.120.31	28
+40.79.131.208	40.79.131.223	28
+40.79.186.176	40.79.186.191	28
+52.231.148.0	52.231.148.15	28
+20.79.107.240	20.79.107.255	28
+51.105.67.0	51.105.67.15	28
+20.125.163.80	20.125.163.95	28
+40.77.188.0	40.77.188.255	22
+65.55.210.0	65.55.210.255	24
+199.30.24.0	199.30.24.255	23
+40.77.202.0	40.77.202.255	24
+40.77.139.0	40.77.139.127	25
+20.74.197.0	20.74.197.15	28
+20.15.133.160	20.15.133.191	27
+40.77.177.0	40.77.177.255	24
+40.77.178.0	40.77.178.255	23
+
+# Google Bot IP ranges - taken from: https://developers.google.com/static/search/apis/ipranges/googlebot.json
+192.178.4.0	192.178.4.32	27
+192.178.4.128	192.178.4.159	27
+192.178.4.160	192.178.4.191	27
+192.178.4.192	192.178.4.223	27
+192.178.4.32	192.178.4.63	27
+192.178.4.64	192.178.4.95	27
+192.178.4.96	192.178.4.127	27
+192.178.5.0	192.178.5.32	27
+192.178.6.0	192.178.6.32	27
+192.178.6.128	192.178.6.159	27
+192.178.6.160	192.178.6.191	27
+192.178.6.192	192.178.6.223	27
+192.178.6.224	192.178.6.255	27
+192.178.6.32	192.178.6.63	27
+192.178.6.64	192.178.6.95	27
+192.178.6.96	192.178.6.127	27
+192.178.7.0	192.178.7.32	27
+192.178.7.128	192.178.7.159	27
+192.178.7.160	192.178.7.191	27
+192.178.7.192	192.178.7.223	27
+192.178.7.224	192.178.7.255	27
+192.178.7.32	192.178.7.63	27
+192.178.7.64	192.178.7.95	27
+192.178.7.96	192.178.7.127	27
+34.100.182.96	34.100.182.111	28
+34.101.50.144	34.101.50.159	28
+34.118.254.0	34.118.254.15	28
+34.118.66.0	34.118.66.15	28
+34.126.178.96	34.126.178.111	28
+34.146.150.144	34.146.150.159	28
+34.147.110.144	34.147.110.159	28
+34.151.74.144	34.151.74.159	28
+34.152.50.64	34.152.50.79	28
+34.154.114.144	34.154.114.159	28
+34.155.98.32	34.155.98.47	28
+34.165.18.176	34.165.18.191	28
+34.175.160.64	34.175.160.79	28
+34.176.130.16	34.176.130.31	28
+34.22.85.0	34.22.85.32	27
+34.64.82.64	34.64.82.79	28
+34.65.242.112	34.65.242.127	28
+34.80.50.80	34.80.50.95	28
+34.88.194.0	34.88.194.15	28
+34.89.10.80	34.89.10.95	28
+34.89.198.80	34.89.198.95	28
+34.96.162.48	34.96.162.63	28
+35.247.243.240	35.247.243.255	28
+66.249.64.0	66.249.64.32	27
+66.249.64.128	66.249.64.159	27
+66.249.64.160	66.249.64.191	27
+66.249.64.192	66.249.64.223	27
+66.249.64.224	66.249.64.255	27
+66.249.64.32	66.249.64.63	27
+66.249.64.64	66.249.64.95	27
+66.249.64.96	66.249.64.127	27
+66.249.65.0	66.249.65.32	27
+66.249.65.128	66.249.65.159	27
+66.249.65.160	66.249.65.191	27
+66.249.65.192	66.249.65.223	27
+66.249.65.224	66.249.65.255	27
+66.249.65.32	66.249.65.63	27
+66.249.65.64	66.249.65.95	27
+66.249.65.96	66.249.65.127	27
+66.249.66.0	66.249.66.32	27
+66.249.66.128	66.249.66.159	27
+66.249.66.160	66.249.66.191	27
+66.249.66.192	66.249.66.223	27
+66.249.66.224	66.249.66.255	27
+66.249.66.32	66.249.66.63	27
+66.249.66.64	66.249.66.95	27
+66.249.66.96	66.249.66.127	27
+66.249.67.0	66.249.67.32	27
+66.249.67.32	66.249.67.63	27
+66.249.68.0	66.249.68.32	27
+66.249.68.128	66.249.68.159	27
+66.249.68.160	66.249.68.191	27
+66.249.68.192	66.249.68.223	27
+66.249.68.32	66.249.68.63	27
+66.249.68.64	66.249.68.95	27
+66.249.68.96	66.249.68.127	27
+66.249.69.0	66.249.69.32	27
+66.249.69.128	66.249.69.159	27
+66.249.69.160	66.249.69.191	27
+66.249.69.192	66.249.69.223	27
+66.249.69.224	66.249.69.255	27
+66.249.69.32	66.249.69.63	27
+66.249.69.64	66.249.69.95	27
+66.249.69.96	66.249.69.127	27
+66.249.70.0	66.249.70.32	27
+66.249.70.128	66.249.70.159	27
+66.249.70.160	66.249.70.191	27
+66.249.70.192	66.249.70.223	27
+66.249.70.224	66.249.70.255	27
+66.249.70.32	66.249.70.63	27
+66.249.70.64	66.249.70.95	27
+66.249.70.96	66.249.70.127	27
+66.249.71.0	66.249.71.32	27
+66.249.71.128	66.249.71.159	27
+66.249.71.160	66.249.71.191	27
+66.249.71.192	66.249.71.223	27
+66.249.71.224	66.249.71.255	27
+66.249.71.32	66.249.71.63	27
+66.249.71.64	66.249.71.95	27
+66.249.71.96	66.249.71.127	27
+66.249.72.0	66.249.72.32	27
+66.249.72.128	66.249.72.159	27
+66.249.72.160	66.249.72.191	27
+66.249.72.192	66.249.72.223	27
+66.249.72.224	66.249.72.255	27
+66.249.72.32	66.249.72.63	27
+66.249.72.64	66.249.72.95	27
+66.249.73.0	66.249.73.32	27
+66.249.73.128	66.249.73.159	27
+66.249.73.160	66.249.73.191	27
+66.249.73.192	66.249.73.223	27
+66.249.73.224	66.249.73.255	27
+66.249.73.32	66.249.73.63	27
+66.249.73.64	66.249.73.95	27
+66.249.73.96	66.249.73.127	27
+66.249.74.0	66.249.74.32	27
+66.249.74.128	66.249.74.159	27
+66.249.74.160	66.249.74.191	27
+66.249.74.192	66.249.74.223	27
+66.249.74.224	66.249.74.255	27
+66.249.74.32	66.249.74.63	27
+66.249.74.64	66.249.74.95	27
+66.249.74.96	66.249.74.127	27
+66.249.75.0	66.249.75.32	27
+66.249.75.128	66.249.75.159	27
+66.249.75.160	66.249.75.191	27
+66.249.75.192	66.249.75.223	27
+66.249.75.224	66.249.75.255	27
+66.249.75.32	66.249.75.63	27
+66.249.75.64	66.249.75.95	27
+66.249.75.96	66.249.75.127	27
+66.249.76.0	66.249.76.32	27
+66.249.76.128	66.249.76.159	27
+66.249.76.160	66.249.76.191	27
+66.249.76.192	66.249.76.223	27
+66.249.76.224	66.249.76.255	27
+66.249.76.32	66.249.76.63	27
+66.249.76.64	66.249.76.95	27
+66.249.76.96	66.249.76.127	27
+66.249.77.0	66.249.77.32	27
+66.249.77.128	66.249.77.159	27
+66.249.77.160	66.249.77.191	27
+66.249.77.192	66.249.77.223	27
+66.249.77.224	66.249.77.255	27
+66.249.77.32	66.249.77.63	27
+66.249.77.64	66.249.77.95	27
+66.249.77.96	66.249.77.127	27
+66.249.78.0	66.249.78.32	27
+66.249.78.128	66.249.78.159	27
+66.249.78.160	66.249.78.191	27
+66.249.78.32	66.249.78.63	27
+66.249.78.64	66.249.78.95	27
+66.249.78.96	66.249.78.127	27
+66.249.79.0	66.249.79.32	27
+66.249.79.128	66.249.79.159	27
+66.249.79.160	66.249.79.191	27
+66.249.79.192	66.249.79.223	27
+66.249.79.224	66.249.79.255	27
+66.249.79.32	66.249.79.63	27
+66.249.79.64	66.249.79.95	27
+2001:4860:4801:0010::	2001:4860:4801:0010:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0012::	2001:4860:4801:0012:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0013::	2001:4860:4801:0013:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0014::	2001:4860:4801:0014:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0015::	2001:4860:4801:0015:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0016::	2001:4860:4801:0016:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0017::	2001:4860:4801:0017:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0018::	2001:4860:4801:0018:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0019::	2001:4860:4801:0019:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:001a::	2001:4860:4801:001a:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:001b::	2001:4860:4801:001b:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:001c::	2001:4860:4801:001c:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:001d::	2001:4860:4801:001d:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:001e::	2001:4860:4801:001e:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:001f::	2001:4860:4801:001f:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0020::	2001:4860:4801:0020:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0021::	2001:4860:4801:0021:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0022::	2001:4860:4801:0022:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0023::	2001:4860:4801:0023:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0024::	2001:4860:4801:0024:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0025::	2001:4860:4801:0025:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0026::	2001:4860:4801:0026:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0027::	2001:4860:4801:0027:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0028::	2001:4860:4801:0028:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0029::	2001:4860:4801:0029:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0002::	2001:4860:4801:0002:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:002a::	2001:4860:4801:002a:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:002b::	2001:4860:4801:002b:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:002c::	2001:4860:4801:002c:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:002d::	2001:4860:4801:002d:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:002e::	2001:4860:4801:002e:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:002f::	2001:4860:4801:002f:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0030::	2001:4860:4801:0030:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0031::	2001:4860:4801:0031:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0032::	2001:4860:4801:0032:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0033::	2001:4860:4801:0033:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0034::	2001:4860:4801:0034:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0035::	2001:4860:4801:0035:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0036::	2001:4860:4801:0036:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0037::	2001:4860:4801:0037:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0038::	2001:4860:4801:0038:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0039::	2001:4860:4801:0039:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:003a::	2001:4860:4801:003a:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:003b::	2001:4860:4801:003b:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:003c::	2001:4860:4801:003c:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:003d::	2001:4860:4801:003d:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:003e::	2001:4860:4801:003e:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:003f::	2001:4860:4801:003f:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0040::	2001:4860:4801:0040:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0041::	2001:4860:4801:0041:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0042::	2001:4860:4801:0042:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0044::	2001:4860:4801:0044:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0045::	2001:4860:4801:0045:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0046::	2001:4860:4801:0046:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0047::	2001:4860:4801:0047:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0048::	2001:4860:4801:0048:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0049::	2001:4860:4801:0049:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:004a::	2001:4860:4801:004a:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:004b::	2001:4860:4801:004b:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:004c::	2001:4860:4801:004c:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:004d::	2001:4860:4801:004d:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:004e::	2001:4860:4801:004e:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0050::	2001:4860:4801:0050:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0051::	2001:4860:4801:0051:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0052::	2001:4860:4801:0052:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0053::	2001:4860:4801:0053:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0054::	2001:4860:4801:0054:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0055::	2001:4860:4801:0055:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0056::	2001:4860:4801:0056:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0057::	2001:4860:4801:0057:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0058::	2001:4860:4801:0058:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0060::	2001:4860:4801:0060:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0061::	2001:4860:4801:0061:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0062::	2001:4860:4801:0062:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0063::	2001:4860:4801:0063:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0064::	2001:4860:4801:0064:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0065::	2001:4860:4801:0065:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0066::	2001:4860:4801:0066:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0067::	2001:4860:4801:0067:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0068::	2001:4860:4801:0068:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0069::	2001:4860:4801:0069:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:006a::	2001:4860:4801:006a:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:006b::	2001:4860:4801:006b:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:006c::	2001:4860:4801:006c:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:006d::	2001:4860:4801:006d:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:006e::	2001:4860:4801:006e:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:006f::	2001:4860:4801:006f:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0070::	2001:4860:4801:0070:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0071::	2001:4860:4801:0071:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0072::	2001:4860:4801:0072:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0073::	2001:4860:4801:0073:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0074::	2001:4860:4801:0074:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0075::	2001:4860:4801:0075:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0076::	2001:4860:4801:0076:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0077::	2001:4860:4801:0077:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0078::	2001:4860:4801:0078:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0079::	2001:4860:4801:0079:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:007a::	2001:4860:4801:007a:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:007b::	2001:4860:4801:007b:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:007c::	2001:4860:4801:007c:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:007d::	2001:4860:4801:007d:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0080::	2001:4860:4801:0080:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0081::	2001:4860:4801:0081:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0082::	2001:4860:4801:0082:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0083::	2001:4860:4801:0083:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0084::	2001:4860:4801:0084:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0085::	2001:4860:4801:0085:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0086::	2001:4860:4801:0086:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0087::	2001:4860:4801:0087:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0088::	2001:4860:4801:0088:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0090::	2001:4860:4801:0090:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0091::	2001:4860:4801:0091:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0092::	2001:4860:4801:0092:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0093::	2001:4860:4801:0093:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0094::	2001:4860:4801:0094:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0095::	2001:4860:4801:0095:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0096::	2001:4860:4801:0096:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:0097::	2001:4860:4801:0097:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a0::	2001:4860:4801:00a0:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a1::	2001:4860:4801:00a1:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a2::	2001:4860:4801:00a2:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a3::	2001:4860:4801:00a3:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a4::	2001:4860:4801:00a4:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a5::	2001:4860:4801:00a5:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a6::	2001:4860:4801:00a6:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a7::	2001:4860:4801:00a7:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a8::	2001:4860:4801:00a8:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00a9::	2001:4860:4801:00a9:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00aa::	2001:4860:4801:00aa:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00ab::	2001:4860:4801:00ab:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00ac::	2001:4860:4801:00ac:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00ad::	2001:4860:4801:00ad:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00ae::	2001:4860:4801:00ae:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00b0::	2001:4860:4801:00b0:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00b1::	2001:4860:4801:00b1:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00b2::	2001:4860:4801:00b2:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00b3::	2001:4860:4801:00b3:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00b4::	2001:4860:4801:00b4:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:00b5::	2001:4860:4801:00b5:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:000c::	2001:4860:4801:000c:FFFF:FFFF:FFFF:FFFF	64
+2001:4860:4801:000f::	2001:4860:4801:000f:FFFF:FFFF:FFFF:FFFF	64
+
+# PlagAware Bot - from previous visits’ IPs
+157.90.90.163	157.90.90.163	32
+2a01:4f8:2190:21a0::2	2a01:4f8:2190:21a0::2	64
--- a/style.less
+++ b/style.less
@@ -76,7 +76,7 @@ body.botmon_captcha {
 		&.checking {
 			input[type="checkbox"], span.confirm, span.loading { display: none;}
 			span.busy, span.checking { display: initial; }
-			label, input[type="checkbox"] { cursor: none; }
+			label, input[type="checkbox"] { cursor: wait; }
 		}
 		&.ready {
 			input[type="checkbox"], span.confirm { display: initial;}
@@ -86,7 +86,7 @@ body.botmon_captcha {
 		&.loading {
 			span.busy, span.loading { display: initial; }
 			input[type="checkbox"], span.confirm, span.checking { display: none;}
-			label { cursor: busy; }
+			label { cursor: wait; }
 		}
 	}
 }