July 2018 - tor-commits - lists.torproject.org

[torspec/master] Fix definition of Value
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit db21d86d87d034ea63d88c9eb7f379d344b53bce Author: juga0 <juga(a)riseup.net> Date: Thu Jun 28 17:51:37 2018 +0000 Fix definition of Value ArgumentChar is already defined in 1.2. Also change definitions order. --- dir-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index 83718fc..e11ead1 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2091,9 +2091,9 @@ [At most once in votes; none in consensuses] - Value ::= any printing ASCII character except NL and SP. - KeyValue ::= Keyword '=' Value KeyValues ::= KeyValue | KeyValues SP KeyValue + KeyValue ::= Keyword '=' Value + Value ::= ArgumentCharValue+ The headers from the bandwidth file used to generate this vote. The bandwidth file headers are described in bandwidth-file-spec.txt.

1 0

[torspec/master] fixup! bandwidth-file only apears in votes, no consensuses
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 5a43d316a00ea07a533c50cf6c2650d17110ca2d Author: juga0 <juga(a)riseup.net> Date: Fri Jun 29 07:13:51 2018 +0000 fixup! bandwidth-file only apears in votes, no consensuses --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index 3ac17fb..a9db187 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2089,7 +2089,7 @@ "bandwidth-file-headers" SP KeyValues NL - [At most once in votes; none in consensuses] + [At most once for votes; does not occur in consensuses.] KeyValues ::= KeyValue | KeyValues SP KeyValue KeyValue ::= Keyword '=' Value

1 0

[torspec/master] bandwidth-file only apears in votes, no consensuses
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit d2b8ca550716c7ebfeeb386452bd84f4c8250608 Author: juga0 <juga(a)riseup.net> Date: Thu Jun 28 17:46:01 2018 +0000 bandwidth-file only apears in votes, no consensuses --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index bcb04a5..829c0d0 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2089,7 +2089,7 @@ "bandwidth-file" SP KeyValues NL - [At most once] + [At most once in votes; none in consensuses] Value ::= any printing ASCII character except NL and SP. KeyValue ::= Keyword '=' Value

1 0

[torspec/master] Clarify why latest_bandwidth is the same as timestamp
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 60314826be64fcf98c2481630431b13dc700cb63 Author: juga0 <juga(a)riseup.net> Date: Fri Jun 29 07:21:58 2018 +0000 Clarify why latest_bandwidth is the same as timestamp --- dir-spec.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index 601f4c2..dd835ad 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2113,6 +2113,9 @@ and UTC time zone when the first relay bandwidth was obtained. "latest_bandwidth" -- the date and time timestamp in ISO 8601 format and UTC time zone of the most recent generator result. + This time MUST be identical to the initial Timestamp line. + This duplicate value is included to make the format easier for people + to read. First-appeared: Tor 0.3.5.1-alpha. The authority section of a vote contains the following items, followed

1 0

[torspec/master] Use the same words in timestamp as latest_bandwidth
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit e7f10ed2811bad5451baa6e370dc724b57b381eb Author: juga0 <juga(a)riseup.net> Date: Fri Jun 29 07:19:58 2018 +0000 Use the same words in timestamp as latest_bandwidth --- dir-spec.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dir-spec.txt b/dir-spec.txt index eb4e8fe..601f4c2 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2099,8 +2099,8 @@ The bandwidth file headers are described in bandwidth-file-spec.txt. Current Keywords: - "timestamp" -- the Unix Epoch time in seconds when the latest generator - result was obtained. + "timestamp" -- the Unix Epoch time in seconds of the most recent + generator result. "version" -- the Bandwidth List format document specification version. "software" -- the name of the software that created the document. "software_version" -- the version of the software that created the

1 0

[torspec/master] fixup! fixup! Fix definition of Value
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit d200f1e939c414649dc0d2a6f822a5923131ec25 Author: juga0 <juga(a)riseup.net> Date: Fri Jun 29 08:53:45 2018 +0000 fixup! fixup! Fix definition of Value --- dir-spec.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index dd835ad..f2447c2 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2093,7 +2093,8 @@ KeyValues ::= KeyValue | KeyValues SP KeyValue KeyValue ::= Keyword '=' Value - Value ::= ArgumentChar+ + Value ::= ArgumentCharValue+ + ArgumentCharValue ::= any printing ASCII character except NL and SP. The headers from the bandwidth file used to generate this vote. The bandwidth file headers are described in bandwidth-file-spec.txt.

1 0

[torspec/master] fixup! Fix definition of Value
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 6395b5901a310c46e5007da8be439c1d453d6aa2 Author: juga0 <juga(a)riseup.net> Date: Fri Jun 29 07:15:11 2018 +0000 fixup! Fix definition of Value --- dir-spec.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dir-spec.txt b/dir-spec.txt index a9db187..eb4e8fe 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2093,7 +2093,7 @@ KeyValues ::= KeyValue | KeyValues SP KeyValue KeyValue ::= Keyword '=' Value - Value ::= ArgumentCharValue+ + Value ::= ArgumentChar+ The headers from the bandwidth file used to generate this vote. The bandwidth file headers are described in bandwidth-file-spec.txt.

1 0

[torspec/master] Merge remote-tracking branch 'juga/ticket26541'
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 73d4e21d80da025ae78f8fa95f3574dd082072fa Merge: 1c81861 d200f1e Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 1 10:37:10 2018 -0400 Merge remote-tracking branch 'juga/ticket26541' dir-spec.txt | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.3.3] control: Make HSPOST properly parse HSADDRESS= param
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 3f8a12a63a5a1d8b4d40451586377423c95bda09 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Jun 27 12:20:39 2018 -0400 control: Make HSPOST properly parse HSADDRESS= param For HSv3, the HSADDRESS= wasn't properly parsed for the HSPOST command. It now correctly use it and furthermore sends back a "200 OK" in case the command is successful for a v3 descriptor. Fixes #26523 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- changes/bug26523 | 5 +++++ src/or/control.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/changes/bug26523 b/changes/bug26523 new file mode 100644 index 000000000..a739d240e --- /dev/null +++ b/changes/bug26523 @@ -0,0 +1,5 @@ + o Minor bugfixes (hidden service, control port): + - The HSPOST command wasn't parsing properly the HSADDRESS= parameter and + thus not using it. It now handles it correctly. Fixes bug 26523; bugfix on + 0.3.3.1-alpha. Patch by "akwizgran". + diff --git a/src/or/control.c b/src/or/control.c index 028339f49..06360586e 100644 --- a/src/or/control.c +++ b/src/or/control.c @@ -4342,8 +4342,10 @@ handle_control_hspost(control_connection_t *conn, smartlist_t *args = smartlist_new(); - /* If any SERVER= options were specified, try parse the options line */ - if (!strcasecmpstart(argline, opt_server)) { + /* If any SERVER= or HSADDRESS= options were specified, try to parse + * the options line. */ + if (!strcasecmpstart(argline, opt_server) || + !strcasecmpstart(argline, opt_hsaddress)) { /* encoded_desc begins after a newline character */ cp = cp + 1; encoded_desc = cp; @@ -4366,11 +4368,12 @@ handle_control_hspost(control_connection_t *conn, hs_dirs = smartlist_new(); smartlist_add(hs_dirs, node->rs); } else if (!strcasecmpstart(arg, opt_hsaddress)) { - if (!hs_address_is_valid(arg)) { + const char *address = arg + strlen(opt_hsaddress); + if (!hs_address_is_valid(address)) { connection_printf_to_buf(conn, "512 Malformed onion address\r\n"); goto done; } - onion_address = arg; + onion_address = address; } else { connection_printf_to_buf(conn, "512 Unexpected argument \"%s\"\r\n", arg); @@ -4385,6 +4388,8 @@ handle_control_hspost(control_connection_t *conn, read_escaped_data(encoded_desc, encoded_desc_len, &desc_str); if (hs_control_hspost_command(desc_str, onion_address, hs_dirs) < 0) { connection_printf_to_buf(conn, "554 Invalid descriptor\r\n"); + } else { + send_control_done(conn); } tor_free(desc_str); goto done;

1 0

[tor/maint-0.3.3] Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3
by nickm＠torproject.org 01 Jul '18

01 Jul '18

commit 9aeef05f8f56f16c9ff7e147ca313cc7bab88eda Merge: 72ee0b6f7 3f8a12a63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Sun Jul 1 10:22:18 2018 -0400 Merge remote-tracking branch 'dgoulet/bug26523_033_01' into maint-0.3.3 changes/bug26523 | 5 +++++ src/or/control.c | 13 +++++++++---- 2 files changed, 14 insertions(+), 4 deletions(-)

1 0