From d01f56ea03021d040465124174bea65476f6bdbd Mon Sep 17 00:00:00 2001
From: Ben Busby <33362396+benbusby@users.noreply.github.com>
Date: Tue, 5 May 2020 18:28:43 -0600
Subject: [PATCH] Removed referrer from links, refacored routes
Added to all whoogle
templates
Refactored search route to use conditionally use either request.args or
request.form, depending on rest call (get vs post respectively)
---
README.md | 3 ++-
app/routes.py | 25 ++++++++++++++-----------
app/templates/display.html | 1 +
app/templates/index.html | 1 +
app/templates/opensearch.xml | 6 +++---
5 files changed, 21 insertions(+), 15 deletions(-)
diff --git a/README.md b/README.md
index bb05903..944b62b 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,9 @@ Contents
- No tracking/linking of your personal IP address
- No AMP links
- No URL tracking tags (i.e. utm=%s)
+- No referrer header
- POST request search queries (when possible)
-- View images at full res with one click
+- View images at full res without site redirect (currently mobile only)
- Dark mode
- Randomly generated User Agent
- Easy to install/deploy
diff --git a/app/routes.py b/app/routes.py
index ecc88b2..ae48596 100644
--- a/app/routes.py
+++ b/app/routes.py
@@ -20,6 +20,11 @@ def before_request_func():
g.user_request = Request(request.headers.get('User-Agent'))
+@app.errorhandler(404)
+def unknown_page(e):
+ return redirect('/')
+
+
@app.route('/', methods=['GET'])
def index():
bg = '#000' if 'dark' in user_config and user_config['dark'] else '#fff'
@@ -32,7 +37,7 @@ def opensearch():
if url_root.endswith('/'):
url_root = url_root[:-1]
- template = render_template('opensearch.xml', whoogle_url=url_root)
+ template = render_template('opensearch.xml', main_url=url_root)
response = make_response(template)
response.headers['Content-Type'] = 'application/xml'
return response
@@ -40,25 +45,23 @@ def opensearch():
@app.route('/search', methods=['GET', 'POST'])
def search():
- if request.method == 'GET':
- q = request.args.get('q')
- if q is None:
- return redirect('/')
+ request_params = request.args if request.method == 'GET' else request.form
+ q = request_params.get('q')
+
+ if q is None or len(q) == 0:
+ return redirect('/')
+ else:
+ # Attempt to decrypt if this is an internal link
try:
q = Fernet(app.secret_key).decrypt(q.encode()).decode()
except InvalidToken:
pass
- else:
- q = request.form['q']
-
- if q is None or len(q) == 0:
- return render_template('error.html')
user_agent = request.headers.get('User-Agent')
mobile = 'Android' in user_agent or 'iPhone' in user_agent
content_filter = Filter(mobile, user_config, secret_key=app.secret_key)
- full_query = gen_query(q, request.args, content_filter.near)
+ full_query = gen_query(q, request_params, content_filter.near)
get_body = g.user_request.send(query=full_query)
results = content_filter.reskin(get_body)
diff --git a/app/templates/display.html b/app/templates/display.html
index 668b148..03ed151 100644
--- a/app/templates/display.html
+++ b/app/templates/display.html
@@ -4,6 +4,7 @@
+
{{ query }} - Whoogle Search
diff --git a/app/templates/index.html b/app/templates/index.html
index 821ff47..a221e49 100644
--- a/app/templates/index.html
+++ b/app/templates/index.html
@@ -14,6 +14,7 @@
+
diff --git a/app/templates/opensearch.xml b/app/templates/opensearch.xml
index 0205881..82254b2 100644
--- a/app/templates/opensearch.xml
+++ b/app/templates/opensearch.xml
@@ -4,10 +4,10 @@
Whoogle: A lightweight, deployable Google search proxy for desktop/mobile that removes Javascript, AMP links, and ads
UTF-8
/static/img/favicon/favicon-32x32.png
-
+
-
- {{ whoogle_url }}/search
+
+ {{ main_url }}/search