October 2017 - tor-commits - lists.torproject.org

[torspec/master] Add clarifications to the authenticaiton mechanisms
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 9e9d61ba48c5ec6a854eef730a6cca8323c7a5f9 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Oct 20 13:41:38 2017 -0500 Add clarifications to the authenticaiton mechanisms --- control-spec.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 555e625..6b2c2eb 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -360,6 +360,12 @@ Sent from the client to the server. The syntax is: "AUTHENTICATE" [ SP 1*HEXDIG / QuotedString ] CRLF + This command is used to authenticate to the server. The provided string is + either the original password represented as a QuotedString if HASHEDPASSWORD + is to be used, the contents of the cookie file formatted as hexidecimal if + COOKIE is to be used, or the resulting HMAC if AUTHCHALLENGE has been + previously sent (and therefore SAFECOOKIE is to be used). + The server responds with "250 OK" on success or "515 Bad authentication" if the authentication cookie is incorrect. Tor closes the connection on an authentication failure. @@ -1377,6 +1383,9 @@ ClientNonce = 2*HEXDIG / QuotedString + This command is used to begin the authentication routine for the + SAFECOOKIE method of authentication. + If the server accepts the command, the server reply format is: "250 AUTHCHALLENGE" SP "SERVERHASH=" ServerHash

1 0

[torspec/master] Remove next-circuit.
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 226a54418ca84446d1902f7abb9a89937476e5c8 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Oct 20 11:55:36 2017 -0500 Remove next-circuit. It is not documented anywhere else, nor implemented. It is not clear if the TODO refers to the documentation of the feature, or the feature itself. Just remove it and we can add it back if it's implemented. --- control-spec.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 50a59dd..78f02e7 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -747,9 +747,6 @@ Maps IP addresses to 2-letter country codes. For example, "GETINFO ip-to-country/18.0.0.1" should give "US". - "next-circuit/IP:port" - XXX todo. - "process/pid" -- Process id belonging to the main tor process. "process/uid" -- User id running the tor process, -1 if unknown (this is unimplemented on Windows, returning -1).

1 0

[torspec/master] Break up a paragraph into bullet points
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit c912116e9bc300a867a180364765bac10e9fd779 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 08:31:08 2017 -0400 Break up a paragraph into bullet points Also, s/hexidecimal/hexadecimal/. --- control-spec.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index f2af07e..19eabcf 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -361,10 +361,15 @@ "AUTHENTICATE" [ SP 1*HEXDIG / QuotedString ] CRLF This command is used to authenticate to the server. The provided string is - either the original password represented as a QuotedString if HASHEDPASSWORD - is to be used, the contents of the cookie file formatted as hexidecimal if - COOKIE is to be used, or the resulting HMAC if AUTHCHALLENGE has been - previously sent (and therefore SAFECOOKIE is to be used). + one of the following: + * (For the HASHEDPASSWORD authentication method; see 3.21) + The original password represented as a QuotedString. + + * (For the COOKIE is authentication method; see 3.21) + The contents of the cookie file, formatted in hexadecimal + + * (For the SAFECOOKIE authentication method; see 3.21) + The HMAC based on the AUTHCHALLENGE message, in hexadecimal. The server responds with "250 OK" on success or "515 Bad authentication" if the authentication cookie is incorrect. Tor closes the connection on an

1 0

[torspec/master] Merge remote-tracking branch 'tomrittervg/control-spec-editorial-1'
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit cc55d0a7296a521f6f2fd940480330e22e6ff5ab Merge: 4074b89 9e9d61b Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 08:28:29 2017 -0400 Merge remote-tracking branch 'tomrittervg/control-spec-editorial-1' control-spec.txt | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)

1 0

[torspec/master] Explain the PROTOCOLINFO command
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 144f33690d523acad9cbe54af26e8dac83f1adb2 Author: Tom Ritter <tom(a)ritter.vg> Date: Fri Oct 20 12:22:53 2017 -0500 Explain the PROTOCOLINFO command --- control-spec.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/control-spec.txt b/control-spec.txt index 78f02e7..555e625 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1268,6 +1268,9 @@ PIVERSION: 1*DIGIT + This command tells the controller what kinds of authentication are + supported. + Tor MAY give its InfoLines in any order; controllers MUST ignore InfoLines with keywords they do not recognize. Controllers MUST ignore extraneous data on any InfoLine.

1 0

[tor/maint-0.3.2] Have LOG_PROTOCOL_WARN call its own function
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 48ee85e0c6c83c31693bc58ca4e8e91c8031421d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 12:20:58 2017 -0400 Have LOG_PROTOCOL_WARN call its own function Also, make the function that implements LOG_PROTOCOL_WARN use a cached value of the desired loglevel, rather than calling get_options(). --- changes/bug23952 | 4 ++++ src/or/config.c | 22 ++++++++++++++++++++++ src/or/config.h | 1 + src/or/or.h | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/changes/bug23952 b/changes/bug23952 new file mode 100644 index 000000000..ab1462e52 --- /dev/null +++ b/changes/bug23952 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Avoid a BUG warning when receiving a dubious CREATE cell while + an option transition is in progress. Fixes bug 23952; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 94c4d790a..a2353b94d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1030,6 +1030,23 @@ escaped_safe_str(const char *address) return escaped(address); } +/** + * The severity level that should be used for warnings of severity + * LOG_PROTOCOL_WARN. + * + * We keep this outside the options, in case somebody needs to use + * LOG_PROTOCOL_WARN while an option transition is happening. + */ +static int protocol_warning_severity_level = LOG_WARN; + +/** Return the severity level that should be used for warnings of severity + * LOG_PROTOCOL_WARN. */ +int +get_protocol_warning_severity_level(void) +{ + return protocol_warning_severity_level; +} + /** List of default directory authorities */ static const char *default_authorities[] = { @@ -1667,6 +1684,11 @@ options_act(const or_options_t *old_options) return -1; } + if (options->ProtocolWarnings) + protocol_warning_severity_level = LOG_WARN; + else + protocol_warning_severity_level = LOG_INFO; + if (consider_adding_dir_servers(options, old_options) < 0) return -1; diff --git a/src/or/config.h b/src/or/config.h index f69a3c483..af945f16b 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -31,6 +31,7 @@ const char *safe_str_client(const char *address); const char *safe_str(const char *address); const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); +int get_protocol_warning_severity_level(void); const char *get_version(void); const char *get_short_version(void); setopt_err_t options_trial_assign(config_line_t *list, unsigned flags, diff --git a/src/or/or.h b/src/or/or.h index 5bd07ba6a..8c1ef478e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4079,8 +4079,6 @@ typedef struct { int Sandbox; /**< Boolean: should sandboxing be enabled? */ int SafeSocks; /**< Boolean: should we outright refuse application * connections that use socks4 or socks5-with-local-dns? */ -#define LOG_PROTOCOL_WARN (get_options()->ProtocolWarnings ? \ - LOG_WARN : LOG_INFO) int ProtocolWarnings; /**< Boolean: when other parties screw up the Tor * protocol, is it a warn or an info in our logs? */ int TestSocks; /**< Boolean: when we get a socks connection, do we loudly @@ -4627,6 +4625,8 @@ typedef struct { smartlist_t *SchedulerTypes_; } or_options_t; +#define LOG_PROTOCOL_WARN (get_protocol_warning_severity_level()) + /** Persistent state for an onion router, as saved to disk. */ typedef struct { uint32_t magic_;

1 0

[tor/release-0.3.2] Have LOG_PROTOCOL_WARN call its own function
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 48ee85e0c6c83c31693bc58ca4e8e91c8031421d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 12:20:58 2017 -0400 Have LOG_PROTOCOL_WARN call its own function Also, make the function that implements LOG_PROTOCOL_WARN use a cached value of the desired loglevel, rather than calling get_options(). --- changes/bug23952 | 4 ++++ src/or/config.c | 22 ++++++++++++++++++++++ src/or/config.h | 1 + src/or/or.h | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/changes/bug23952 b/changes/bug23952 new file mode 100644 index 000000000..ab1462e52 --- /dev/null +++ b/changes/bug23952 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Avoid a BUG warning when receiving a dubious CREATE cell while + an option transition is in progress. Fixes bug 23952; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 94c4d790a..a2353b94d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1030,6 +1030,23 @@ escaped_safe_str(const char *address) return escaped(address); } +/** + * The severity level that should be used for warnings of severity + * LOG_PROTOCOL_WARN. + * + * We keep this outside the options, in case somebody needs to use + * LOG_PROTOCOL_WARN while an option transition is happening. + */ +static int protocol_warning_severity_level = LOG_WARN; + +/** Return the severity level that should be used for warnings of severity + * LOG_PROTOCOL_WARN. */ +int +get_protocol_warning_severity_level(void) +{ + return protocol_warning_severity_level; +} + /** List of default directory authorities */ static const char *default_authorities[] = { @@ -1667,6 +1684,11 @@ options_act(const or_options_t *old_options) return -1; } + if (options->ProtocolWarnings) + protocol_warning_severity_level = LOG_WARN; + else + protocol_warning_severity_level = LOG_INFO; + if (consider_adding_dir_servers(options, old_options) < 0) return -1; diff --git a/src/or/config.h b/src/or/config.h index f69a3c483..af945f16b 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -31,6 +31,7 @@ const char *safe_str_client(const char *address); const char *safe_str(const char *address); const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); +int get_protocol_warning_severity_level(void); const char *get_version(void); const char *get_short_version(void); setopt_err_t options_trial_assign(config_line_t *list, unsigned flags, diff --git a/src/or/or.h b/src/or/or.h index 5bd07ba6a..8c1ef478e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4079,8 +4079,6 @@ typedef struct { int Sandbox; /**< Boolean: should sandboxing be enabled? */ int SafeSocks; /**< Boolean: should we outright refuse application * connections that use socks4 or socks5-with-local-dns? */ -#define LOG_PROTOCOL_WARN (get_options()->ProtocolWarnings ? \ - LOG_WARN : LOG_INFO) int ProtocolWarnings; /**< Boolean: when other parties screw up the Tor * protocol, is it a warn or an info in our logs? */ int TestSocks; /**< Boolean: when we get a socks connection, do we loudly @@ -4627,6 +4625,8 @@ typedef struct { smartlist_t *SchedulerTypes_; } or_options_t; +#define LOG_PROTOCOL_WARN (get_protocol_warning_severity_level()) + /** Persistent state for an onion router, as saved to disk. */ typedef struct { uint32_t magic_;

1 0

[tor/maint-0.3.2] Merge branch 'bug23952_032' into maint-0.3.2
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 0d4addfc73c2647357aaaede54dbf936ff189b2e Merge: b1d6cf250 48ee85e0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 08:24:12 2017 -0400 Merge branch 'bug23952_032' into maint-0.3.2 changes/bug23952 | 4 ++++ src/or/config.c | 22 ++++++++++++++++++++++ src/or/config.h | 1 + src/or/or.h | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug23952_032' into maint-0.3.2
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 0d4addfc73c2647357aaaede54dbf936ff189b2e Merge: b1d6cf250 48ee85e0c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 24 08:24:12 2017 -0400 Merge branch 'bug23952_032' into maint-0.3.2 changes/bug23952 | 4 ++++ src/or/config.c | 22 ++++++++++++++++++++++ src/or/config.h | 1 + src/or/or.h | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-)

1 0

[tor/master] Have LOG_PROTOCOL_WARN call its own function
by nickm＠torproject.org 24 Oct '17

24 Oct '17

commit 48ee85e0c6c83c31693bc58ca4e8e91c8031421d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 23 12:20:58 2017 -0400 Have LOG_PROTOCOL_WARN call its own function Also, make the function that implements LOG_PROTOCOL_WARN use a cached value of the desired loglevel, rather than calling get_options(). --- changes/bug23952 | 4 ++++ src/or/config.c | 22 ++++++++++++++++++++++ src/or/config.h | 1 + src/or/or.h | 4 ++-- 4 files changed, 29 insertions(+), 2 deletions(-) diff --git a/changes/bug23952 b/changes/bug23952 new file mode 100644 index 000000000..ab1462e52 --- /dev/null +++ b/changes/bug23952 @@ -0,0 +1,4 @@ + o Minor bugfixes (relay): + - Avoid a BUG warning when receiving a dubious CREATE cell while + an option transition is in progress. Fixes bug 23952; bugfix on + 0.3.2.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 94c4d790a..a2353b94d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -1030,6 +1030,23 @@ escaped_safe_str(const char *address) return escaped(address); } +/** + * The severity level that should be used for warnings of severity + * LOG_PROTOCOL_WARN. + * + * We keep this outside the options, in case somebody needs to use + * LOG_PROTOCOL_WARN while an option transition is happening. + */ +static int protocol_warning_severity_level = LOG_WARN; + +/** Return the severity level that should be used for warnings of severity + * LOG_PROTOCOL_WARN. */ +int +get_protocol_warning_severity_level(void) +{ + return protocol_warning_severity_level; +} + /** List of default directory authorities */ static const char *default_authorities[] = { @@ -1667,6 +1684,11 @@ options_act(const or_options_t *old_options) return -1; } + if (options->ProtocolWarnings) + protocol_warning_severity_level = LOG_WARN; + else + protocol_warning_severity_level = LOG_INFO; + if (consider_adding_dir_servers(options, old_options) < 0) return -1; diff --git a/src/or/config.h b/src/or/config.h index f69a3c483..af945f16b 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -31,6 +31,7 @@ const char *safe_str_client(const char *address); const char *safe_str(const char *address); const char *escaped_safe_str_client(const char *address); const char *escaped_safe_str(const char *address); +int get_protocol_warning_severity_level(void); const char *get_version(void); const char *get_short_version(void); setopt_err_t options_trial_assign(config_line_t *list, unsigned flags, diff --git a/src/or/or.h b/src/or/or.h index 5bd07ba6a..8c1ef478e 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4079,8 +4079,6 @@ typedef struct { int Sandbox; /**< Boolean: should sandboxing be enabled? */ int SafeSocks; /**< Boolean: should we outright refuse application * connections that use socks4 or socks5-with-local-dns? */ -#define LOG_PROTOCOL_WARN (get_options()->ProtocolWarnings ? \ - LOG_WARN : LOG_INFO) int ProtocolWarnings; /**< Boolean: when other parties screw up the Tor * protocol, is it a warn or an info in our logs? */ int TestSocks; /**< Boolean: when we get a socks connection, do we loudly @@ -4627,6 +4625,8 @@ typedef struct { smartlist_t *SchedulerTypes_; } or_options_t; +#define LOG_PROTOCOL_WARN (get_protocol_warning_severity_level()) + /** Persistent state for an onion router, as saved to disk. */ typedef struct { uint32_t magic_;

1 0