mirror of
https://github.com/parchlinuxB/Gitee.git
synced 2025-02-23 02:15:43 -05:00
edfbf1e118
Typification of SearXNG
=======================
This patch introduces the typing of the results. The why and how is described
in the documentation, please generate the documentation ..
$ make docs.clean docs.live
and read the following articles in the "Developer documentation":
- result types --> http://0.0.0.0:8000/dev/result_types/index.html
The result types are available from the `searx.result_types` module. The
following have been implemented so far:
- base result type: `searx.result_type.Result`
--> http://0.0.0.0:8000/dev/result_types/base_result.html
- answer results
--> http://0.0.0.0:8000/dev/result_types/answer.html
including the type for translations (inspired by #3925). For all other
types (which still need to be set up in subsequent PRs), template documentation
has been created for the transition period.
Doc of the fields used in Templates
===================================
The template documentation is the basis for the typing and is the first complete
documentation of the results (needed for engine development). It is the
"working paper" (the plan) with which further typifications can be implemented
in subsequent PRs.
- https://github.com/searxng/searxng/issues/357
Answer Templates
================
With the new (sub) types for `Answer`, the templates for the answers have also
been revised, `Translation` are now displayed with collapsible entries (inspired
by #3925).
!en-de dog
Plugins & Answerer
==================
The implementation for `Plugin` and `Answer` has been revised, see
documentation:
- Plugin: http://0.0.0.0:8000/dev/plugins/index.html
- Answerer: http://0.0.0.0:8000/dev/answerers/index.html
With `AnswerStorage` and `AnswerStorage` to manage those items (in follow up
PRs, `ArticleStorage`, `InfoStorage` and .. will be implemented)
Autocomplete
============
The autocompletion had a bug where the results from `Answer` had not been shown
in the past. To test activate autocompletion and try search terms for which we
have answerers
- statistics: type `min 1 2 3` .. in the completion list you should find an
entry like `[de] min(1, 2, 3) = 1`
- random: type `random uuid` .. in the completion list, the first item is a
random UUID
Extended Types
==============
SearXNG extends e.g. the request and response types of flask and httpx, a module
has been set up for type extensions:
- Extended Types
--> http://0.0.0.0:8000/dev/extended_types.html
Unit-Tests
==========
The unit tests have been completely revised. In the previous implementation,
the runtime (the global variables such as `searx.settings`) was not initialized
before each test, so the runtime environment with which a test ran was always
determined by the tests that ran before it. This was also the reason why we
sometimes had to observe non-deterministic errors in the tests in the past:
- https://github.com/searxng/searxng/issues/2988 is one example for the Runtime
issues, with non-deterministic behavior ..
- https://github.com/searxng/searxng/pull/3650
- https://github.com/searxng/searxng/pull/3654
- https://github.com/searxng/searxng/pull/3642#issuecomment-2226884469
- https://github.com/searxng/searxng/pull/3746#issuecomment-2300965005
Why msgspec.Struct
==================
We have already discussed typing based on e.g. `TypeDict` or `dataclass` in the past:
- https://github.com/searxng/searxng/pull/1562/files
- https://gist.github.com/dalf/972eb05e7a9bee161487132a7de244d2
- https://github.com/searxng/searxng/pull/1412/files
- https://github.com/searxng/searxng/pull/1356
In my opinion, TypeDict is unsuitable because the objects are still dictionaries
and not instances of classes / the `dataclass` are classes but ...
The `msgspec.Struct` combine the advantages of typing, runtime behaviour and
also offer the option of (fast) serializing (incl. type check) the objects.
Currently not possible but conceivable with `msgspec`: Outsourcing the engines
into separate processes, what possibilities this opens up in the future is left
to the imagination!
Internally, we have already defined that it is desirable to decouple the
development of the engines from the development of the SearXNG core / The
serialization of the `Result` objects is a prerequisite for this.
HINT: The threads listed above were the template for this PR, even though the
implementation here is based on msgspec. They should also be an inspiration for
the following PRs of typification, as the models and implementations can provide
a good direction.
Why just one commit?
====================
I tried to create several (thematically separated) commits, but gave up at some
point ... there are too many things to tackle at once / The comprehensibility of
the commits would not be improved by a thematic separation. On the contrary, we
would have to make multiple changes at the same places and the goal of a change
would be vaguely recognizable in the fog of the commits.
Signed-off-by: Markus Heiser <markus.heiser@darmarit.de>
88 lines
2.5 KiB
Python
88 lines
2.5 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
"""A plugin to check if the ip address of the request is a Tor exit-node if the
|
|
user searches for ``tor-check``. It fetches the tor exit node list from
|
|
:py:obj:`url_exit_list` and parses all the IPs into a list, then checks if the
|
|
user's IP address is in it.
|
|
|
|
Enable in ``settings.yml``:
|
|
|
|
.. code:: yaml
|
|
|
|
enabled_plugins:
|
|
..
|
|
- 'Tor check plugin'
|
|
|
|
"""
|
|
|
|
from __future__ import annotations
|
|
|
|
import re
|
|
from flask_babel import gettext
|
|
from httpx import HTTPError
|
|
|
|
from searx.network import get
|
|
from searx.result_types import Answer
|
|
|
|
|
|
default_on = False
|
|
|
|
name = gettext("Tor check plugin")
|
|
'''Translated name of the plugin'''
|
|
|
|
description = gettext(
|
|
"This plugin checks if the address of the request is a Tor exit-node, and"
|
|
" informs the user if it is; like check.torproject.org, but from SearXNG."
|
|
)
|
|
'''Translated description of the plugin.'''
|
|
|
|
preference_section = 'query'
|
|
'''The preference section where the plugin is shown.'''
|
|
|
|
query_keywords = ['tor-check']
|
|
'''Query keywords shown in the preferences.'''
|
|
|
|
query_examples = ''
|
|
'''Query examples shown in the preferences.'''
|
|
|
|
# Regex for exit node addresses in the list.
|
|
reg = re.compile(r"(?<=ExitAddress )\S+")
|
|
|
|
url_exit_list = "https://check.torproject.org/exit-addresses"
|
|
"""URL to load Tor exit list from."""
|
|
|
|
|
|
def post_search(request, search) -> list[Answer]:
|
|
results = []
|
|
|
|
if search.search_query.pageno > 1:
|
|
return results
|
|
|
|
if search.search_query.query.lower() == "tor-check":
|
|
|
|
# Request the list of tor exit nodes.
|
|
try:
|
|
resp = get(url_exit_list)
|
|
node_list = re.findall(reg, resp.text) # type: ignore
|
|
|
|
except HTTPError:
|
|
# No answer, return error
|
|
msg = gettext("Could not download the list of Tor exit-nodes from")
|
|
Answer(results=results, answer=f"{msg} {url_exit_list}")
|
|
return results
|
|
|
|
x_forwarded_for = request.headers.getlist("X-Forwarded-For")
|
|
|
|
if x_forwarded_for:
|
|
ip_address = x_forwarded_for[0]
|
|
else:
|
|
ip_address = request.remote_addr
|
|
|
|
if ip_address in node_list:
|
|
msg = gettext("You are using Tor and it looks like you have the external IP address")
|
|
Answer(results=results, answer=f"{msg} {ip_address}")
|
|
|
|
else:
|
|
msg = gettext("You are not using Tor and you have the external IP address")
|
|
Answer(results=results, answer=f"{msg} {ip_address}")
|
|
|
|
return results
|