diff --git a/app/utils/__init__.py b/app/utils/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/app/utils/misc.py b/app/utils/misc.py
new file mode 100644
index 0000000..a70a82a
--- /dev/null
+++ b/app/utils/misc.py
@@ -0,0 +1,20 @@
+from cryptography.fernet import Fernet
+
+SESSION_VALS = ['uuid', 'config', 'keys']
+
+
+def generate_user_keys():
+ # Generate/regenerate unique key per user
+ return {
+ 'element_key': Fernet.generate_key(),
+ 'text_key': Fernet.generate_key()
+ }
+
+
+def valid_user_session(session):
+ # Generate secret key for user if unavailable
+ for value in SESSION_VALS:
+ if value not in session:
+ return False
+
+ return True
diff --git a/app/utils/routing_utils.py b/app/utils/routing_utils.py
new file mode 100644
index 0000000..cc3ed1f
--- /dev/null
+++ b/app/utils/routing_utils.py
@@ -0,0 +1,69 @@
+from app import app
+from app.filter import Filter, get_first_link
+from app.request import gen_query
+from bs4 import BeautifulSoup
+from cryptography.fernet import Fernet, InvalidToken
+from flask import g
+from typing import Any, Tuple
+
+
+class RoutingUtils:
+ def __init__(self, request, config, session):
+ self.request_params = request.args if request.method == 'GET' else request.form
+ self.user_agent = request.headers.get('User-Agent')
+ self.feeling_lucky = False
+ self.config = config
+ self.session = session
+ self.query = ''
+ self.search_type = self.request_params.get('tbm') if 'tbm' in self.request_params else ''
+
+ def __getitem__(self, name):
+ return getattr(self, name)
+
+ def __setitem__(self, name, value):
+ return setattr(self, name, value)
+
+ def __delitem__(self, name):
+ return delattr(self, name)
+
+ def __contains__(self, name):
+ return hasattr(self, name)
+
+ def new_search_query(self) -> str:
+ app.user_elements[self.session['uuid']] = 0
+ self.session['keys']['element_key'] = Fernet.generate_key()
+
+ q = self.request_params.get('q')
+
+ if q is None or len(q) == 0:
+ return ''
+ else:
+ # Attempt to decrypt if this is an internal link
+ try:
+ q = Fernet(self.session['keys']['text_key']).decrypt(q.encode()).decode()
+ except InvalidToken:
+ pass
+
+ # Reset text key
+ self.session['keys']['text_key'] = Fernet.generate_key()
+
+ # Format depending on whether or not the query is a "feeling lucky" query
+ self.feeling_lucky = q.startswith('! ')
+ self.query = q[2:] if self.feeling_lucky else q
+ return self.query
+
+ def generate_response(self) -> Tuple[Any, int]:
+ mobile = 'Android' in self.user_agent or 'iPhone' in self.user_agent
+
+ content_filter = Filter(self.session['keys'], mobile=mobile, config=self.config)
+ full_query = gen_query(self.query, self.request_params, self.config, content_filter.near)
+ get_body = g.user_request.send(query=full_query).text
+
+ # Produce cleanable html soup from response
+ html_soup = BeautifulSoup(content_filter.reskin(get_body), 'html.parser')
+
+ if self.feeling_lucky:
+ return get_first_link(html_soup), 1
+ else:
+ formatted_results = content_filter.clean(html_soup)
+ return formatted_results, content_filter.elements
diff --git a/requirements.txt b/requirements.txt
index 030780c..702d8ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,15 +4,16 @@ cffi==1.13.2
Click==7.0
cryptography==2.8
Flask==1.1.1
+Flask-Session==0.3.2
itsdangerous==1.1.0
Jinja2==2.10.3
lxml==4.5.1
MarkupSafe==1.1.1
pycparser==2.19
-pycurl==7.43.0.4
pyOpenSSL==19.1.0
pytest==5.4.1
python-dateutil==2.8.1
+requests==2.23.0
six==1.14.0
soupsieve==1.9.5
Werkzeug==0.16.0
diff --git a/setup.py b/setup.py
index 3428459..08652bc 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.1.4',
+ version='0.2.0',
include_package_data=True,
install_requires=requirements,
description='Self-hosted, ad-free, privacy-respecting Google metasearch engine',
diff --git a/test/test_misc.py b/test/test_misc.py
new file mode 100644
index 0000000..296d03a
--- /dev/null
+++ b/test/test_misc.py
@@ -0,0 +1,36 @@
+from app.utils.misc import generate_user_keys, valid_user_session
+
+
+def test_generate_user_keys():
+ keys = generate_user_keys()
+ assert 'text_key' in keys
+ assert 'element_key' in keys
+ assert keys['text_key'] not in keys['element_key']
+
+
+def test_valid_session(client):
+ with client.session_transaction() as session:
+ assert not valid_user_session(session)
+
+ session['uuid'] = 'test'
+ session['keys'] = generate_user_keys()
+ session['config'] = {}
+
+ assert valid_user_session(session)
+
+
+def test_request_key_generation(client):
+ text_key = ''
+ rv = client.get('/search?q=test+1')
+ assert rv._status_code == 200
+
+ with client.session_transaction() as session:
+ assert valid_user_session(session)
+ text_key = session['keys']['text_key']
+
+ rv = client.get('/search?q=test+2')
+ assert rv._status_code == 200
+
+ with client.session_transaction() as session:
+ assert valid_user_session(session)
+ assert text_key not in session['keys']['text_key']
diff --git a/test/test_results.py b/test/test_results.py
index 7f500c8..a943de6 100644
--- a/test/test_results.py
+++ b/test/test_results.py
@@ -1,13 +1,13 @@
from bs4 import BeautifulSoup
-from cryptography.fernet import Fernet
from app.filter import Filter
+from app.utils.misc import generate_user_keys
from datetime import datetime
from dateutil.parser import *
def get_search_results(data):
- secret_key = Fernet.generate_key()
- soup = Filter(secret_key=secret_key).clean(BeautifulSoup(data, 'html.parser'))
+ secret_key = generate_user_keys()
+ soup = Filter(user_keys=secret_key).clean(BeautifulSoup(data, 'html.parser'))
main_divs = soup.find('div', {'id': 'main'})
assert len(main_divs) > 1
diff --git a/test/test_routes.py b/test/test_routes.py
index 91e17be..56c9909 100644
--- a/test/test_routes.py
+++ b/test/test_routes.py
@@ -1,10 +1,13 @@
+from app.models.config import Config
import json
import random
demo_config = {
'near': random.choice(['Seattle', 'New York', 'San Francisco']),
'dark_mode': str(random.getrandbits(1)),
- 'nojs': str(random.getrandbits(1))
+ 'nojs': str(random.getrandbits(1)),
+ 'lang': random.choice(Config.LANGUAGES)['value'],
+ 'ctry': random.choice(Config.COUNTRIES)['value']
}
@@ -17,6 +20,7 @@ def test_search(client):
rv = client.get('/search?q=test')
assert rv._status_code == 200
+
def test_feeling_lucky(client):
rv = client.get('/search?q=!%20test')
assert rv._status_code == 303
-