friendica/friendica-addons
7
2
Fork 13
Code Issues 3 Pull requests 2 Releases 16 Wiki Activity

Rearranged user-agent list, tested against log data

Browse source
This commit is contained in:
Michael Vogel 2019-04-27 17:17:11 +02:00
parent 77acddba49
commit 758a36dfc6
1 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
blockbot/blockbot.php
View file

@ -35,39 +35,34 @@ function blockbot_init_1(App $a) {
} }
// List of strings of reported false positives // List of strings of reported false positives
$agents = ['Mastodon', 'hackney', 'Faraday', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests', $agents = ['hackney/', 'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests',
'WordPress', 'http.rb']; 'WordPress/', 'http.rb/'];
foreach ($agents as $agent) { foreach ($agents as $agent) {
if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) { if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
// The agents had been reported to https://github.com/JayBizzle/Crawler-Detect/issues/ // The agents had been reported to https://github.com/JayBizzle/Crawler-Detect/issues/
logger::notice('Already reported wrong detection', $logdata); logger::notice('Reported false positive', $logdata);
return; return;
} }
} }
// List of strings of known "good" agents // List of false positives' strings of known "good" agents we haven't reported (yet)
$agents = ['diaspora-connection-tester', 'DiasporaFederation', 'Friendica', '(compatible; zot)', $agents = ['fediverse.network crawler', 'Active_Pods_CheckBot_3.0', 'Social-Relay/',
'Micro.blog', 'GangGo', 'python/federation', 'GNU social', 'winHttp', 'curl', 'zgrab', 'Go-http-client', 'curb'];
'Go-http-client', 'Mr.4x3 Powered', 'Test Certificate Info', 'WordPress.com', 'zgrab',
'curl/', 'StatusNet', 'OpenGraphReader/', 'Uptimebot/', 'python-opengraph-jaywink',
'fediverse.network crawler', 'Active_Pods_CheckBot_3.0', 'Social-Relay'];
foreach ($agents as $agent) { foreach ($agents as $agent) {
if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) { if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
// Report every false positive here: https://github.com/JayBizzle/Crawler-Detect/issues/ logger::notice('Unreported falsely detected agent', $logdata);
// After report move it into the array above
logger::notice('False positive', $logdata);
return; return;
} }
} }
// List of known crawlers. They are added here to avoid having them logged at the end of the function. // List of known crawlers. They are added here to avoid having them logged at the end of the function.
// This helps to detect false positives // This helps to detect false positives.
$agents = ['Mozilla/5.0 (compatible; SemrushBot/3~bl; +http://www.semrush.com/bot.html)', 'SEMrushBot', $agents = ['SEMrushBot', 's~feedly-nikon3', 'Qwantify/Bleriot/', 'ltx71', 'Sogou web spider/',
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/65.0.3325.181 Safari/537.36 AppEngine-Google; (+http://code.google.com/appengine; appid: s~feedly-nikon3)']; 'Diffbot/'];
foreach ($agents as $agent) { foreach ($agents as $agent) {
if ($_SERVER['HTTP_USER_AGENT'] == $agent) { if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
System::httpExit(403, 'Bots are not allowed'); System::httpExit(403, 'Bots are not allowed');
} }
} }