From b48090c23a79b6acb90c9c61048dc3bce15dddbc Mon Sep 17 00:00:00 2001 From: igosad <65003317+igosad@users.noreply.github.com> Date: Wed, 7 Apr 2021 15:37:04 +0100 Subject: [PATCH 1/4] Add public instance: search.whoogle.tech (#269) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 83f11bf..f05f773 100644 --- a/README.md +++ b/README.md @@ -363,7 +363,7 @@ A lot of the app currently piggybacks on Google's existing support for fetching - [https://whoogle.kavin.rocks](https://whoogle.kavin.rocks) or [http://whoogledq5f5wly5p4i2ohnvjwlihnlg4oajjum2oeddfwqdwupbuhqd.onion](http://whoogledq5f5wly5p4i2ohnvjwlihnlg4oajjum2oeddfwqdwupbuhqd.onion) - [https://search.garudalinux.org](https://search.garudalinux.org) - [https://whooglesearch.net/](https://whooglesearch.net/) - +- [https://search.whoogle.tech/](https://search.whoogle.tech/) ## Screenshots #### Desktop ![Whoogle Desktop](docs/screenshot_desktop.jpg) From 8a6e0709b8d3126a93707f22a7839fd748ca24a0 Mon Sep 17 00:00:00 2001 From: igosad <65003317+igosad@users.noreply.github.com> Date: Wed, 7 Apr 2021 17:21:39 +0100 Subject: [PATCH 2/4] Allow replit to auto detect dependencies (#266) --- .replit | 2 +- README.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.replit b/.replit index 909eee8..db3106f 100644 --- a/.replit +++ b/.replit @@ -1,2 +1,2 @@ language = "python3" -run = "pip install -r requirements.txt && ./run" +run = "./run" diff --git a/README.md b/README.md index f05f773..0f67982 100644 --- a/README.md +++ b/README.md @@ -68,6 +68,8 @@ Provides: ### B) [Repl.it](https://repl.it) [![Run on Repl.it](https://repl.it/badge/github/benbusby/whoogle-search)](https://repl.it/github/benbusby/whoogle-search) +*Note: Requires a (free) Replit account* + Provides: - Free deployment of app - Free HTTPS url (https://\.\\.repl\.co) From 0baba58896a006dfe7e04f25ee2e5fdf82675acf Mon Sep 17 00:00:00 2001 From: Ben Busby Date: Wed, 7 Apr 2021 12:39:12 -0400 Subject: [PATCH 3/4] Reduce docker healthcheck interval from 5m to 30s See #270 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index f2aa2a8..50bbf87 100644 --- a/Dockerfile +++ b/Dockerfile @@ -67,7 +67,7 @@ COPY whoogle.env . EXPOSE $EXPOSE_PORT -HEALTHCHECK --interval=5m --timeout=5s \ +HEALTHCHECK --interval=30s --timeout=5s \ CMD wget --no-verbose --tries=1 http://localhost:${EXPOSE_PORT}/ || exit 1 CMD misc/tor/start-tor.sh & ./run From a321d55f1368f960403649945ea1c53fa20b6abc Mon Sep 17 00:00:00 2001 From: Ben Busby Date: Thu, 8 Apr 2021 09:43:41 -0400 Subject: [PATCH 4/4] Hotfix: Send generic "Mozilla" in user agent Randomizing the "Mozilla" portion of the user agent changed the character encoding to GB2312. Setting it to plain "Mozilla" enforces UTF-8 encoding. Bump to version 0.4.1 for release of bug fix Fixes #267 --- app/__init__.py | 2 +- app/request.py | 5 ++--- setup.py | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/__init__.py b/app/__init__.py index 67e6b76..f2119f4 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -21,7 +21,7 @@ app.default_key = generate_user_key() app.no_cookie_ips = [] app.config['SECRET_KEY'] = os.urandom(32) app.config['SESSION_TYPE'] = 'filesystem' -app.config['VERSION_NUMBER'] = '0.4.0' +app.config['VERSION_NUMBER'] = '0.4.1' app.config['APP_ROOT'] = os.getenv( 'APP_ROOT', os.path.dirname(os.path.abspath(__file__))) diff --git a/app/request.py b/app/request.py index 4cd9fcf..b4c67dd 100644 --- a/app/request.py +++ b/app/request.py @@ -49,14 +49,13 @@ def send_tor_signal(signal: Signal) -> bool: def gen_user_agent(is_mobile) -> str: - mozilla = random.choice(['Moo', 'Woah', 'Bro', 'Slow']) + 'zilla' firefox = random.choice(['Choir', 'Squier', 'Higher', 'Wire']) + 'fox' linux = random.choice(['Win', 'Sin', 'Gin', 'Fin', 'Kin']) + 'ux' if is_mobile: - return MOBILE_UA.format(mozilla, firefox) + return MOBILE_UA.format("Mozilla", firefox) - return DESKTOP_UA.format(mozilla, linux, firefox) + return DESKTOP_UA.format("Mozilla", linux, firefox) def gen_query(query, args, config, near_city=None) -> str: diff --git a/setup.py b/setup.py index 2bd2d4a..8ef0933 100644 --- a/setup.py +++ b/setup.py @@ -8,7 +8,7 @@ setuptools.setup( author='Ben Busby', author_email='benbusby@protonmail.com', name='whoogle-search', - version='0.4.0', + version='0.4.1', include_package_data=True, install_requires=requirements, description='Self-hosted, ad-free, privacy-respecting metasearch engine',