X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=index.php;h=1b10ee41c8299f196b510bde155d6c09e8bd045b;hb=820cae27cfcc94af552818f3f1e5342e00478f6c;hp=b6ee8ebc482b585e01bf858bc97ae90184b172c1;hpb=8f6e3d51ccb2df513aadeabafbc5bfffe38b8608;p=github%2Fshaarli%2FShaarli.git diff --git a/index.php b/index.php index b6ee8ebc..1b10ee41 100644 --- a/index.php +++ b/index.php @@ -25,9 +25,12 @@ require_once 'application/Utils.php'; require_once __DIR__ . '/init.php'; +use Katzgrau\KLogger\Logger; +use Psr\Log\LogLevel; use Shaarli\Config\ConfigManager; use Shaarli\Container\ContainerBuilder; use Shaarli\Languages; +use Shaarli\Security\BanManager; use Shaarli\Security\CookieManager; use Shaarli\Security\LoginManager; use Shaarli\Security\SessionManager; @@ -48,10 +51,22 @@ if ($conf->get('dev.debug', false)) { }); } +$logger = new Logger( + dirname($conf->get('resource.log')), + !$conf->get('dev.debug') ? LogLevel::INFO : LogLevel::DEBUG, + ['filename' => basename($conf->get('resource.log'))] +); $sessionManager = new SessionManager($_SESSION, $conf, session_save_path()); $sessionManager->initialize(); $cookieManager = new CookieManager($_COOKIE); -$loginManager = new LoginManager($conf, $sessionManager, $cookieManager); +$banManager = new BanManager( + $conf->get('security.trusted_proxies', []), + $conf->get('security.ban_after'), + $conf->get('security.ban_duration'), + $conf->get('resource.ban_file', 'data/ipbans.php'), + $logger +); +$loginManager = new LoginManager($conf, $sessionManager, $cookieManager, $banManager, $logger); $loginManager->generateStaySignedInToken($_SERVER['REMOTE_ADDR']); // Sniff browser language and set date format accordingly. @@ -71,7 +86,7 @@ date_default_timezone_set($conf->get('general.timezone', 'UTC')); $loginManager->checkLoginState(client_ip_id($_SERVER)); -$containerBuilder = new ContainerBuilder($conf, $sessionManager, $cookieManager, $loginManager); +$containerBuilder = new ContainerBuilder($conf, $sessionManager, $cookieManager, $loginManager, $logger); $container = $containerBuilder->build(); $app = new App($container);