From 5483d3015128d89372e5dc48feffefe1591890dd Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Mon, 12 Sep 2016 08:03:36 -0400 Subject: [PATCH] tor: Don't allow relay to be enabled while using upstream bridges --- actions/tor | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/actions/tor b/actions/tor index c890cb0bb..1adb5d883 100755 --- a/actions/tor +++ b/actions/tor @@ -151,6 +151,9 @@ def subcommand_configure(arguments): _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) if arguments.hidden_service == 'enable': @@ -343,12 +346,14 @@ def _enable_relay(relay=None, bridge=None, aug=None): if not aug: 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') elif relay == 'disable': 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 + '/ServerTransportPlugin', 'obfs3,obfs4 exec /usr/bin/obfs4proxy')