summaryrefslogtreecommitdiff
path: root/searx/botdetection/http_user_agent.py
diff options
context:
space:
mode:
authorMarkus Heiser <markus.heiser@darmarit.de>2023-06-01 15:41:48 +0200
committerMarkus Heiser <markus.heiser@darmarit.de>2023-06-01 15:51:14 +0200
commit281e36f4b7848374535d5e953050ae73423191ca (patch)
treef7bda906459c8e796ec688a0007191f3c3609d63 /searx/botdetection/http_user_agent.py
parent38431d2e142b7da6a9b48aad203f02a2eff7e6fd (diff)
[fix] limiter: replace real_ip by IPv4/v6 network
Closes: https://github.com/searxng/searxng/issues/2477 Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
Diffstat (limited to 'searx/botdetection/http_user_agent.py')
-rw-r--r--searx/botdetection/http_user_agent.py16
1 files changed, 13 insertions, 3 deletions
diff --git a/searx/botdetection/http_user_agent.py b/searx/botdetection/http_user_agent.py
index 70309e975..17025f68b 100644
--- a/searx/botdetection/http_user_agent.py
+++ b/searx/botdetection/http_user_agent.py
@@ -14,8 +14,13 @@ the User-Agent_ header is unset or matches the regular expression
"""
# pylint: disable=unused-argument
-from typing import Optional
+from __future__ import annotations
import re
+from ipaddress import (
+ IPv4Network,
+ IPv6Network,
+)
+
import flask
import werkzeug
@@ -50,8 +55,13 @@ def regexp_user_agent():
return _regexp
-def filter_request(request: flask.Request, cfg: config.Config) -> Optional[werkzeug.Response]:
+def filter_request(
+ network: IPv4Network | IPv6Network,
+ request: flask.Request,
+ cfg: config.Config,
+) -> werkzeug.Response | None:
+
user_agent = request.headers.get('User-Agent', 'unknown')
if regexp_user_agent().match(user_agent):
- return too_many_requests(request, f"bot detected, HTTP header User-Agent: {user_agent}")
+ return too_many_requests(network, f"bot detected, HTTP header User-Agent: {user_agent}")
return None