mirror of
https://github.com/benbusby/whoogle-search.git
synced 2026-04-25 12:15:50 +03:00
[PR #137] [MERGED] Add tor and http/socks proxy support #794
Labels
No labels
Fixed (Pending PR Merge)
Stale
bug
enhancement
enhancement
good first issue
help wanted
keep-open
needs more info
pull-request
question
theme
unfortunate
No milestone
No project
No assignees
1 participant
Notifications
Due date
No due date set.
Dependencies
No dependencies set.
Reference
starred/whoogle-search#794
Loading…
Add table
Add a link
Reference in a new issue
No description provided.
Delete branch "%!s()"
Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?
📋 Pull Request Information
Original PR: https://github.com/benbusby/whoogle-search/pull/137
Author: @benbusby
Created: 10/25/2020
Status: ✅ Merged
Merged: 10/29/2020
Merged by: @benbusby
Base:
develop← Head:feature/proxy-support📝 Commits (9)
bd1d236Add tor and http/socks proxy supportd7442a1Refactor acquire_tor_conn -> acquire_tor_identityc51dad7Add check for Tor socket on init, improve Tor error handlingea88f4bChange send_tor_signal arg type, update function doc0f92d92Fix tor identity logic in Request.send0573484Update proxy init, change proxyloc var name66a98c6Add tor/proxy support for Docker builds, fix opensearch/init282e879Add missing "@" for socks proxy requestsff846b3Merge branch 'develop' into feature/proxy-support📊 Changes
13 files changed (+228 additions, -31 deletions)
View changed files
📝
Dockerfile(+17 -2)📝
README.md(+2 -1)📝
app/__init__.py(+8 -2)📝
app/models/config.py(+1 -0)📝
app/request.py(+118 -8)📝
app/routes.py(+37 -7)📝
app/static/js/controller.js(+1 -1)📝
app/templates/error.html(+1 -0)📝
app/templates/index.html(+10 -0)📝
app/templates/opensearch.xml(+2 -6)📝
app/utils/routing_utils.py(+8 -2)➕
rc/torrc(+8 -0)📝
requirements.txt(+15 -2)📄 Description
Allows users to enable/disable tor from the config menu, which will forward all requests through Tor. Since Tor is notoriously unstable for Google searches, this also includes a recursive process of reacquiring a new Tor profile and reattempting the search up to a maximum of 10 attempts. Typically the 2nd or 3rd identity works though.
Also adds support for setting environment variables for alternative proxy support. Setting the following variables will forward requests through the proxy:
<ip address>:<port>Additionally, with an active Tor connection, there's a banner that will display if the connection was validated by check.torproject.org, like this:
Closes #30
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.