nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-05-27 10:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

tor: Only diagnose relay ports if feature enabled

Browse Source 
Tests:

- With relay enable, relay port diagnostic is passed.

- With relay disabled, relay port diagnostic is skipped.

- With bridge relay enabled, obfs ports diagnostics are passed.

- With bridge relay disabled, obfs ports diagnostics are skipped.

Signed-off-by: James Valleroy <jvalleroy@mailbox.org>
Reviewed-by: Sunil Mohan Adapa <sunil@medhas.org>
This commit is contained in:
James Valleroy 2023-04-30 14:55:06 -04:00 committed by Sunil Mohan Adapa
parent 3922d7c71f
commit 56adc7ae22
No known key found for this signature in database
GPG Key ID: 43EA1CFF0AA7C5F2
1 changed files with 30 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -124,38 +124,40 @@ class TorApp(app_module.App):
results.extend(_diagnose_control_port()) results.extend(_diagnose_control_port())
status = privileged.get_status() status = utils.get_status()
ports = status['ports'] ports = status['ports']
results.append([ if status['relay_enabled']:
_('Tor relay port available'), results.append([
'passed' if 'orport' in ports else 'failed' _('Tor relay port available'),
]) 'passed' if 'orport' in ports else 'failed'
if 'orport' in ports: ])
results.append( if 'orport' in ports:
diagnose_port_listening(int(ports['orport']), 'tcp4')) results.append(
results.append( diagnose_port_listening(int(ports['orport']), 'tcp4'))
diagnose_port_listening(int(ports['orport']), 'tcp6')) results.append(
diagnose_port_listening(int(ports['orport']), 'tcp6'))
results.append([ if status['bridge_relay_enabled']:
_('Obfs3 transport registered'), results.append([
'passed' if 'obfs3' in ports else 'failed' _('Obfs3 transport registered'),
]) 'passed' if 'obfs3' in ports else 'failed'
if 'obfs3' in ports: ])
results.append(diagnose_port_listening(int(ports['obfs3']), if 'obfs3' in ports:
'tcp4')) results.append(
results.append(diagnose_port_listening(int(ports['obfs3']), diagnose_port_listening(int(ports['obfs3']), 'tcp4'))
'tcp6')) results.append(
diagnose_port_listening(int(ports['obfs3']), 'tcp6'))
results.append([ results.append([
_('Obfs4 transport registered'), _('Obfs4 transport registered'),
'passed' if 'obfs4' in ports else 'failed' 'passed' if 'obfs4' in ports else 'failed'
]) ])
if 'obfs4' in ports: if 'obfs4' in ports:
results.append(diagnose_port_listening(int(ports['obfs4']), results.append(
'tcp4')) diagnose_port_listening(int(ports['obfs4']), 'tcp4'))
results.append(diagnose_port_listening(int(ports['obfs4']), results.append(
'tcp6')) diagnose_port_listening(int(ports['obfs4']), 'tcp6'))
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'))