nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-08-26 12:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

tor: Don't allow relay to be enabled while using upstream bridges

Browse Source
This commit is contained in:
James Valleroy 2016-09-12 08:03:36 -04:00 committed by Sunil Mohan Adapa
parent 165e880329
commit 5483d30151
No known key found for this signature in database
GPG Key ID: 36C361440C9BC971
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
actions/tor
View File

@ -151,6 +151,9 @@ def subcommand_configure(arguments):
_use_upstream_bridges(arguments.use_upstream_bridges, aug=aug) _use_upstream_bridges(arguments.use_upstream_bridges, aug=aug)
if arguments.use_upstream_bridges == 'enable':
arguments.relay = 'disable'
arguments.bridge_relay = 'disable'
_enable_relay(arguments.relay, arguments.bridge_relay, aug=aug) _enable_relay(arguments.relay, arguments.bridge_relay, aug=aug)
if arguments.hidden_service == 'enable': if arguments.hidden_service == 'enable':
@ -343,12 +346,14 @@ def _enable_relay(relay=None, bridge=None, aug=None):
if not aug: if not aug:
aug = augeas_load() aug = augeas_load()
if relay == 'enable': use_upstream_bridges = aug.get(TOR_CONFIG + '/UseBridges') == '1'
if relay == 'enable' and not use_upstream_bridges:
aug.set(TOR_CONFIG + '/ORPort', 'auto') aug.set(TOR_CONFIG + '/ORPort', 'auto')
elif relay == 'disable': elif relay == 'disable':
aug.remove(TOR_CONFIG + '/ORPort') aug.remove(TOR_CONFIG + '/ORPort')
if bridge == 'enable': if bridge == 'enable' and not use_upstream_bridges:
aug.set(TOR_CONFIG + '/BridgeRelay', '1') aug.set(TOR_CONFIG + '/BridgeRelay', '1')
aug.set(TOR_CONFIG + '/ServerTransportPlugin', aug.set(TOR_CONFIG + '/ServerTransportPlugin',
'obfs3,obfs4 exec /usr/bin/obfs4proxy') 'obfs3,obfs4 exec /usr/bin/obfs4proxy')