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

[tor/release-0.3.2] Fix a 32-bit formatting warning
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit bebdd910580ba13de02743ecfedb34bd2b2842a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:10 2017 -0500 Fix a 32-bit formatting warning --- src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 97b6d40b1..1438dc60f 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -687,7 +687,7 @@ scheduler_bug_occurred(const channel_t *chan) chan->global_identifier, channel_state_to_string(chan->state), chan->scheduler_state, circuitmux_num_cells(chan->cmux), - outbuf_len); + (unsigned long)outbuf_len); } {

1 0

[tor/master] Merge branch 'maint-0.3.2'
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 02a4c641da4497b77ded4123c4550a583916eff2 Merge: 306d1fb60 bebdd9105 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:19 2017 -0500 Merge branch 'maint-0.3.2' src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/release-0.3.2] Merge branch 'maint-0.3.2' into release-0.3.2
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit d05780c1bb5bc171d14102cdbe7b630c65ff45e5 Merge: 8c9b5bfb8 bebdd9105 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:18 2017 -0500 Merge branch 'maint-0.3.2' into release-0.3.2 src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[tor/maint-0.3.2] Fix a 32-bit formatting warning
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit bebdd910580ba13de02743ecfedb34bd2b2842a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:10 2017 -0500 Fix a 32-bit formatting warning --- src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 97b6d40b1..1438dc60f 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -687,7 +687,7 @@ scheduler_bug_occurred(const channel_t *chan) chan->global_identifier, channel_state_to_string(chan->state), chan->scheduler_state, circuitmux_num_cells(chan->cmux), - outbuf_len); + (unsigned long)outbuf_len); } {

1 0

[tor/master] Fix a 32-bit formatting warning
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit bebdd910580ba13de02743ecfedb34bd2b2842a4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:16:10 2017 -0500 Fix a 32-bit formatting warning --- src/or/scheduler.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 97b6d40b1..1438dc60f 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -687,7 +687,7 @@ scheduler_bug_occurred(const channel_t *chan) chan->global_identifier, channel_state_to_string(chan->state), chan->scheduler_state, circuitmux_num_cells(chan->cmux), - outbuf_len); + (unsigned long)outbuf_len); } {

1 0

[tor/master] Fix manual formatting
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 3563a2c8194ebe9430603803a53b073e181ce773 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Nov 5 12:21:28 2017 -0800 Fix manual formatting Few issues... * Malformed ReducedExitPolicy, causing brackets to appear. * ExitPolicyDefault wasn't actually listed, instead it munged the description into the ExitPolicy description. * Extra plus signs in the ExitPolicy and ReducedExitPolicy entries. After an hour of struggling with asciidoc couldn't figure out how to format it as 'paragraph => example => paragraph with same indentation' so just rearranging the ExitPolicy entry. Patches welcome if someone strongly prefers having the paragraph after the example. https://trac.torproject.org/projects/tor/ticket/24147 --- doc/tor.1.txt | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 3b881d08f..725baaa64 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -1763,8 +1763,15 @@ is non-zero): write your IPv6 rules using accept6/reject6 \*6, and your IPv4 rules using accept/reject \*4. If you want to \_replace_ the default exit policy, end your exit policy with either a reject \*:* or an accept \*:*. Otherwise, - you're \_augmenting_ (prepending to) the default exit policy. The default - exit policy is: + + you're \_augmenting_ (prepending to) the default exit policy. + + + + If you want to use a reduced exit policy rather than the default exit + policy, set "ReducedExitPolicy 1". If you want to _replace_ the default + exit policy with your custom exit policy, end your exit policy with either + a reject *:* or an accept *:*. Otherwise, you’re _augmenting_ (prepending + to) the default or reduced exit policy. + + + + The default exit policy is: reject *:25 reject *:119 @@ -1776,15 +1783,9 @@ is non-zero): reject *:6346-6429 reject *:6699 reject *:6881-6999 - accept *:* + - + - If you want to use a reduced exit policy rather than the default exit - policy, set "ReducedExitPolicy 1". If you want to _replace_ the default - exit policy with your custom exit policy, end your exit policy with either - a reject *:* or an accept *:*. Otherwise, you’re _augmenting_ (prepending - to) the default or reduced exit policy. + accept *:* -[[ExitPolicyDefault]]:: +[[ExitPolicyDefault]] **ExitPolicyDefault**:: Since the default exit policy uses accept/reject *, it applies to both IPv4 and IPv6 addresses. @@ -1806,7 +1807,7 @@ is non-zero): to disclose. (Default: 0) -[[ReducedExitPolicy] **ReducedExitPolicy** **0**|**1**:: +[[ReducedExitPolicy]] **ReducedExitPolicy** **0**|**1**:: If set, use a reduced exit policy rather than the default one. + + The reduced exit policy is an alternative to the default exit policy. It @@ -1895,8 +1896,8 @@ is non-zero): accept *:19638 accept *:50002 accept *:64738 - reject *:* + - + + reject *:* + (Default: 0) [[IPv6Exit]] **IPv6Exit** **0**|**1**::

1 0

[tor/master] Merge remote-tracking branch 'atagar/manual'
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 306d1fb60aaba4eb26be0ea467ddca078136112c Merge: 7097c4a37 3563a2c81 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:05:22 2017 -0500 Merge remote-tracking branch 'atagar/manual' doc/tor.1.txt | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)

1 0

[tor/master] test: Fix SR initialization in routerlist test
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 198ede53147dc3a33384e836b1ad9c64e95d0232 Author: David Goulet <dgoulet(a)torproject.org> Date: Wed Nov 1 11:39:52 2017 -0400 test: Fix SR initialization in routerlist test Fixes #24053 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_routerlist.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 81451a4bc..05d0820d8 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -454,7 +454,10 @@ test_directory_guard_fetch_with_no_dirinfo(void *arg) (void) arg; /* Initialize the SRV subsystem */ + MOCK(get_my_v3_authority_cert, get_my_v3_authority_cert_m); + mock_cert = authority_cert_parse_from_string(AUTHORITY_CERT_1, NULL); sr_init(0); + UNMOCK(get_my_v3_authority_cert); /* Initialize the entry node configuration from the ticket */ options->UseEntryGuards = 1;

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug24053_033_01'
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit 7097c4a37a914d7a64a0da3a8d1b61816dbe071b Merge: 3beb3dac2 198ede531 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:04:22 2017 -0500 Merge remote-tracking branch 'dgoulet/bug24053_033_01' src/test/test_routerlist.c | 3 +++ 1 file changed, 3 insertions(+)

1 0

[torspec/master] add proposal 284: Hidden Service v3 Control Port
by nickm＠torproject.org 06 Nov '17

06 Nov '17

commit bbb6d34cca697e9c86e7fc248681509cead8ed49 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 6 10:02:15 2017 -0500 add proposal 284: Hidden Service v3 Control Port --- proposals/000-index.txt | 2 + proposals/284-hsv3-control-port.txt | 168 ++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/proposals/000-index.txt b/proposals/000-index.txt index ded6f78..2ae06a9 100644 --- a/proposals/000-index.txt +++ b/proposals/000-index.txt @@ -204,6 +204,7 @@ Proposals by number: 281 Downloading microdescriptors in bulk [DRAFT] 282 Remove "Named" and "Unnamed" handling from consensus voting [OPEN] 283 Move IPv6 ORPorts from microdescriptors to the microdesc consensus [OPEN] +284 Hidden Service v3 Control Port [OPEN] Proposals by status: @@ -261,6 +262,7 @@ Proposals by status: 277 Detect multiple relay instances running with same ID [for 0.3.??] 282 Remove "Named" and "Unnamed" handling from consensus voting [for 0.3.3.x] 283 Move IPv6 ORPorts from microdescriptors to the microdesc consensus [for 0.3.3.x] + 284 Hidden Service v3 Control Port ACCEPTED: 172 GETINFO controller option for circuit information 173 GETINFO Option Expansion diff --git a/proposals/284-hsv3-control-port.txt b/proposals/284-hsv3-control-port.txt new file mode 100644 index 0000000..0bee081 --- /dev/null +++ b/proposals/284-hsv3-control-port.txt @@ -0,0 +1,168 @@ +Filename: 284-hsv3-control-port.txt +Title: Hidden Service v3 Control Port +Author: David Goulet +Created: 02-November-2017 +Status: Open + +1. Summary + + This document extends the hidden service control port events and commands + to version 3 (rend-spec-v3.txt). + + No command nor events are newly added in this document, it only desribes + how the current commands and events are extended to support v3. + +2. Format + + The formatting of this document follows section 2 of control-spec.txt. It + is split in two sections, the Commands and the Events for hidden service + version 3. + + We define the alphabet of a Base64 encoded value to be: + + Base64Character = "A"-"Z" / "a"-"z" / "0"-"9" / "+" / "/" + + For a command or event, if nothing is mentionned, the behavior doesn't + change from the control port specification. + +3. Specification: + +3.1. Commands + + As specified in the control specification, all commands are + case-insensitive but the keywords are case-sensitive. + +3.1.1. GETINFO + + Hidden service commands are: + + "hs/client/desc/id/<ADDR>" + The <ADDR> can be a v3 address without the ".onion" part. The rest is + as is. + + "hs/service/desc/id/<ADDR>" + The <ADDR> can be a v3 address without the ".onion" part. The rest is + as is. + + "onions/{current,detached}" + No change. This command can support v3 hidden service without changes + returning v3 address(es). + +3.1.2. HSFETCH + + The syntax of this command supports both an HSAddress or a versionned + descriptor ID. However, for descriptor ID, version 3 doesn't have the same + concept as v2 so, for v3 the descriptor ID is the blinded key of a + descriptor which is used as an index to query the HSDir: + + The syntax becomes: + "HSFETCH" SP (HSAddress / "v" Version "-" DescId) + *[SP "SERVER=" Server] CRLF + + HSAddress = (16*Base32Character / 56*Base32Character) + Version = "2" / "3" + DescId = (32*Base32Character / 32*Base64Character) + Server = LongName + + The "HSAddress" key is extended to accept 56 base32 characters which is the + format of a version 3 onion address. + + The "DescId" of the form 32*Base64Character is the descriptor blinded key + used as an index to query the directory. It can only be used with + "Version=3". + +3.1.5. HSPOST + + No change. This command can support v3 hidden service without changes. + +3.1.3. ADD_ONION + + For this command to support version 3, new values are added but the syntax + is unchanged: + + "ADD_ONION" SP KeyType ":" KeyBlob + [SP "Flags=" Flag *("," Flag)] + 1*(SP "Port=" VirtPort ["," Target]) + *(SP "ClientAuth=" ClientName [":" ClientBlob]) CRLF + + New "KeyType" value to "ED25519-V3" which identifies the key type to be a + v3 ed25519 key. + + New "KeyBlob" value to support the new "ED25519-V3", if specified, will + generate a new ed25519 private key. + + Because client authentication is not yet implemented, the "ClientAuth" + field is ignored as well as "Flags=BasicAuth". + +3.1.4. DEL_ONION + + The syntax of this command is: + + "DEL_ONION" SP ServiceID CRLF + + ServiceID = The Onion Service address without the trailing ".onion" + suffix + + The "ServiceID" can simply be a v3 address. Nothing else changes. + +3.2. Events + +3.2.1. HS_DESC + + For this event to support vesrion 3, one optional field and new + values are added: + + "650" SP "HS_DESC" SP Action SP HSAddress SP AuthType SP HsDir + [SP DescriptorID] [SP "REASON=" Reason] [SP "REPLICA=" Replica] + [SP "HSDIR_INDEX=" HSDirIndex] + + Action = "REQUESTED" / "UPLOAD" / "RECEIVED" / "UPLOADED" / "IGNORE" / + "FAILED" / "CREATED" + HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" + AuthType = "NO_AUTH" / "BASIC_AUTH" / "STEALTH_AUTH" / "UNKNOWN" + HsDir = LongName / Fingerprint / "UNKNOWN" + DescriptorID = 32*Base32Character / 32*Base64Character + Reason = "BAD_DESC" / "QUERY_REJECTED" / "UPLOAD_REJECTED" / "NOT_FOUND" / + "UNEXPECTED" / "QUERY_NO_HSDIR" + Replica = 1*DIGIT + HSDirIndex = 64*HEXDIG + + The "HSDIR_INDEX=" is an optional field that is only for version 3 which + contains the computed index of the HsDir the descriptor was uploaded to or + fetched from. + + The "HSAddress" key is extended to accept 56 base32 characters which is the + format of a version 3 onion address. + + The "DescriptorID" key is extended to accept 32 base64 characters which is + the descriptor blinded key used for the index value at the "HsDir". + + Because client authentication is not yet implemented, the "AuthType" field + is always "NO_AUTH". + +3.2.2. HS_DESC_CONTENT + + For this event to support version 3, new values are added but the syntax is + unchanged: + + "650" "+" "HS_DESC_CONTENT" SP HSAddress SP DescId SP HsDir CRLF + Descriptor CRLF "." CRLF "650" SP "OK" CRLF + + HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN" + DescId = 32*Base32Character / 32*Base64Character + HsDir = LongName / "UNKNOWN" + Descriptor = The text of the descriptor formatted as specified in + rend-spec-v3.txt section 2.4 or empty string on failure. + + The "HSAddress" key is extended to accept 56 base32 characters which is the + format of a version 3 onion address. + + The "DescriptorID" key is extended to accept 32 base64 characters which is + the descriptor blinded key used for the index value at the "HsDir". + +3.2.3 CIRC and CIRC_MINOR + + These circuit events have an optional field named "REND_QUERY" which takes + an "HSAddress". This field is extended to support v3 address: + + HSAddress = 16*Base32Character / 56*Base32Character / "UNKNOWN"

1 0