diff options
author | ArthurHoaro <arthur@hoa.ro> | 2020-10-20 11:47:07 +0200 |
---|---|---|
committer | ArthurHoaro <arthur@hoa.ro> | 2020-10-20 11:47:07 +0200 |
commit | b38a1b0209f546d4824a0db81a34c4e30fcdebaf (patch) | |
tree | 0f812cd69bfc0ba654ce0d4b832850b41cc658fa /index.php | |
parent | ca5e98da4867f720dc863dac55cd1fa2360068e7 (diff) | |
download | Shaarli-b38a1b0209f546d4824a0db81a34c4e30fcdebaf.tar.gz Shaarli-b38a1b0209f546d4824a0db81a34c4e30fcdebaf.tar.zst Shaarli-b38a1b0209f546d4824a0db81a34c4e30fcdebaf.zip |
Use PSR-3 logger for login attempts
Fixes #1122
Diffstat (limited to 'index.php')
-rw-r--r-- | index.php | 19 |
1 files changed, 17 insertions, 2 deletions
@@ -25,9 +25,12 @@ require_once 'application/Utils.php'; | |||
25 | 25 | ||
26 | require_once __DIR__ . '/init.php'; | 26 | require_once __DIR__ . '/init.php'; |
27 | 27 | ||
28 | use Katzgrau\KLogger\Logger; | ||
29 | use Psr\Log\LogLevel; | ||
28 | use Shaarli\Config\ConfigManager; | 30 | use Shaarli\Config\ConfigManager; |
29 | use Shaarli\Container\ContainerBuilder; | 31 | use Shaarli\Container\ContainerBuilder; |
30 | use Shaarli\Languages; | 32 | use Shaarli\Languages; |
33 | use Shaarli\Security\BanManager; | ||
31 | use Shaarli\Security\CookieManager; | 34 | use Shaarli\Security\CookieManager; |
32 | use Shaarli\Security\LoginManager; | 35 | use Shaarli\Security\LoginManager; |
33 | use Shaarli\Security\SessionManager; | 36 | use Shaarli\Security\SessionManager; |
@@ -48,10 +51,22 @@ if ($conf->get('dev.debug', false)) { | |||
48 | }); | 51 | }); |
49 | } | 52 | } |
50 | 53 | ||
54 | $logger = new Logger( | ||
55 | dirname($conf->get('resource.log')), | ||
56 | !$conf->get('dev.debug') ? LogLevel::INFO : LogLevel::DEBUG, | ||
57 | ['filename' => basename($conf->get('resource.log'))] | ||
58 | ); | ||
51 | $sessionManager = new SessionManager($_SESSION, $conf, session_save_path()); | 59 | $sessionManager = new SessionManager($_SESSION, $conf, session_save_path()); |
52 | $sessionManager->initialize(); | 60 | $sessionManager->initialize(); |
53 | $cookieManager = new CookieManager($_COOKIE); | 61 | $cookieManager = new CookieManager($_COOKIE); |
54 | $loginManager = new LoginManager($conf, $sessionManager, $cookieManager); | 62 | $banManager = new BanManager( |
63 | $conf->get('security.trusted_proxies', []), | ||
64 | $conf->get('security.ban_after'), | ||
65 | $conf->get('security.ban_duration'), | ||
66 | $conf->get('resource.ban_file', 'data/ipbans.php'), | ||
67 | $logger | ||
68 | ); | ||
69 | $loginManager = new LoginManager($conf, $sessionManager, $cookieManager, $banManager, $logger); | ||
55 | $loginManager->generateStaySignedInToken($_SERVER['REMOTE_ADDR']); | 70 | $loginManager->generateStaySignedInToken($_SERVER['REMOTE_ADDR']); |
56 | 71 | ||
57 | // Sniff browser language and set date format accordingly. | 72 | // Sniff browser language and set date format accordingly. |
@@ -71,7 +86,7 @@ date_default_timezone_set($conf->get('general.timezone', 'UTC')); | |||
71 | 86 | ||
72 | $loginManager->checkLoginState(client_ip_id($_SERVER)); | 87 | $loginManager->checkLoginState(client_ip_id($_SERVER)); |
73 | 88 | ||
74 | $containerBuilder = new ContainerBuilder($conf, $sessionManager, $cookieManager, $loginManager); | 89 | $containerBuilder = new ContainerBuilder($conf, $sessionManager, $cookieManager, $loginManager, $logger); |
75 | $container = $containerBuilder->build(); | 90 | $container = $containerBuilder->build(); |
76 | $app = new App($container); | 91 | $app = new App($container); |
77 | 92 | ||