0ef098069e
* 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
148 lines
8.8 KiB
HTML
148 lines
8.8 KiB
HTML
<html>
|
|
<head>
|
|
<link rel="apple-touch-icon" sizes="57x57" href="/static/img/favicon/apple-icon-57x57.png">
|
|
<link rel="apple-touch-icon" sizes="60x60" href="/static/img/favicon/apple-icon-60x60.png">
|
|
<link rel="apple-touch-icon" sizes="72x72" href="/static/img/favicon/apple-icon-72x72.png">
|
|
<link rel="apple-touch-icon" sizes="76x76" href="/static/img/favicon/apple-icon-76x76.png">
|
|
<link rel="apple-touch-icon" sizes="114x114" href="/static/img/favicon/apple-icon-114x114.png">
|
|
<link rel="apple-touch-icon" sizes="120x120" href="/static/img/favicon/apple-icon-120x120.png">
|
|
<link rel="apple-touch-icon" sizes="144x144" href="/static/img/favicon/apple-icon-144x144.png">
|
|
<link rel="apple-touch-icon" sizes="152x152" href="/static/img/favicon/apple-icon-152x152.png">
|
|
<link rel="apple-touch-icon" sizes="180x180" href="/static/img/favicon/apple-icon-180x180.png">
|
|
<link rel="icon" type="image/png" sizes="192x192" href="/static/img/favicon/android-icon-192x192.png">
|
|
<link rel="icon" type="image/png" sizes="32x32" href="/static/img/favicon/favicon-32x32.png">
|
|
<link rel="icon" type="image/png" sizes="96x96" href="/static/img/favicon/favicon-96x96.png">
|
|
<link rel="icon" type="image/png" sizes="16x16" href="/static/img/favicon/favicon-16x16.png">
|
|
<link rel="manifest" href="/static/img/favicon/manifest.json">
|
|
<meta name="referrer" content="no-referrer">
|
|
<meta name="msapplication-TileColor" content="#ffffff">
|
|
<meta name="msapplication-TileImage" content="/static/img/favicon/ms-icon-144x144.png">
|
|
<script type="text/javascript" src="/static/js/autocomplete.js"></script>
|
|
<script type="text/javascript" src="/static/js/controller.js"></script>
|
|
<link rel="search" href="/opensearch.xml" type="application/opensearchdescription+xml" title="Whoogle Search">
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
<link rel="stylesheet" href="/static/css/{{ 'search-dark' if config.dark else 'search' }}.css">
|
|
<link rel="stylesheet" href="/static/css/main.css">
|
|
{% if config.dark %}
|
|
<link rel="stylesheet" href="/static/css/dark-theme.css"/>
|
|
{% endif %}
|
|
<title>Whoogle Search</title>
|
|
</head>
|
|
<body id="main" style="display: none; background-color: {{ '#000' if config.dark else '#fff' }}">
|
|
<script>
|
|
{% if error_message|length > 0 %}
|
|
let error = "{{ error_message|safe }}";
|
|
alert(error);
|
|
{% endif %}
|
|
</script>
|
|
<div class="search-container">
|
|
<img class="logo" src="/static/img/logo.png">
|
|
<form id="search-form" action="/search" method="{{ 'get' if config.get_only else 'post' }}">
|
|
<div class="search-fields">
|
|
<div class="autocomplete">
|
|
<input type="text" name="q" id="search-bar" autofocus="autofocus" autocomplete="off">
|
|
</div>
|
|
<input type="submit" id="search-submit" value="Search">
|
|
</div>
|
|
</form>
|
|
<br/>
|
|
<button id="config-collapsible" class="collapsible">Configuration</button>
|
|
<div class="content">
|
|
<div class="config-fields">
|
|
<form id="config-form" action="/config" method="post">
|
|
<div class="config-div">
|
|
<label for="config-ctry">Filter Results by Country: </label>
|
|
<select name="ctry" id="config-ctry">
|
|
{% for ctry in countries %}
|
|
<option value="{{ ctry.value }}"
|
|
{% if ctry.value in config.ctry %}
|
|
selected
|
|
{% endif %}>
|
|
{{ ctry.name }}
|
|
</option>
|
|
{% endfor %}
|
|
</select>
|
|
<div><span class="info-text"> — Note: If enabled, a website will only appear in the results if it is *hosted* in the selected country.</span></div>
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-lang-interface">Interface Language: </label>
|
|
<select name="lang_interface" id="config-lang-interface">
|
|
{% for lang in languages %}
|
|
<option value="{{ lang.value }}"
|
|
{% if lang.value in config.lang_interface %}
|
|
selected
|
|
{% endif %}>
|
|
{{ lang.name }}
|
|
</option>
|
|
{% endfor %}
|
|
</select>
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-lang-search">Search Language: </label>
|
|
<select name="lang_search" id="config-lang-search">
|
|
{% for lang in languages %}
|
|
<option value="{{ lang.value }}"
|
|
{% if lang.value in config.lang_search %}
|
|
selected
|
|
{% endif %}>
|
|
{{ lang.name }}
|
|
</option>
|
|
{% endfor %}
|
|
</select>
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-near">Near: </label>
|
|
<input type="text" name="near" id="config-near" placeholder="City Name">
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-nojs">Show NoJS Links: </label>
|
|
<input type="checkbox" name="nojs" id="config-nojs">
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-dark">Dark Mode: </label>
|
|
<input type="checkbox" name="dark" id="config-dark">
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-safe">Safe Search: </label>
|
|
<input type="checkbox" name="safe" id="config-safe">
|
|
</div>
|
|
<div class="config-div">
|
|
<label class="tooltip" for="config-alts">Replace Social Media Links: </label>
|
|
<input type="checkbox" name="alts" id="config-alts">
|
|
<div><span class="info-text"> — Replaces Twitter/YouTube/Instagram links
|
|
with Nitter/Invidious/Bibliogram links.</span></div>
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-new-tab">Open Links in New Tab: </label>
|
|
<input type="checkbox" name="new_tab" id="config-new-tab">
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-tor">Use Tor: {{ '' if tor_available else 'Unavailable' }}</label>
|
|
<input type="checkbox" name="tor" id="config-tor" {{ '' if tor_available else 'hidden' }}>
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-get-only">GET Requests Only: </label>
|
|
<input type="checkbox" name="get_only" id="config-get-only">
|
|
</div>
|
|
<div class="config-div">
|
|
<label for="config-url">Root URL: </label>
|
|
<input type="text" name="url" id="config-url" value="">
|
|
</div>
|
|
<div class="config-div">
|
|
<input type="submit" id="config-load" onclick="loadConfig(event)" value="Load">
|
|
<input type="submit" id="config-submit" value="Apply">
|
|
<input type="submit" id="config-submit" onclick="saveConfig(event)" value="Save As...">
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<footer>
|
|
<p style="color: {{ '#fff' if config.dark else '#000' }};">
|
|
Whoogle Search v{{ version_number }} ||
|
|
<a style="color: #685e79" href="https://github.com/benbusby/whoogle-search">View on GitHub</a>
|
|
</p>
|
|
</footer>
|
|
</body>
|
|
</html>
|