Friendica/friendica-addons
1
1
Fork 1
mirror of https://git.friendi.ca/friendica/friendica-addons.git synced 2025-02-04 05:58:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Replace call for Logger with DI::logger() in blockbot addon

Browse source
This commit is contained in:
Art4 2025-01-24 11:34:33 +00:00
parent 4310c1355d
commit 41f280f0c7
1 changed files with 20 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
blockbot/blockbot.php
View file

@ -11,7 +11,6 @@
use Friendica\Core\Hook; use Friendica\Core\Hook;
use Friendica\DI; use Friendica\DI;
use Jaybizzle\CrawlerDetect\CrawlerDetect; use Jaybizzle\CrawlerDetect\CrawlerDetect;
use Friendica\Core\Logger;
use Friendica\Core\Renderer; use Friendica\Core\Renderer;
use Friendica\Core\System; use Friendica\Core\System;
use Friendica\Network\HTTPException\ForbiddenException; use Friendica\Network\HTTPException\ForbiddenException;
@ -70,7 +69,7 @@ function blockbot_init_1()
} }
if (empty($parts)) { if (empty($parts)) {
Logger::debug('Known frontend found - accept', $logdata); DI::logger()->debug('Known frontend found - accept', $logdata);
if ($isCrawler) { if ($isCrawler) {
blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']); blockbot_save('badly-parsed-agents', $_SERVER['HTTP_USER_AGENT']);
} }
@ -80,66 +79,66 @@ function blockbot_init_1()
blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']); blockbot_log_activitypub($_SERVER['REQUEST_URI'], $_SERVER['HTTP_USER_AGENT']);
if (blockbot_is_crawler($parts)) { if (blockbot_is_crawler($parts)) {
Logger::debug('Crawler found - reject', $logdata); DI::logger()->debug('Crawler found - reject', $logdata);
blockbot_reject(); blockbot_reject();
} }
if (blockbot_is_searchbot($parts)) { if (blockbot_is_searchbot($parts)) {
Logger::debug('Search bot found - reject', $logdata); DI::logger()->debug('Search bot found - reject', $logdata);
blockbot_reject(); blockbot_reject();
} }
if (blockbot_is_unwanted($parts)) { if (blockbot_is_unwanted($parts)) {
Logger::debug('Uncategorized unwanted agent found - reject', $logdata); DI::logger()->debug('Uncategorized unwanted agent found - reject', $logdata);
blockbot_reject(); blockbot_reject();
} }
if (blockbot_is_security_checker($parts)) { if (blockbot_is_security_checker($parts)) {
if (!DI::config()->get('blockbot', 'security_checker')) { if (!DI::config()->get('blockbot', 'security_checker')) {
Logger::debug('Security checker found - reject', $logdata); DI::logger()->debug('Security checker found - reject', $logdata);
blockbot_reject(); blockbot_reject();
} }
Logger::debug('Security checker found - accept', $logdata); DI::logger()->debug('Security checker found - accept', $logdata);
return; return;
} }
if (blockbot_is_social_media($parts)) { if (blockbot_is_social_media($parts)) {
Logger::debug('Social media service found - accept', $logdata); DI::logger()->debug('Social media service found - accept', $logdata);
return; return;
} }
if (blockbot_is_fediverse_client($parts)) { if (blockbot_is_fediverse_client($parts)) {
Logger::debug('Fediverse client found - accept', $logdata); DI::logger()->debug('Fediverse client found - accept', $logdata);
return; return;
} }
if (blockbot_is_feed_reader($parts)) { if (blockbot_is_feed_reader($parts)) {
Logger::debug('Feed reader found - accept', $logdata); DI::logger()->debug('Feed reader found - accept', $logdata);
return; return;
} }
if (blockbot_is_fediverse_tool($parts)) { if (blockbot_is_fediverse_tool($parts)) {
Logger::debug('Fediverse tool found - accept', $logdata); DI::logger()->debug('Fediverse tool found - accept', $logdata);
return; return;
} }
if (blockbot_is_service_agent($parts)) { if (blockbot_is_service_agent($parts)) {
Logger::debug('Service agent found - accept', $logdata); DI::logger()->debug('Service agent found - accept', $logdata);
return; return;
} }
if (blockbot_is_monitor($parts)) { if (blockbot_is_monitor($parts)) {
Logger::debug('Monitoring service found - accept', $logdata); DI::logger()->debug('Monitoring service found - accept', $logdata);
return; return;
} }
if (blockbot_is_validator($parts)) { if (blockbot_is_validator($parts)) {
Logger::debug('Validation service found - accept', $logdata); DI::logger()->debug('Validation service found - accept', $logdata);
return; return;
} }
if (blockbot_is_good_tool($parts)) { if (blockbot_is_good_tool($parts)) {
Logger::debug('Uncategorized helpful service found - accept', $logdata); DI::logger()->debug('Uncategorized helpful service found - accept', $logdata);
return; return;
} }
@ -147,10 +146,10 @@ function blockbot_init_1()
if (blockbot_is_http_library($parts)) { if (blockbot_is_http_library($parts)) {
blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata); blockbot_check_login_attempt($_SERVER['REQUEST_URI'], $logdata);
if (!DI::config()->get('blockbot', 'http_libraries')) { if (!DI::config()->get('blockbot', 'http_libraries')) {
Logger::debug('HTTP Library found - reject', $logdata); DI::logger()->debug('HTTP Library found - reject', $logdata);
blockbot_reject(); blockbot_reject();
} }
Logger::debug('HTTP Library found - accept', $logdata); DI::logger()->debug('HTTP Library found - accept', $logdata);
return; return;
} }
@ -161,12 +160,12 @@ function blockbot_init_1()
if (!$isCrawler) { if (!$isCrawler) {
blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']); blockbot_save('good-agents', $_SERVER['HTTP_USER_AGENT']);
Logger::debug('Non-bot user agent detected', $logdata); DI::logger()->debug('Non-bot user agent detected', $logdata);
return; return;
} }
blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']); blockbot_save('bad-agents', $_SERVER['HTTP_USER_AGENT']);
Logger::notice('Possible bot found - reject', $logdata); DI::logger()->notice('Possible bot found - reject', $logdata);
blockbot_reject(); blockbot_reject();
} }
@ -217,7 +216,7 @@ function blockbot_log_activitypub(string $url, string $agent)
function blockbot_check_login_attempt(string $url, array $logdata) function blockbot_check_login_attempt(string $url, array $logdata)
{ {
if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) { if (in_array(trim(parse_url($url, PHP_URL_PATH), '/'), ['login', 'lostpass', 'register'])) {
Logger::debug('Login attempt detected - reject', $logdata); DI::logger()->debug('Login attempt detected - reject', $logdata);
blockbot_reject(); blockbot_reject();
} }
} }