Merge branch 'development' into 'master'

Development

See merge request !1793

app/Http/Middleware/BrowserVerification.php

@@ -5,6 +5,7 @@ namespace App\Http\Middleware;
 use Closure;
 use Illuminate\Support\Facades\Redis;
 use Jenssegers\Agent\Agent;
+use Illuminate\Http\Request;
 use Cache;
 
 class BrowserVerification
@@ -61,7 +62,9 @@ class BrowserVerification
                 $request->request->add(["headerPrinted" => false, "jskey" => $mgv]);
                 return $next($request);
             } else {
-                return redirect("/");
+                # We are serving that request but log it for fail2ban
+                self::logBrowserverification($request);
+                return $next($request);
             }
         }
 
@@ -86,4 +89,27 @@ class BrowserVerification
                 ->with('url', $url)
                 ->render());
     }
+
+    public static function logBrowserverification(Request $request) {
+        $fail2banEnabled = config("metager.metager.fail2ban_enabled");
+        if(empty($fail2banEnabled) || !$fail2banEnabled || !env("fail2banurl", false) || !env("fail2banuser") || !env("fail2banpassword")){
+            return;
+        }
+
+        // Submit fetch job to worker
+        $mission = [
+                "resulthash" => "captcha",
+                "url" => env("fail2banurl") . "/browserverification/",
+                "useragent" => "Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:81.0) Gecko/20100101 Firefox/81.0",
+                "username" => env("fail2banuser"),
+                "password" => env("fail2banpassword"),
+                "headers" => [
+                    "ip" => $request->ip()
+                ],
+                "cacheDuration" => 0,
+                "name" => "Captcha",
+            ];
+        $mission = json_encode($mission);
+        Redis::rpush(\App\MetaGer::FETCHQUEUE_KEY, $mission);
+    }
 }

config/metager/metager.php

 <?php
 
 return [
-    "browserverification_enabled" => false,
+    "browserverification_enabled" => true,
     "browserverification_whitelist" => [
         "w3m\/",
     ],