friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Avoid warnings

pull/849/head
Michael Vogel 2019-05-03 12:25:13 +02:00
parent e6164536e8
commit 08c890d651
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
blockbot/blockbot.php
View File

@ -27,6 +27,10 @@ function blockbot_uninstall() {
function blockbot_init_1(App $a) { function blockbot_init_1(App $a) {
$crawlerDetect = new CrawlerDetect(); $crawlerDetect = new CrawlerDetect();
if (empty($_SERVER['HTTP_USER_AGENT'])) {
return;
}
$logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']]; $logdata = ['agent' => $_SERVER['HTTP_USER_AGENT'], 'uri' => $_SERVER['REQUEST_URI']];
if (!$crawlerDetect->isCrawler()) { if (!$crawlerDetect->isCrawler()) {
@ -39,7 +43,7 @@ function blockbot_init_1(App $a) {
'curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/', 'curl', 'zgrab', 'Go-http-client', 'curb', 'github.com', 'reqwest', 'Feedly/',
'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/', 'Python-urllib/', 'Liferea/', 'aiohttp/', 'WordPress.com Reader', 'hackney/',
'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests', 'Faraday v', 'okhttp', 'UniversalFeedParser', 'PixelFedBot', 'python-requests',
'WordPress/', 'http.rb/']; 'WordPress/', 'http.rb/', 'Apache-HttpClient/', 'WordPress.com;'];
foreach ($agents as $agent) { foreach ($agents as $agent) {
if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) { if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
@ -58,10 +62,10 @@ function blockbot_init_1(App $a) {
foreach ($agents as $agent) { foreach ($agents as $agent) {
if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) { if (stristr($_SERVER['HTTP_USER_AGENT'], $agent)) {
System::httpExit(403, 'Bots are not allowed'); System::httpExit(403, ['title' => 'Bots are not allowed']);
} }
} }
logger::info('Blocked bot', $logdata); logger::info('Blocked bot', $logdata);
System::httpExit(403, 'Bots are not allowed'); System::httpExit(403, ['title' => 'Bots are not allowed']);
} }