mirror of
https://github.com/freedombox/FreedomBox.git
synced 2026-01-21 07:55:00 +00:00
Mask disabled Tor systemd services to prevent services starting by the Tor
master service after system reboot.
Also:
- Fix torproxy app always enabled after setup.
- Minor privileged code cleanup - removed unused functions.
Tests performed on Debian stable and testing:
- Installed and disabled the apps, rebooted the system, then applied the patch.
Ensured that apps are upgraded successfully and apps are disabled after
upgrade. Ensured that tor@default, tor@plinth and tor@fbxlocal services are
masked and not running.
- After 1)enabling and 2)disabling both apps and 3)rebooting the system:
- Ensured that the tor@default service is not running and is masked.
- Ensured that tor@plinth or tor@fbxproxy service states match the states
of the app.
- Uninstalled the apps, ensured that only the tor@default service masked
state remains in the systemd.
- All the tor and torproxy tests pass.
Closes #2369, #2454.
Signed-off-by: Veiko Aasa <veiko17@disroot.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
500 lines
15 KiB
Python
500 lines
15 KiB
Python
# SPDX-License-Identifier: AGPL-3.0-or-later
|
|
"""Configure Tor service."""
|
|
|
|
import codecs
|
|
import logging
|
|
import os
|
|
import pathlib
|
|
import re
|
|
import shutil
|
|
import socket
|
|
import subprocess
|
|
import time
|
|
from typing import Any
|
|
|
|
import augeas
|
|
|
|
from plinth import action_utils
|
|
from plinth.actions import privileged
|
|
|
|
INSTANCE_NAME = 'plinth'
|
|
SERVICE_FILE = '/etc/firewalld/services/tor-{0}.xml'
|
|
SERVICE_NAME = f'tor@{INSTANCE_NAME}'
|
|
TOR_CONFIG = f'/etc/tor/instances/{INSTANCE_NAME}/torrc'
|
|
TOR_CONFIG_AUG = f'/files/{TOR_CONFIG}'
|
|
TOR_STATE_FILE = f'/var/lib/tor-instances/{INSTANCE_NAME}/state'
|
|
TOR_AUTH_COOKIE = f'/var/run/tor-instances/{INSTANCE_NAME}/control.authcookie'
|
|
TOR_APACHE_SITE = '/etc/apache2/conf-available/onion-location-freedombox.conf'
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
@privileged
|
|
def setup(old_version: int):
|
|
"""Setup Tor configuration after installing it."""
|
|
# Disable default Tor service. We will use tor@plinth instance instead.
|
|
action_utils.service_disable('tor@default')
|
|
# Mask the service to prevent re-enabling it by the Tor master service.
|
|
action_utils.service_mask('tor@default')
|
|
|
|
if old_version:
|
|
if old_version <= 4:
|
|
_upgrade_orport_value()
|
|
|
|
if old_version <= 6:
|
|
_remove_proxy()
|
|
|
|
return
|
|
|
|
_first_time_setup()
|
|
_set_onion_header(_get_hidden_service(aug=None))
|
|
|
|
|
|
def _first_time_setup():
|
|
"""Setup Tor configuration for the first time setting defaults."""
|
|
logger.info('Performing first time setup for Tor')
|
|
|
|
subprocess.run(['tor-instance-create', INSTANCE_NAME], check=True)
|
|
|
|
# Remove line starting with +SocksPort, since our augeas lens
|
|
# doesn't handle it correctly.
|
|
with open(TOR_CONFIG, 'r', encoding='utf-8') as torrc:
|
|
torrc_lines = torrc.readlines()
|
|
with open(TOR_CONFIG, 'w', encoding='utf-8') as torrc:
|
|
for line in torrc_lines:
|
|
if not line.startswith('+'):
|
|
torrc.write(line)
|
|
|
|
aug = augeas_load()
|
|
|
|
aug.set(TOR_CONFIG_AUG + '/ControlPort', '9051')
|
|
_enable_relay(relay=True, bridge=True, aug=aug)
|
|
aug.set(TOR_CONFIG_AUG + '/ExitPolicy[1]', 'reject *:*')
|
|
aug.set(TOR_CONFIG_AUG + '/ExitPolicy[2]', 'reject6 *:*')
|
|
|
|
aug.set(TOR_CONFIG_AUG + '/HiddenServiceDir',
|
|
f'/var/lib/tor-instances/{INSTANCE_NAME}/hidden_service')
|
|
aug.set(TOR_CONFIG_AUG + '/HiddenServicePort[1]', '22 127.0.0.1:22')
|
|
aug.set(TOR_CONFIG_AUG + '/HiddenServicePort[2]', '80 127.0.0.1:80')
|
|
aug.set(TOR_CONFIG_AUG + '/HiddenServicePort[3]', '443 127.0.0.1:443')
|
|
|
|
aug.save()
|
|
|
|
action_utils.service_enable(SERVICE_NAME)
|
|
action_utils.service_restart(SERVICE_NAME)
|
|
_update_ports()
|
|
|
|
# wait until hidden service information is available
|
|
tries = 0
|
|
while not _get_hidden_service()['enabled']:
|
|
tries += 1
|
|
if tries >= 12:
|
|
return
|
|
|
|
time.sleep(10)
|
|
|
|
|
|
def _upgrade_orport_value():
|
|
"""Change ORPort value from auto to 9001.
|
|
|
|
When ORPort is set to 'auto', Tor automatically allocates a port for it.
|
|
During it's first run, we able to extract the port number and open the
|
|
firewall port. However, unlike for pluggable transports, Tor does not seem
|
|
to store this port for future reuse in the state file. It hence opens a new
|
|
port every time it is started. This leads to a new port being assigned on
|
|
next Tor startup and leads to relay functionality not being reachable from
|
|
outside.
|
|
|
|
According to the documentation, only possible values for ORPort are a fixed
|
|
number or 0 (disable) or auto (above behavior). Choose 9001 as this is
|
|
the commonly used port number for ORPort. The recommended port number of
|
|
443 is not possible in FreedomBox due it is use for other purposes.
|
|
|
|
"""
|
|
logger.info('Upgrading ORPort value for Tor')
|
|
aug = augeas_load()
|
|
|
|
if _is_relay_enabled(aug):
|
|
aug.set(TOR_CONFIG_AUG + '/ORPort[1]', '9001')
|
|
aug.set(TOR_CONFIG_AUG + '/ORPort[2]', '[::]:9001')
|
|
|
|
aug.save()
|
|
|
|
action_utils.service_try_restart(SERVICE_NAME)
|
|
|
|
# Tor may not be running, don't try to read/update all ports
|
|
_update_port('orport', 9001)
|
|
action_utils.service_restart('firewalld')
|
|
|
|
|
|
def _remove_proxy():
|
|
"""Remove SocksProxy from configuration.
|
|
|
|
This functionality was split off to a separate app, Tor Proxy.
|
|
"""
|
|
logger.info('Removing SocksProxy from Tor configuration')
|
|
aug = augeas_load()
|
|
for config in [
|
|
'SocksPort', 'VirtualAddrNetworkIPv4', 'AutomapHostsOnResolve',
|
|
'TransPort', 'DNSPort'
|
|
]:
|
|
aug.remove(TOR_CONFIG_AUG + '/' + config)
|
|
|
|
aug.save()
|
|
action_utils.service_try_restart(SERVICE_NAME)
|
|
|
|
|
|
@privileged
|
|
def configure(use_upstream_bridges: bool | None = None,
|
|
upstream_bridges: str | None = None, relay: bool | None = None,
|
|
bridge_relay: bool | None = None,
|
|
hidden_service: bool | None = None):
|
|
"""Configure Tor."""
|
|
aug = augeas_load()
|
|
|
|
_use_upstream_bridges(use_upstream_bridges, aug=aug)
|
|
|
|
if use_upstream_bridges:
|
|
relay = False
|
|
bridge_relay = False
|
|
|
|
if upstream_bridges:
|
|
_set_upstream_bridges(upstream_bridges, aug=aug)
|
|
|
|
_enable_relay(relay, bridge_relay, aug=aug)
|
|
|
|
if hidden_service:
|
|
_enable_hs(aug=aug)
|
|
elif hidden_service is not None:
|
|
_disable_hs(aug=aug)
|
|
|
|
|
|
@privileged
|
|
def update_ports():
|
|
"""Update firewall ports based on what Tor uses."""
|
|
_update_ports()
|
|
|
|
|
|
@privileged
|
|
def restart():
|
|
"""Restart Tor."""
|
|
if (action_utils.service_is_enabled(SERVICE_NAME, strict_check=True)
|
|
and action_utils.service_is_running(SERVICE_NAME)):
|
|
action_utils.service_restart(SERVICE_NAME)
|
|
|
|
aug = augeas_load()
|
|
if aug.get(TOR_CONFIG_AUG + '/HiddenServiceDir'):
|
|
# wait until hidden service information is available
|
|
tries = 0
|
|
while not _get_hidden_service()['enabled']:
|
|
tries += 1
|
|
if tries >= 12:
|
|
return
|
|
time.sleep(10)
|
|
|
|
|
|
@privileged
|
|
def get_status() -> dict[str, bool | str | dict[str, Any]]:
|
|
"""Return dict with Tor status."""
|
|
aug = augeas_load()
|
|
return {
|
|
'use_upstream_bridges': _are_upstream_bridges_enabled(aug),
|
|
'upstream_bridges': _get_upstream_bridges(aug),
|
|
'relay_enabled': _is_relay_enabled(aug),
|
|
'bridge_relay_enabled': _is_bridge_relay_enabled(aug),
|
|
'ports': _get_ports(),
|
|
'hidden_service': _get_hidden_service(aug)
|
|
}
|
|
|
|
|
|
def _are_upstream_bridges_enabled(aug) -> bool:
|
|
"""Return whether upstream bridges are being used."""
|
|
use_bridges = aug.get(TOR_CONFIG_AUG + '/UseBridges')
|
|
return use_bridges == '1'
|
|
|
|
|
|
def _get_upstream_bridges(aug) -> str:
|
|
"""Return upstream bridges separated by newlines."""
|
|
matches = aug.match(TOR_CONFIG_AUG + '/Bridge')
|
|
bridges = [aug.get(match) for match in matches]
|
|
return '\n'.join(bridges)
|
|
|
|
|
|
def _is_relay_enabled(aug) -> bool:
|
|
"""Return whether a relay is enabled."""
|
|
orport = aug.get(TOR_CONFIG_AUG + '/ORPort[1]')
|
|
return bool(orport) and orport != '0'
|
|
|
|
|
|
def _is_bridge_relay_enabled(aug) -> bool:
|
|
"""Return whether bridge relay is enabled."""
|
|
bridge = aug.get(TOR_CONFIG_AUG + '/BridgeRelay')
|
|
return bridge == '1'
|
|
|
|
|
|
def _get_ports() -> dict[str, str]:
|
|
"""Return dict mapping port names to numbers."""
|
|
ports = {}
|
|
try:
|
|
ports['orport'] = _get_orport()
|
|
except Exception:
|
|
pass
|
|
|
|
try:
|
|
with open(TOR_STATE_FILE, 'r', encoding='utf-8') as state_file:
|
|
for line in state_file:
|
|
matches = re.match(
|
|
r'^\s*TransportProxy\s+(\S*)\s+\S+:(\d+)\s*$', line)
|
|
if matches:
|
|
ports[matches.group(1)] = matches.group(2)
|
|
except FileNotFoundError:
|
|
pass
|
|
|
|
return ports
|
|
|
|
|
|
def _get_orport() -> str:
|
|
"""Return the ORPort by querying running instance."""
|
|
cookie_bytes = open(TOR_AUTH_COOKIE, 'rb').read()
|
|
cookie = codecs.encode(cookie_bytes, 'hex').decode()
|
|
|
|
commands = '''AUTHENTICATE {cookie}
|
|
GETINFO net/listeners/or
|
|
QUIT
|
|
'''.format(cookie=cookie)
|
|
|
|
tor_socket = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
|
|
tor_socket.connect(('localhost', 9051))
|
|
tor_socket.send(commands.encode())
|
|
response = tor_socket.recv(1024)
|
|
tor_socket.close()
|
|
|
|
line = response.split(b'\r\n')[1].decode()
|
|
matches = re.match(r'.*=".+:(\d+)"', line)
|
|
if not matches:
|
|
raise ValueError('Invalid orport value returned by Tor')
|
|
|
|
return matches.group(1)
|
|
|
|
|
|
def _get_hidden_service(aug=None) -> dict[str, Any]:
|
|
"""Return a string with configured Tor hidden service information."""
|
|
hs_enabled = False
|
|
hs_status = 'Ok'
|
|
hs_hostname = None
|
|
hs_ports = []
|
|
|
|
if not aug:
|
|
aug = augeas_load()
|
|
|
|
hs_dir = aug.get(TOR_CONFIG_AUG + '/HiddenServiceDir')
|
|
hs_port_paths = aug.match(TOR_CONFIG_AUG + '/HiddenServicePort')
|
|
|
|
for hs_port_path in hs_port_paths:
|
|
port_info = aug.get(hs_port_path).split()
|
|
hs_ports.append({'virtport': port_info[0], 'target': port_info[1]})
|
|
|
|
if not hs_dir:
|
|
hs_status = 'Not Configured'
|
|
else:
|
|
try:
|
|
with open(os.path.join(hs_dir, 'hostname'), 'r',
|
|
encoding='utf-8') as conf_file:
|
|
hs_hostname = conf_file.read().strip()
|
|
hs_enabled = True
|
|
except Exception:
|
|
hs_status = 'Not available (Run Tor at least once)'
|
|
|
|
return {
|
|
'enabled': hs_enabled,
|
|
'status': hs_status,
|
|
'hostname': hs_hostname,
|
|
'ports': hs_ports
|
|
}
|
|
|
|
|
|
def _use_upstream_bridges(use_upstream_bridges: bool | None = None, aug=None):
|
|
"""Enable use of upstream bridges."""
|
|
if use_upstream_bridges is None:
|
|
return
|
|
|
|
if not aug:
|
|
aug = augeas_load()
|
|
|
|
if use_upstream_bridges:
|
|
aug.set(TOR_CONFIG_AUG + '/UseBridges', '1')
|
|
else:
|
|
aug.set(TOR_CONFIG_AUG + '/UseBridges', '0')
|
|
|
|
aug.save()
|
|
|
|
|
|
def _set_upstream_bridges(upstream_bridges=None, aug=None):
|
|
"""Set list of upstream bridges."""
|
|
if upstream_bridges is None:
|
|
return
|
|
|
|
if not aug:
|
|
aug = augeas_load()
|
|
|
|
aug.remove(TOR_CONFIG_AUG + '/Bridge')
|
|
if upstream_bridges:
|
|
bridges = [bridge.strip() for bridge in upstream_bridges.split('\n')]
|
|
bridges = [bridge for bridge in bridges if bridge]
|
|
for bridge in bridges:
|
|
parts = [part for part in bridge.split() if part]
|
|
bridge = ' '.join(parts)
|
|
aug.set(TOR_CONFIG_AUG + '/Bridge[last() + 1]', bridge.strip())
|
|
|
|
aug.set(TOR_CONFIG_AUG + '/ClientTransportPlugin',
|
|
'obfs3,scramblesuit,obfs4 exec /usr/bin/obfs4proxy')
|
|
|
|
aug.save()
|
|
|
|
|
|
def _enable_relay(relay: bool | None, bridge: bool | None, aug: augeas.Augeas):
|
|
"""Enable Tor bridge relay."""
|
|
if relay is None and bridge is None:
|
|
return
|
|
|
|
if not aug:
|
|
aug = augeas_load()
|
|
|
|
use_upstream_bridges = _are_upstream_bridges_enabled(aug)
|
|
|
|
if relay and not use_upstream_bridges:
|
|
aug.set(TOR_CONFIG_AUG + '/ORPort[1]', '9001')
|
|
aug.set(TOR_CONFIG_AUG + '/ORPort[2]', '[::]:9001')
|
|
elif relay is not None:
|
|
aug.remove(TOR_CONFIG_AUG + '/ORPort')
|
|
|
|
if bridge and not use_upstream_bridges:
|
|
aug.set(TOR_CONFIG_AUG + '/BridgeRelay', '1')
|
|
aug.set(TOR_CONFIG_AUG + '/ServerTransportPlugin',
|
|
'obfs3,obfs4 exec /usr/bin/obfs4proxy')
|
|
aug.set(TOR_CONFIG_AUG + '/ExtORPort', 'auto')
|
|
elif bridge is not None:
|
|
aug.remove(TOR_CONFIG_AUG + '/BridgeRelay')
|
|
aug.remove(TOR_CONFIG_AUG + '/ServerTransportPlugin')
|
|
aug.remove(TOR_CONFIG_AUG + '/ExtORPort')
|
|
|
|
aug.save()
|
|
|
|
|
|
def _enable_hs(aug=None):
|
|
"""Enable Tor hidden service."""
|
|
if not aug:
|
|
aug = augeas_load()
|
|
|
|
if _get_hidden_service(aug)['enabled']:
|
|
return
|
|
|
|
aug.set(TOR_CONFIG_AUG + '/HiddenServiceDir',
|
|
f'/var/lib/tor-instances/{INSTANCE_NAME}/hidden_service')
|
|
aug.set(TOR_CONFIG_AUG + '/HiddenServicePort[1]', '22 127.0.0.1:22')
|
|
aug.set(TOR_CONFIG_AUG + '/HiddenServicePort[2]', '80 127.0.0.1:80')
|
|
aug.set(TOR_CONFIG_AUG + '/HiddenServicePort[3]', '443 127.0.0.1:443')
|
|
aug.save()
|
|
_set_onion_header(_get_hidden_service(aug))
|
|
|
|
|
|
def _disable_hs(aug=None):
|
|
"""Disable Tor hidden service."""
|
|
if not aug:
|
|
aug = augeas_load()
|
|
|
|
if not _get_hidden_service(aug)['enabled']:
|
|
return
|
|
|
|
aug.remove(TOR_CONFIG_AUG + '/HiddenServiceDir')
|
|
aug.remove(TOR_CONFIG_AUG + '/HiddenServicePort')
|
|
aug.save()
|
|
_set_onion_header(None)
|
|
|
|
|
|
def _update_port(name, number):
|
|
"""Update firewall service information for single port."""
|
|
lines = """<?xml version="1.0" encoding="utf-8"?>
|
|
<service>
|
|
<short>Tor - {0}</short>
|
|
<port protocol="tcp" port="{1}"/>
|
|
</service>
|
|
"""
|
|
try:
|
|
with open(SERVICE_FILE.format(name), 'w',
|
|
encoding='utf-8') as service_file:
|
|
service_file.writelines(lines.format(name, number))
|
|
except FileNotFoundError:
|
|
return
|
|
|
|
|
|
def _update_ports():
|
|
"""Update firewall service information."""
|
|
ready = False
|
|
tries = 0
|
|
|
|
# port information may not be available immediately after Tor started
|
|
while not ready:
|
|
ports = _get_ports()
|
|
ready = 'orport' in ports and 'obfs3' in ports and 'obfs4' in ports
|
|
if ready:
|
|
break
|
|
|
|
tries += 1
|
|
if tries >= 12:
|
|
return
|
|
|
|
time.sleep(10)
|
|
|
|
for name, number in ports.items():
|
|
_update_port(name, number)
|
|
|
|
# XXX: We should ideally do firewalld reload instead. However,
|
|
# firewalld seems to fail to successfully reload sometimes.
|
|
action_utils.service_restart('firewalld')
|
|
|
|
|
|
def augeas_load():
|
|
"""Initialize Augeas."""
|
|
aug = augeas.Augeas(flags=augeas.Augeas.NO_LOAD +
|
|
augeas.Augeas.NO_MODL_AUTOLOAD)
|
|
aug.set('/augeas/load/Tor/lens', 'Tor.lns')
|
|
aug.set('/augeas/load/Tor/incl[last() + 1]', TOR_CONFIG)
|
|
aug.load()
|
|
return aug
|
|
|
|
|
|
def _set_onion_header(hidden_service):
|
|
"""Set Apache configuration for the Onion-Location header."""
|
|
logger.info('Setting Onion-Location header for Apache')
|
|
config_file = pathlib.Path(TOR_APACHE_SITE)
|
|
if hidden_service and hidden_service['enabled']:
|
|
# https://community.torproject.org/onion-services/advanced/onion-location/
|
|
hostname = hidden_service['hostname']
|
|
config_contents = f'''# This file is managed by FreedomBox
|
|
<LocationMatch "^(?!/(wordpress|mediawiki|tt-rss))/[^/]+">
|
|
Header set Onion-Location "http://{hostname}%{{REQUEST_URI}}s"
|
|
</LocationMatch>
|
|
'''
|
|
config_file.write_text(config_contents, encoding='utf-8')
|
|
else:
|
|
config_file.write_text('# This file is managed by FreedomBox\n',
|
|
encoding='utf-8')
|
|
|
|
action_utils.service_reload('apache2')
|
|
|
|
|
|
@privileged
|
|
def uninstall():
|
|
"""Remove plinth instance."""
|
|
directories = [
|
|
f'/etc/tor/instances/{INSTANCE_NAME}/',
|
|
f'/var/lib/tor-instances/{INSTANCE_NAME}/',
|
|
f'/var/run/tor-instances/{INSTANCE_NAME}/'
|
|
]
|
|
for directory in directories:
|
|
shutil.rmtree(directory, ignore_errors=True)
|
|
|
|
os.unlink(f'/var/run/tor-instances/{INSTANCE_NAME}.defaults')
|
|
action_utils.service_unmask(SERVICE_NAME)
|