open.source/whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor acquire_tor_conn -> acquire_tor_identity

Browse Source 
Also updated travis CI to set up tor
This commit is contained in:
Ben Busby 2020-10-25 18:33:45 -04:00
parent bd1d236923
commit d7442a18a5
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -1,7 +1,9 @@
language: python language: python
python: 3.6 python: 3.6
before_install: before_install:
- sudo apt-get -y install libgnutls28-dev - sudo apt-get -y install libgnutls28-dev tor
- sudo cat rc/torrc > /etc/tor/torrc
- sudo systemctl tor start
install: install:
- pip install -r requirements.txt - pip install -r requirements.txt
script: script:

6
app/request.py
View File

@ -19,7 +19,7 @@ DESKTOP_UA = '{}/5.0 (X11; {} x86_64; rv:75.0) Gecko/20100101 {}/75.0'
VALID_PARAMS = ['tbs', 'tbm', 'start', 'near', 'source', 'nfpr'] VALID_PARAMS = ['tbs', 'tbm', 'start', 'near', 'source', 'nfpr']
def acquire_tor_conn(): def acquire_tor_identity():
with Controller.from_port(port=9051) as c: with Controller.from_port(port=9051) as c:
c.authenticate() c.authenticate()
c.signal(Signal.NEWNYM) c.signal(Signal.NEWNYM)
@ -151,10 +151,10 @@ class Request:
attempt += 1 attempt += 1
if attempt > 5: if attempt > 5:
return requests.get(self.root_path + 'tor-reject?q=' + query) return requests.get(self.root_path + 'tor-reject?q=' + query)
acquire_tor_conn() acquire_tor_identity()
return self.send(base_url, query, attempt) return self.send(base_url, query, attempt)
return response return response
acquire_tor_conn() acquire_tor_identity()