From da28f5280b8f5cac79963e10c79ddc2a3e65f93a Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sun, 27 Oct 2024 07:08:28 +0100 Subject: [PATCH 1/2] [fix] limiter: don't hard code settings folder to /etc/searxng The location of the local settings depends on environment ``SEARXNG_SETTINGS_PATH`` and can be different from ``/etc/searxng``. Issue was reported on Matrix [1]. To get the location function ``searx.settings_loader.get_user_cfg_folder()`` should be used. [1] https://matrix.to/#/!vxScbLNEAmRvOraXBn:matrix.org/$_eLS0JpE9oVEWsiGJkqJnWcFWEeZClIMGDK6cWv_Q4g?via=matrix.org&via=tchncs.de&via=envs.net Signed-off-by: Markus Heiser --- searx/limiter.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/searx/limiter.py b/searx/limiter.py index 93070dac5d8..6c1c8894b69 100644 --- a/searx/limiter.py +++ b/searx/limiter.py @@ -128,9 +128,6 @@ LIMITER_CFG_SCHEMA = Path(__file__).parent / "limiter.toml" """Base configuration (schema) of the botdetection.""" -LIMITER_CFG = Path('/etc/searxng/limiter.toml') -"""Local Limiter configuration.""" - CFG_DEPRECATED = { # "dummy.old.foo": "config 'dummy.old.foo' exists only for tests. Don't use it in your real project config." } @@ -138,8 +135,12 @@ def get_cfg() -> config.Config: global CFG # pylint: disable=global-statement + if CFG is None: - CFG = config.Config.from_toml(LIMITER_CFG_SCHEMA, LIMITER_CFG, CFG_DEPRECATED) + from . import settings_loader # pylint: disable=import-outside-toplevel + + cfg_file = (settings_loader.get_user_cfg_folder() or Path("/etc/searxng")) / "limiter.toml" + CFG = config.Config.from_toml(LIMITER_CFG_SCHEMA, cfg_file, CFG_DEPRECATED) return CFG From b176323e89f87e52effc44ab0310fbf736efdc74 Mon Sep 17 00:00:00 2001 From: Markus Heiser Date: Sun, 27 Oct 2024 10:25:42 +0100 Subject: [PATCH 2/2] [fix] calculator: use locale from UI (not from selected language) Closes: https://github.com/searxng/searxng/issues/3956 Signed-off-by: Markus Heiser --- searx/plugins/calculator.py | 14 +++-- searx/webapp.py | 2 +- tests/unit/test_plugin_calculator.py | 90 +++++++++++++++++----------- 3 files changed, 64 insertions(+), 42 deletions(-) diff --git a/searx/plugins/calculator.py b/searx/plugins/calculator.py index 403b04d577c..e92ff9d912d 100644 --- a/searx/plugins/calculator.py +++ b/searx/plugins/calculator.py @@ -8,7 +8,8 @@ from multiprocessing import Process, Queue from typing import Callable -import babel.numbers +import flask +import babel from flask_babel import gettext from searx.plugins import logger @@ -100,14 +101,17 @@ def post_search(_request, search): # replace commonly used math operators with their proper Python operator query = query.replace("x", "*").replace(":", "/") + # use UI language + ui_locale = babel.Locale.parse(flask.request.preferences.get_value('locale'), sep='-') + # parse the number system in a localized way def _decimal(match: re.Match) -> str: val = match.string[match.start() : match.end()] - val = babel.numbers.parse_decimal(val, search.search_query.locale, numbering_system="latn") + val = babel.numbers.parse_decimal(val, ui_locale, numbering_system="latn") return str(val) - decimal = search.search_query.locale.number_symbols["latn"]["decimal"] - group = search.search_query.locale.number_symbols["latn"]["group"] + decimal = ui_locale.number_symbols["latn"]["decimal"] + group = ui_locale.number_symbols["latn"]["group"] query = re.sub(f"[0-9]+[{decimal}|{group}][0-9]+[{decimal}|{group}]?[0-9]?", _decimal, query) # only numbers and math operators are accepted @@ -121,6 +125,6 @@ def _decimal(match: re.Match) -> str: result = timeout_func(0.05, _eval_expr, query_py_formatted) if result is None or result == "": return True - result = babel.numbers.format_decimal(result, locale=search.search_query.locale) + result = babel.numbers.format_decimal(result, locale=ui_locale) search.result_container.answers['calculate'] = {'answer': f"{search.search_query.query} = {result}"} return True diff --git a/searx/webapp.py b/searx/webapp.py index 19c47779471..d2d486d20aa 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -517,7 +517,7 @@ def pre_request(): preferences.parse_dict({"language": language}) logger.debug('set language %s (from browser)', preferences.get_value("language")) - # locale is defined neither in settings nor in preferences + # UI locale is defined neither in settings nor in preferences # use browser headers if not preferences.get_value("locale"): locale = _get_browser_language(request, LOCALE_NAMES.keys()) diff --git a/tests/unit/test_plugin_calculator.py b/tests/unit/test_plugin_calculator.py index 062624f03b9..caca0dfe282 100644 --- a/tests/unit/test_plugin_calculator.py +++ b/tests/unit/test_plugin_calculator.py @@ -1,9 +1,10 @@ # SPDX-License-Identifier: AGPL-3.0-or-later # pylint: disable=missing-module-docstring -from mock import Mock +import flask from parameterized.parameterized import parameterized from searx import plugins +from searx import preferences from tests import SearxTestCase from .test_utils import random_string @@ -11,63 +12,78 @@ class PluginCalculator(SearxTestCase): # pylint: disable=missing-class-docstring + def setUp(self): + from searx import webapp # pylint: disable=import-outside-toplevel + + self.webapp = webapp self.store = plugins.PluginStore() plugin = plugins.load_and_initialize_plugin('searx.plugins.calculator', False, (None, {})) self.store.register(plugin) + self.preferences = preferences.Preferences(["simple"], ["general"], {}, self.store) + self.preferences.parse_dict({"locale": "en"}) def test_plugin_store_init(self): self.assertEqual(1, len(self.store.plugins)) def test_single_page_number_true(self): - request = Mock(remote_addr='127.0.0.1') - search = get_search_mock(query=random_string(10), pageno=2) - result = self.store.call(self.store.plugins, 'post_search', request, search) + with self.webapp.app.test_request_context(): + flask.request.preferences = self.preferences + search = get_search_mock(query=random_string(10), pageno=2) + result = self.store.call(self.store.plugins, 'post_search', flask.request, search) + self.assertTrue(result) self.assertNotIn('calculate', search.result_container.answers) def test_long_query_true(self): - request = Mock(remote_addr='127.0.0.1') - search = get_search_mock(query=random_string(101), pageno=1) - result = self.store.call(self.store.plugins, 'post_search', request, search) + with self.webapp.app.test_request_context(): + flask.request.preferences = self.preferences + search = get_search_mock(query=random_string(101), pageno=1) + result = self.store.call(self.store.plugins, 'post_search', flask.request, search) + self.assertTrue(result) self.assertNotIn('calculate', search.result_container.answers) def test_alpha_true(self): - request = Mock(remote_addr='127.0.0.1') - search = get_search_mock(query=random_string(10), pageno=1) - result = self.store.call(self.store.plugins, 'post_search', request, search) + with self.webapp.app.test_request_context(): + flask.request.preferences = self.preferences + search = get_search_mock(query=random_string(10), pageno=1) + result = self.store.call(self.store.plugins, 'post_search', flask.request, search) + self.assertTrue(result) self.assertNotIn('calculate', search.result_container.answers) @parameterized.expand( [ - ("1+1", "2", "en-US"), - ("1-1", "0", "en-US"), - ("1*1", "1", "en-US"), - ("1/1", "1", "en-US"), - ("1**1", "1", "en-US"), - ("1^1", "1", "en-US"), - ("1,000.0+1,000.0", "2,000", "en-US"), - ("1.0+1.0", "2", "en-US"), - ("1.0-1.0", "0", "en-US"), - ("1.0*1.0", "1", "en-US"), - ("1.0/1.0", "1", "en-US"), - ("1.0**1.0", "1", "en-US"), - ("1.0^1.0", "1", "en-US"), - ("1.000,0+1.000,0", "2.000", "de-DE"), - ("1,0+1,0", "2", "de-DE"), - ("1,0-1,0", "0", "de-DE"), - ("1,0*1,0", "1", "de-DE"), - ("1,0/1,0", "1", "de-DE"), - ("1,0**1,0", "1", "de-DE"), - ("1,0^1,0", "1", "de-DE"), + ("1+1", "2", "en"), + ("1-1", "0", "en"), + ("1*1", "1", "en"), + ("1/1", "1", "en"), + ("1**1", "1", "en"), + ("1^1", "1", "en"), + ("1,000.0+1,000.0", "2,000", "en"), + ("1.0+1.0", "2", "en"), + ("1.0-1.0", "0", "en"), + ("1.0*1.0", "1", "en"), + ("1.0/1.0", "1", "en"), + ("1.0**1.0", "1", "en"), + ("1.0^1.0", "1", "en"), + ("1.000,0+1.000,0", "2.000", "de"), + ("1,0+1,0", "2", "de"), + ("1,0-1,0", "0", "de"), + ("1,0*1,0", "1", "de"), + ("1,0/1,0", "1", "de"), + ("1,0**1,0", "1", "de"), + ("1,0^1,0", "1", "de"), ] ) def test_localized_query(self, operation: str, contains_result: str, lang: str): - request = Mock(remote_addr='127.0.0.1') - search = get_search_mock(query=operation, lang=lang, pageno=1) - result = self.store.call(self.store.plugins, 'post_search', request, search) + with self.webapp.app.test_request_context(): + self.preferences.parse_dict({"locale": lang}) + flask.request.preferences = self.preferences + search = get_search_mock(query=operation, lang=lang, pageno=1) + result = self.store.call(self.store.plugins, 'post_search', flask.request, search) + self.assertTrue(result) self.assertIn('calculate', search.result_container.answers) self.assertIn(contains_result, search.result_container.answers['calculate']['answer']) @@ -78,8 +94,10 @@ def test_localized_query(self, operation: str, contains_result: str, lang: str): ] ) def test_invalid_operations(self, operation): - request = Mock(remote_addr='127.0.0.1') - search = get_search_mock(query=operation, pageno=1) - result = self.store.call(self.store.plugins, 'post_search', request, search) + with self.webapp.app.test_request_context(): + flask.request.preferences = self.preferences + search = get_search_mock(query=operation, pageno=1) + result = self.store.call(self.store.plugins, 'post_search', flask.request, search) + self.assertTrue(result) self.assertNotIn('calculate', search.result_container.answers)