From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peter =?utf-8?q?M=C3=BCller?= To: development@lists.ipfire.org Subject: [PATCH 2/4] Tor: allow enforcing distinct Guard relays or countries Date: Wed, 04 Nov 2020 22:28:50 +0100 Message-ID: In-Reply-To: <88bdbdd4-1418-1be0-6240-3123ca64c00c@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4655158648754265081==" List-Id: --===============4655158648754265081== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable In order to make deanonymisation harder, especially high-risk Tor users might want to use certain Guard relays only (for example operated by people they trust), enforce Tor to use Guard relays in certain countries only (for example countries with very strict data protection laws or poor diplomatic relations), or avoid Guard relays in certain countries entirely. Since Tor sticks to sampled Guards for a long time (usually within the range of months), restricting those is believed to cause less harm to a users' anonymity than restricting Exit relays, since their diversity of a generic Tor user is significantly higher. This patch extends the Tor CGI for restricting Guard nodes to certain countries or relays matching certain fingerprints. Signed-off-by: Peter M=C3=BCller --- html/cgi-bin/tor.cgi | 93 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 90 insertions(+), 3 deletions(-) diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi index 3db4bc22c..74fa36247 100644 --- a/html/cgi-bin/tor.cgi +++ b/html/cgi-bin/tor.cgi @@ -99,6 +99,8 @@ $settings{'TOR_ENABLED'} =3D 'off'; $settings{'TOR_SOCKS_PORT'} =3D 9050; $settings{'TOR_EXIT_COUNTRY'} =3D ''; $settings{'TOR_USE_EXIT_NODES'} =3D ''; +$settings{'TOR_GUARD_COUNTRY'} =3D ''; +$settings{'TOR_USE_GUARD_NODES'} =3D ''; $settings{'TOR_ALLOWED_SUBNETS'} =3D "$netsettings{'GREEN_NETADDRESS'}\/$net= settings{'GREEN_NETMASK'}"; if (&Header::blue_used()) { $settings{'TOR_ALLOWED_SUBNETS'} .=3D ",$netsettings{'BLUE_NETADDRESS'}\/$n= etsettings{'BLUE_NETMASK'}"; @@ -181,6 +183,15 @@ if ($settings{'ACTION'} eq $Lang::tr{'save'}) { } } =20 + @temp =3D split(/[\n,]/,$settings{'TOR_USE_GUARD_NODES'}); + $settings{'TOR_USE_GUARD_NODES'} =3D ""; + foreach (@temp) { + s/^\s+//g; s/\s+$//g; + if ($_) { + $settings{'TOR_USE_GUARD_NODES'} .=3D $_.","; + } + } + # Burst bandwidth must be less or equal to bandwidth rate. if ($settings{'TOR_RELAY_BANDWIDTH_RATE'} =3D=3D 0) { $settings{'TOR_RELAY_BANDWIDTH_BURST'} =3D 0; @@ -284,6 +295,9 @@ END @temp =3D split(",", $settings{'TOR_USE_EXIT_NODES'}); $settings{'TOR_USE_EXIT_NODES'} =3D join("\n", @temp); =20 + @temp =3D split(",", $settings{'TOR_USE_GUARD_NODES'}); + $settings{'TOR_USE_GUARD_NODES'} =3D join("\n", @temp); + print <
@@ -306,8 +320,57 @@ END =20 -
-
+
+
+ + + + + + + + + + + + + +
$Lang:= :tr{'tor guard nodes'}
$Lang::tr{'tor use guard = nodes'}:
+ + +
+ +
+
=20 @@ -323,7 +386,7 @@ END END =20 - # Convert Exit/Guard country strings into lists to make comparison easier + # Convert Exit country strings into lists to make comparison easier my @exit_countries; if ($settings{'TOR_EXIT_COUNTRY'} ne '') { @exit_countries =3D split(/\|/, $settings{'TOR_EXIT_COUNTRY'}); @@ -683,6 +746,30 @@ sub BuildConfiguration() { } print FILE "SocksPolicy reject *\n" if (@subnets); =20 + if ($settings{'TOR_GUARD_COUNTRY'} ne '') { + $strict_nodes =3D 1; + my $countrylist; + + for my $singlecountry (split(/\|/, $settings{'TOR_GUARD_COUNTRY'})) { + if ($countrylist eq '') { + $countrylist =3D "{" . lc $singlecountry . "}"; + } else { + $countrylist =3D $countrylist . "," . "{" . lc $singlecountry . "}"; + } + } + + print FILE "EntryNodes $countrylist\n"; + } + + if ($settings{'TOR_USE_GUARD_NODES'} ne '') { + $strict_nodes =3D 1; + + my @nodes =3D split(",", $settings{'TOR_USE_GUARD_NODES'}); + foreach (@nodes) { + print FILE "EntryNode $_\n"; + } + } + if ($settings{'TOR_EXIT_COUNTRY'} ne '') { $strict_nodes =3D 1; my $countrylist; --=20 2.26.2 --===============4655158648754265081==--