change regex for fail2ban

diff --git a/doc/tools.md b/doc/tools.md
index cb6aa1c3aa924ecf384aee6b4c91e2bb533d4103..8746e9c15021810e5db1f67eae97470a8b6b325f 100644 (file)
--- a/doc/tools.md
+++ b/doc/tools.md
@@ -56,7 +56,7 @@ In */etc/fail2ban/jail.local* create a section for Friendica:
 And create a filter definition in */etc/fail2ban/filter.d/friendica.conf*:
 
        [Definition]
-       failregex = ^.*Login\.php.*failed login attempt.*from IP <HOST>.*$
+       failregex = ^.*authenticate\: failed login attempt.*\"ip\"\:\"<HOST>\".*$
        ignoreregex =
 
 Additionally you have to define the number of failed logins before the ban should be activated.

diff --git a/src/Core/Logger.php b/src/Core/Logger.php
index c44ccc968f33ede8092d9fee49539cd23ba66850..0bf699575b2fbe9e0c6830b105f3122eaa8de6ad 100644 (file)
--- a/src/Core/Logger.php
+++ b/src/Core/Logger.php
@@ -323,21 +323,19 @@ class Logger extends BaseObject
      * @brief Logs the given message at the given log level
      *
      * @param string $msg
-     * @param int    $level
+     * @param string $level
         *
         * @throws \Exception
         * @deprecated since 2019.03 Use Logger::debug() Logger::info() , ... instead
      */
-    public static function log($msg, $level = 3)
+    public static function log($msg, $level = LogLevel::INFO)
     {
                if (!isset(self::$logger)) {
                        return;
                }
 
-               $loglevel = self::mapLegacyDebugLevel($level);
-
         $stamp1 = microtime(true);
-               self::$logger->log($loglevel, $msg);
+               self::$logger->log($level, $msg);
         self::getApp()->saveTimestamp($stamp1, "file");
     }
 

diff --git a/src/Module/Login.php b/src/Module/Login.php
index 516a05df565758085b606fb0a17ed006396b6358..d7daf288716a9f25d713f93fbff3d49d7e6c9492 100644 (file)
--- a/src/Module/Login.php
+++ b/src/Module/Login.php
@@ -148,7 +148,7 @@ class Login extends BaseModule
                                );
                        }
                } catch (Exception $e) {
-                       Logger::notice('authenticate: failed login attempt', ['username' => Strings::escapeTags($username), 'ip' => $_SERVER['REMOTE_ADDR']]);
+                       Logger::notice('authenticate: failed login attempt', ['action' => 'login', 'username' => Strings::escapeTags($username), 'ip' => $_SERVER['REMOTE_ADDR']]);
                        info('Login failed. Please check your credentials.' . EOL);
                        $a->internalRedirect();
                }