mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 07:07:52 +01:00
Code Issues Projects Releases Wiki Activity

config: Remove WarnUnsafeSocks option

Browse source 
Deprecated in 0.2.9.2-alpha, this commits changes it as OBSOLETE() and cleans
up the code associated with it.

Partially fixes #22060

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2017-04-25 14:08:40 -04:00 • committed by Nick Mathewson
parent 60cf5ac297
commit 8aedc589ed
5 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changes/bug22060
View file

@ -15,3 +15,5 @@
- CloseHSServiceRendCircuitsImmediatelyOnTimeout was deprecated in - CloseHSServiceRendCircuitsImmediatelyOnTimeout was deprecated in
0.2.9.2-alpha and now has been rendered obsolete. Code has been removed 0.2.9.2-alpha and now has been rendered obsolete. Code has been removed
and feature no longer exists. and feature no longer exists.
- WarnUnsafeSocks was deprecated in 0.2.9.2-alpha and now has been
rendered obsolete. Code has been removed and feature no longer exists.

6
doc/tor.1.txt
View file

@ -1271,12 +1271,6 @@ The following options are useful only for clients (that is, if
helps to determine whether an application using Tor is possibly leaking helps to determine whether an application using Tor is possibly leaking
DNS requests. (Default: 0) DNS requests. (Default: 0)
[[WarnUnsafeSocks]] **WarnUnsafeSocks** **0**|**1**::
When this option is enabled, Tor will warn whenever a request is
received that only contains an IP address instead of a hostname. Allowing
applications to do DNS resolves themselves is usually a bad idea and
can leak your location to attackers. (Default: 1)
[[VirtualAddrNetworkIPv4]] **VirtualAddrNetworkIPv4** __Address__/__bits__ + [[VirtualAddrNetworkIPv4]] **VirtualAddrNetworkIPv4** __Address__/__bits__ +
[[VirtualAddrNetworkIPv6]] **VirtualAddrNetworkIPv6** [__Address__]/__bits__:: [[VirtualAddrNetworkIPv6]] **VirtualAddrNetworkIPv6** [__Address__]/__bits__::

5
src/or/buffers.c
View file

@ -1319,7 +1319,7 @@ fetch_from_buf_http(buf_t *buf,
/** /**
* Wait this many seconds before warning the user about using SOCKS unsafely * Wait this many seconds before warning the user about using SOCKS unsafely
* again (requires that WarnUnsafeSocks is turned on). */ * again. */
#define SOCKS_WARN_INTERVAL 5 #define SOCKS_WARN_INTERVAL 5
/** Warn that the user application has made an unsafe socks request using /** Warn that the user application has made an unsafe socks request using
@ -1331,9 +1331,6 @@ log_unsafe_socks_warning(int socks_protocol, const char *address,
{ {
static ratelim_t socks_ratelim = RATELIM_INIT(SOCKS_WARN_INTERVAL); static ratelim_t socks_ratelim = RATELIM_INIT(SOCKS_WARN_INTERVAL);
const or_options_t *options = get_options();
if (! options->WarnUnsafeSocks)
return;
if (safe_socks) { if (safe_socks) {
log_fn_ratelim(&socks_ratelim, LOG_WARN, LD_APP, log_fn_ratelim(&socks_ratelim, LOG_WARN, LD_APP,
"Your application (using socks%d to port %d) is giving " "Your application (using socks%d to port %d) is giving "

4
src/or/config.c
View file

@ -402,7 +402,7 @@ static config_var_t option_vars_[] = {
VPORT(NATDPort), VPORT(NATDPort),
V(Nickname, STRING, NULL), V(Nickname, STRING, NULL),
V(PredictedPortsRelevanceTime, INTERVAL, "1 hour"), V(PredictedPortsRelevanceTime, INTERVAL, "1 hour"),
V(WarnUnsafeSocks, BOOL, "1"), OBSOLETE("WarnUnsafeSocks"),
VAR("NodeFamily", LINELIST, NodeFamilies, NULL), VAR("NodeFamily", LINELIST, NodeFamilies, NULL),
V(NumCPUs, UINT, "0"), V(NumCPUs, UINT, "0"),
V(NumDirectoryGuards, UINT, "0"), V(NumDirectoryGuards, UINT, "0"),
@ -664,8 +664,6 @@ static const config_deprecation_t option_deprecation_notes_[] = {
"a wide variety of application-level attacks." }, "a wide variety of application-level attacks." },
{ "ClientDNSRejectInternalAddresses", "Turning this on makes your client " { "ClientDNSRejectInternalAddresses", "Turning this on makes your client "
"easier to fingerprint, and may open you to esoteric attacks." }, "easier to fingerprint, and may open you to esoteric attacks." },
{ "WarnUnsafeSocks", "Changing this option makes it easier for you "
"to accidentally lose your anonymity by leaking DNS information" },
{ "TLSECGroup", "The default is a nice secure choice; the other option " { "TLSECGroup", "The default is a nice secure choice; the other option "
"is less secure." }, "is less secure." },
{ "ControlListenAddress", "Use ControlPort instead." }, { "ControlListenAddress", "Use ControlPort instead." },

4
src/or/or.h
View file

@ -4110,10 +4110,6 @@ typedef struct {
* selection. */ * selection. */
int AllowDotExit; int AllowDotExit;
/** If true, we will warn if a user gives us only an IP address
* instead of a hostname. */
int WarnUnsafeSocks;
/** If true, we're configured to collect statistics on clients /** If true, we're configured to collect statistics on clients
* requesting network statuses from us as directory. */ * requesting network statuses from us as directory. */
int DirReqStatistics_option; int DirReqStatistics_option;