nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

tor: Switch to obfs4proxy.

Browse Source 
Replaces scramblesuit, and also supports obfs3.
Also add tor-geoipdb which is useful for bridges.
This commit is contained in:
James Valleroy 2015-10-28 23:16:32 -04:00 committed by Sunil Mohan Adapa
parent f281955244
commit 0695ee5abb
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
actions/tor
View File

@ -74,7 +74,7 @@ Exitpolicy reject *:*
Exitpolicy reject6 *:* Exitpolicy reject6 *:*
# Enable obfsproxy # Enable obfsproxy
ServerTransportPlugin obfs3,scramblesuit exec /usr/bin/obfsproxy managed ServerTransportPlugin obfs3,obfs4 exec /usr/bin/obfs4proxy
ExtORPort auto ExtORPort auto
# Enable transparent proxy # Enable transparent proxy

8
plinth/modules/tor/__init__.py
View File

@ -61,11 +61,11 @@ def diagnose():
results.append(action_utils.diagnose_port_listening(ports['obfs3'], results.append(action_utils.diagnose_port_listening(ports['obfs3'],
'tcp4')) 'tcp4'))
results.append([_('Scramblesuit transport registered'), results.append([_('Obfs4 transport registered'),
'passed' if 'scramblesuit' in ports else 'failed']) 'passed' if 'obfs4' in ports else 'failed'])
if 'scramblesuit' in ports: if 'obfs4' in ports:
results.append(action_utils.diagnose_port_listening( results.append(action_utils.diagnose_port_listening(
ports['scramblesuit'], 'tcp4')) ports['obfs4'], 'tcp4'))
results.append(_diagnose_url_via_tor('http://www.debian.org', '4')) results.append(_diagnose_url_via_tor('http://www.debian.org', '4'))
results.append(_diagnose_url_via_tor('http://www.debian.org', '6')) results.append(_diagnose_url_via_tor('http://www.debian.org', '6'))

4
plinth/modules/tor/tor.py
View File

@ -92,7 +92,9 @@ def on_install():
actions.superuser_run('tor', ['enable-apt-transport-tor']) actions.superuser_run('tor', ['enable-apt-transport-tor'])
@package.required(['tor', 'obfsproxy', 'torsocks', 'apt-transport-tor'], @package.required(['tor', 'tor-geoipdb', 'torsocks',
'obfs4proxy',
'apt-transport-tor'],
on_install=on_install) on_install=on_install)
def index(request): def index(request):
"""Service the index page""" """Service the index page"""