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

[tor-browser/tor-browser-52.4.0esr-7.0-1] squash! Bug 6253: Add canvas image extraction prompt.
by gk＠torproject.org 20 Sep '17

20 Sep '17

commit 852e4a1ef17e19ea5f57072f1ea3779107e7dce2 Author: Kathy Brade <brade(a)pearlcrescent.com> Date: Wed Sep 20 09:26:21 2017 -0400 squash! Bug 6253: Add canvas image extraction prompt. When processing the ShowCanvasPermissionPrompt message in the main (parent) process, avoid returning an error from the IPC handler if the browser element cannot be obtained. Prior to this change, canvas prompt requests that arrived as a tab was closing would generate an error, which in turn caused the main process to kill the content process. --- dom/ipc/TabParent.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp index ff1b41afafdb..9731561ce0b3 100644 --- a/dom/ipc/TabParent.cpp +++ b/dom/ipc/TabParent.cpp @@ -3281,7 +3281,12 @@ bool TabParent::RecvShowCanvasPermissionPrompt(const nsCString& firstPartyURI) { nsCOMPtr<nsIBrowser> browser = do_QueryInterface(mFrameElement); - NS_ENSURE_TRUE(browser, false); + if (!browser) { + // If the tab is being closed, the browser may not be available. + // In this case we can ignore the request. + return true; + } + nsCOMPtr<nsIObserverService> os = services::GetObserverService(); NS_ENSURE_TRUE(os, false); nsresult rv = os->NotifyObservers(browser, "canvas-permissions-prompt",

1 0

[torspec/master] In prop196, note that USERADDR port is not optional.
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 17d433247bdfb4c0282e61f790bf7aa587ea8ee3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 08:40:45 2017 -0400 In prop196, note that USERADDR port is not optional. Part of ticket 23080. --- proposals/196-transport-control-ports.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/proposals/196-transport-control-ports.txt b/proposals/196-transport-control-ports.txt index 154e581..4ef7840 100644 --- a/proposals/196-transport-control-ports.txt +++ b/proposals/196-transport-control-ports.txt @@ -98,7 +98,12 @@ Implemented-In: 0.2.5.2-alpha An ASCII string holding the TCP/IP address of the client of the pluggable transport proxy. A Tor bridge SHOULD use that address to - collect statistics about its clients. + collect statistics about its clients. Recognized formats are: + 1.2.3.4:5678 + [1:2::3:4]::5678 + + (Current Tor versions may accept other formats, but this is a bug: + transports MUST NOT send them.) The string MUST not be NUL-terminated.

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket23305_032_01'
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 9e0587f806268c0ab96a73238c0409e95b0fbed6 Merge: a8f4f5742 5dea4b565 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 08:36:11 2017 -0400 Merge remote-tracking branch 'dgoulet/ticket23305_032_01' src/common/crypto.h | 3 +++ src/or/hs_common.c | 2 +- src/or/or.h | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-)

1 0

[tor/master] Add a BASE32_DIGEST_LEN define
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 5dea4b565f7295bae8c48790cc7d00a6e237fff0 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Sep 19 12:33:04 2017 -0400 Add a BASE32_DIGEST_LEN define Use this value instead of hardcoded values of 32 everywhere. This also addresses the use of REND_DESC_ID_V2_LEN_BASE32 in hs_lookup_last_hid_serv_request() for the HSDir encoded identity digest length which is accurate but semantically wrong. Fixes #23305. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/common/crypto.h | 3 +++ src/or/hs_common.c | 2 +- src/or/or.h | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/common/crypto.h b/src/common/crypto.h index 6f5e13a8d..f9aeeee2c 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -73,6 +73,9 @@ /** Length of our DH keys. */ #define DH_BYTES (1024/8) +/** Length of a sha1 message digest when encoded in base32 with trailing = + * signs removed. */ +#define BASE32_DIGEST_LEN 32 /** Length of a sha1 message digest when encoded in base64 with trailing = * signs removed. */ #define BASE64_DIGEST_LEN 27 diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 2cdfe57cd..42c15c80d 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -1453,7 +1453,7 @@ hs_lookup_last_hid_serv_request(routerstatus_t *hs_dir, const char *req_key_str, time_t now, int set) { - char hsdir_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1]; + char hsdir_id_base32[BASE32_DIGEST_LEN + 1]; char *hsdir_desc_comb_id = NULL; time_t *last_request_ptr; strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); diff --git a/src/or/or.h b/src/or/or.h index 4fc0e788a..c23054c3b 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -747,15 +747,15 @@ typedef enum { #define REND_NUMBER_OF_CONSECUTIVE_REPLICAS 3 /** Length of v2 descriptor ID (32 base32 chars = 160 bits). */ -#define REND_DESC_ID_V2_LEN_BASE32 32 +#define REND_DESC_ID_V2_LEN_BASE32 BASE32_DIGEST_LEN /** Length of the base32-encoded secret ID part of versioned hidden service * descriptors. */ -#define REND_SECRET_ID_PART_LEN_BASE32 32 +#define REND_SECRET_ID_PART_LEN_BASE32 BASE32_DIGEST_LEN /** Length of the base32-encoded hash of an introduction point's * identity key. */ -#define REND_INTRO_POINT_ID_LEN_BASE32 32 +#define REND_INTRO_POINT_ID_LEN_BASE32 BASE32_DIGEST_LEN /** Length of the descriptor cookie that is used for client authorization * to hidden services. */

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 61d0f65cf00f3191112b54d81bb0ef97cf68493e Merge: 1115200d9 654820ec1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/longclaw-ipv6 | 6 ++++++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 746410fb24055db0046a6d70986efcc6e3d10281 Merge: 23c5259a3 2c93be80d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw-ipv6 | 6 ++++++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 746410fb24055db0046a6d70986efcc6e3d10281 Merge: 23c5259a3 2c93be80d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw-ipv6 | 6 ++++++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Remove longclaw's IPv6 address, as it will soon change
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 8e52c46581ca8279c0f132a822e06f10e5f4676d Author: teor <teor2345(a)gmail.com> Date: Wed Sep 20 14:48:53 2017 +1000 Remove longclaw's IPv6 address, as it will soon change Authority IPv6 addresses were originally added in 0.2.8.1-alpha. This leaves 3/8 directory authorities with IPv6 addresses, but there are also 52 fallback directory mirrors with IPv6 addresses. Resolves 19760. --- changes/longclaw-ipv6 | 6 ++++++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/longclaw-ipv6 b/changes/longclaw-ipv6 new file mode 100644 index 000000000..75899c9d0 --- /dev/null +++ b/changes/longclaw-ipv6 @@ -0,0 +1,6 @@ + o Minor features (directory authorities): + - Remove longclaw's IPv6 address, as it will soon change. + Authority IPv6 addresses were originally added in 0.2.8.1-alpha. + This leaves 3/8 directory authorities with IPv6 addresses, but there + are also 52 fallback directory mirrors with IPv6 addresses. + Resolves 19760. diff --git a/src/or/config.c b/src/or/config.c index 4b065a005..7594c8989 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -928,7 +928,6 @@ static const char *default_authorities[] = { "154.35.175.225:80 CF6D 0AAF B385 BE71 B8E1 11FC 5CFF 4B47 9237 33BC", "longclaw orport=443 " "v3ident=23D15D965BC35114467363C165C4F724B64B4F66 " - "ipv6=[2620:13:4000:8000:60:f3ff:fea1:7cff]:443 " "199.254.238.52:80 74A9 1064 6BCE EFBC D2E8 74FC 1DC9 9743 0F96 8145", NULL };

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.8' into maint-0.2.9
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 2c93be80d9ad0712b5716c85e32f7a5184f3b1d2 Merge: 42e12a353 8e52c4658 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.2.8' into maint-0.2.9 changes/longclaw-ipv6 | 6 ++++++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.0] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 20 Sep '17

20 Sep '17

commit 746410fb24055db0046a6d70986efcc6e3d10281 Merge: 23c5259a3 2c93be80d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Sep 20 08:32:55 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/longclaw-ipv6 | 6 ++++++ src/or/config.c | 1 - 2 files changed, 6 insertions(+), 1 deletion(-)

1 0