|
|
|
|
FROM python:3.11.0a5-alpine as builder
|
|
|
|
|
|
|
|
|
|
RUN apk --update add \
|
|
|
|
|
build-base \
|
|
|
|
|
libxml2-dev \
|
|
|
|
|
libxslt-dev \
|
|
|
|
|
openssl-dev \
|
|
|
|
|
libffi-dev
|
|
|
|
|
|
|
|
|
|
COPY requirements.txt .
|
|
|
|
|
|
|
|
|
|
RUN pip install --upgrade pip
|
|
|
|
|
RUN pip install --prefix /install --no-warn-script-location --no-cache-dir -r requirements.txt
|
|
|
|
|
|
|
|
|
|
FROM python:3.11.0a5-alpine
|
|
|
|
|
|
|
|
|
|
RUN apk add --update --no-cache tor curl openrc libstdc++
|
|
|
|
|
# git go //for obfs4proxy
|
|
|
|
|
# libcurl4-openssl-dev
|
|
|
|
|
|
|
|
|
|
RUN apk -U upgrade
|
|
|
|
|
|
|
|
|
|
# uncomment to build obfs4proxy
|
|
|
|
|
# RUN git clone https://gitlab.com/yawning/obfs4.git
|
|
|
|
|
# WORKDIR /obfs4
|
|
|
|
|
# RUN go build -o obfs4proxy/obfs4proxy ./obfs4proxy
|
|
|
|
|
# RUN cp ./obfs4proxy/obfs4proxy /usr/bin/obfs4proxy
|
|
|
|
|
|
|
|
|
|
ARG DOCKER_USER=whoogle
|
|
|
|
|
ARG DOCKER_USERID=927
|
|
|
|
|
ARG config_dir=/config
|
|
|
|
|
RUN mkdir -p $config_dir
|
|
|
|
|
RUN chmod a+w $config_dir
|
|
|
|
|
VOLUME $config_dir
|
|
|
|
|
|
|
|
|
|
ARG url_prefix=''
|
|
|
|
|
ARG username=''
|
|
|
|
|
ARG password=''
|
Add tor and http/socks proxy support (#137)
* Add tor and http/socks proxy support
Allows users to enable/disable tor from the config menu, which will
forward all requests through Tor.
Also adds support for setting environment variables for alternative
proxy support. Setting the following variables will forward requests
through the proxy:
- WHOOGLE_PROXY_USER (optional)
- WHOOGLE_PROXY_PASS (optional)
- WHOOGLE_PROXY_TYPE (required)
- Can be "http", "socks4", or "socks5"
- WHOOGLE_PROXY_LOC (required)
- Format: "<ip address>:<port>"
See #30
* Refactor acquire_tor_conn -> acquire_tor_identity
Also updated travis CI to set up tor
* Add check for Tor socket on init, improve Tor error handling
Initializing the app sends a heartbeat request to Tor to check for
availability, and updates the home page config options accordingly. This
heartbeat is sent on every request, to ensure Tor support can be
reconfigured without restarting the entire app.
If Tor support is enabled, and a subsequent request fails, then a new
TorError exception is raised, and the Tor feature is disabled until a
valid connection is restored.
The max attempts has been updated to 10, since 5 seemed a bit too low
for how quickly the attempts go by.
* Change send_tor_signal arg type, update function doc
send_tor_signal now accepts a stem.Signal arg (a bit cleaner tbh). Also
added the doc string for the "disable" attribute in TorError.
* Fix tor identity logic in Request.send
* Update proxy init, change proxyloc var name
Proxy is now only initialized if both type and location are specified,
as neither have a default fallback and both are required. I suppose the
type could fall back to http, but seems safer this way.
Also refactored proxyurl -> proxyloc for the runtime args in order to
match the Dockerfile args.
* Add tor/proxy support for Docker builds, fix opensearch/init
The Dockerfile is now updated to include support for Tor configuration,
with a working torrc file included in the repo.
An issue with opensearch was fixed as well, which was uncovered during
testing and was simple enough to fix here. Likewise, DDG bang gen was
updated to only ever happen if the file didn't exist previously, as
testing with the file being regenerated every time was tedious.
* Add missing "@" for socks proxy requests
4 years ago
|
|
|
ARG proxyuser=''
|
|
|
|
|
ARG proxypass=''
|
|
|
|
|
ARG proxytype=''
|
|
|
|
|
ARG proxyloc=''
|
|
|
|
|
ARG whoogle_dotenv=''
|
|
|
|
|
ARG use_https=''
|
|
|
|
|
ARG whoogle_port=5000
|
Use farside.link for frontend alternatives in results (#560)
* Integrate Farside into Whoogle
When instances are ratelimited (when a captcha is returned instead of
the user's search results) the user can now hop to a new instance via
Farside, a new backend service that redirects users to working instances
of a particular frontend. In this case, it presents a user with a
Farside link to a new Whoogle (or Searx) instance instead, so that the
user can resume their search.
For the generated Farside->Whoogle link, the generated link includes the
user's current Whoogle configuration settings as URL params, to ensure a
more seamless transition between instances. This doesn't translate to
the Farside->Searx link, but potentially could with some changes.
* Expand conversion of config<->url params
Config settings can now be translated to and from URL params using a
predetermined set of "safe" keys (i.e. config settings that easily
translate to URL params).
* Allow jumping instances via Farside when ratelimited
When instances are ratelimited (when a captcha is returned instead of
the user's search results) the user can now hop to a new instance via
Farside, a new backend service that redirects users to working instances
of a particular frontend. In this case, it presents a user with a
Farside link to a new Whoogle (or Searx) instance instead, so that the
user can resume their search.
For the generated Farside->Whoogle link, the generated link includes the
user's current Whoogle configuration settings as URL params, to ensure a
more seamless transition between instances. This doesn't translate to
the Farside->Searx link, but potentially could with some changes.
Closes #554
Closes #559
2 years ago
|
|
|
ARG twitter_alt='farside.link/nitter'
|
|
|
|
|
ARG youtube_alt='farside.link/invidious'
|
|
|
|
|
ARG reddit_alt='farside.link/libreddit'
|
|
|
|
|
ARG medium_alt='farside.link/scribe'
|
|
|
|
|
ARG translate_alt='farside.link/lingva'
|
|
|
|
|
ARG imgur_alt='farside.link/rimgo'
|
|
|
|
|
ARG wikipedia_alt='farside.link/wikiless'
|
|
|
|
|
ARG imdb_alt='farside.link/libremdb'
|
|
|
|
|
ARG quora_alt='farside.link/quetre'
|
|
|
|
|
|
|
|
|
|
ENV CONFIG_VOLUME=$config_dir \
|
|
|
|
|
WHOOGLE_URL_PREFIX=$url_prefix \
|
|
|
|
|
WHOOGLE_USER=$username \
|
|
|
|
|
WHOOGLE_PASS=$password \
|
|
|
|
|
WHOOGLE_PROXY_USER=$proxyuser \
|
|
|
|
|
WHOOGLE_PROXY_PASS=$proxypass \
|
|
|
|
|
WHOOGLE_PROXY_TYPE=$proxytype \
|
|
|
|
|
WHOOGLE_PROXY_LOC=$proxyloc \
|
|
|
|
|
WHOOGLE_DOTENV=$whoogle_dotenv \
|
|
|
|
|
HTTPS_ONLY=$use_https \
|
|
|
|
|
EXPOSE_PORT=$whoogle_port \
|
|
|
|
|
WHOOGLE_ALT_TW=$twitter_alt \
|
|
|
|
|
WHOOGLE_ALT_YT=$youtube_alt \
|
|
|
|
|
WHOOGLE_ALT_RD=$reddit_alt \
|
|
|
|
|
WHOOGLE_ALT_MD=$medium_alt \
|
|
|
|
|
WHOOGLE_ALT_TL=$translate_alt \
|
|
|
|
|
WHOOGLE_ALT_IMG=$imgur_alt \
|
|
|
|
|
WHOOGLE_ALT_WIKI=$wikipedia_alt \
|
|
|
|
|
WHOOGLE_ALT_IMDB=$imdb_alt \
|
|
|
|
|
WHOOGLE_ALT_QUORA=$quora_alt
|
|
|
|
|
|
|
|
|
|
WORKDIR /whoogle
|
|
|
|
|
|
|
|
|
|
COPY --from=builder /install /usr/local
|
|
|
|
|
COPY misc/tor/torrc /etc/tor/torrc
|
|
|
|
|
COPY misc/tor/start-tor.sh misc/tor/start-tor.sh
|
|
|
|
|
COPY app/ app/
|
|
|
|
|
COPY run whoogle.env* ./
|
|
|
|
|
|
|
|
|
|
# Create user/group to run as
|
|
|
|
|
RUN adduser -D -g $DOCKER_USERID -u $DOCKER_USERID $DOCKER_USER
|
|
|
|
|
|
|
|
|
|
# Fix ownership / permissions
|
|
|
|
|
RUN chown -R ${DOCKER_USER}:${DOCKER_USER} /whoogle /var/lib/tor
|
|
|
|
|
|
|
|
|
|
# Allow writing symlinks to build dir
|
|
|
|
|
RUN chown $DOCKER_USERID:$DOCKER_USERID app/static/build
|
|
|
|
|
|
|
|
|
|
USER $DOCKER_USER:$DOCKER_USER
|
|
|
|
|
|
|
|
|
|
EXPOSE $EXPOSE_PORT
|
|
|
|
|
|
|
|
|
|
HEALTHCHECK --interval=30s --timeout=5s \
|
|
|
|
|
CMD curl -f http://localhost:${EXPOSE_PORT}/healthz || exit 1
|
|
|
|
|
|
|
|
|
|
CMD misc/tor/start-tor.sh & ./run
|
