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

Handle errors with Tor HS configuration.

Browse Source
This commit is contained in:
James Valleroy 2014-11-10 21:42:40 -05:00
parent e5de76401d
commit 28cc7f14c7
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
actions/tor
View File

@ -198,8 +198,11 @@ def get_hidden_service():
if not hs_dir: if not hs_dir:
return '' return ''
with open(os.path.join(hs_dir, 'hostname'), 'r') as conf_file: try:
hs_hostname = conf_file.read().strip() with open(os.path.join(hs_dir, 'hostname'), 'r') as conf_file:
hs_hostname = conf_file.read().strip()
except Exception:
return 'error'
return hs_hostname + ' ' + ','.join(hs_ports) return hs_hostname + ' ' + ','.join(hs_ports)

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

@ -89,6 +89,10 @@ def get_status():
hs_enabled = False hs_enabled = False
hs_hostname = 'Not Configured' hs_hostname = 'Not Configured'
hs_ports = '' hs_ports = ''
elif output == 'error':
hs_enabled = False
hs_hostname = 'Configuration Error'
hs_ports = ''
else: else:
hs_enabled = True hs_enabled = True
hs_info = output.split() hs_info = output.split()