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

[snowflake/master] Fix lint complaints
by arlo＠torproject.org 19 Jan '17

19 Jan '17

commit 3516599bae84d396a34cde4199c58c9dd67b275a Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Jan 18 17:23:18 2017 -0800 Fix lint complaints --- proxy/snowflake.coffee | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/proxy/snowflake.coffee b/proxy/snowflake.coffee index 944c304..1fff686 100644 --- a/proxy/snowflake.coffee +++ b/proxy/snowflake.coffee @@ -12,7 +12,7 @@ DEFAULT_RELAY = host: '192.81.135.242' port: 9902 COPY_PASTE_ENABLED = false -COOKIE_NAME = "snowflake-allow"; +COOKIE_NAME = "snowflake-allow" silenceNotifications = false query = Query.parse(location) @@ -209,7 +209,7 @@ init = (isNode) -> cookies = Parse.cookie document.cookie # Do nothing if snowflake has not been opted in. if cookies[COOKIE_NAME] != "1" - console.log 'Snowflake is not activate. Please click the badge to change options.'; + log 'Not activate. Please click the badge to change options.' return # Hook up to the debug UI if available.

1 0

[snowflake/master] go get websocket in CI
by arlo＠torproject.org 19 Jan '17

19 Jan '17

commit 815f97635522782bcce55f7de30c8bbefbe278c3 Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Jan 18 17:06:01 2017 -0800 go get websocket in CI --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index d5648b0..551cd91 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,7 @@ install: - go get -u github.com/keroserene/go-webrtc - go get -u github.com/dchest/uniuri - go get -u git.torproject.org/pluggable-transports/goptlib.git + - go get -u git.torproject.org/pluggable-transports/websocket.git/websocket - pushd proxy - npm install - popd

1 0

[snowflake/master] Pass on exit code from spawned task so CI fails
by arlo＠torproject.org 19 Jan '17

19 Jan '17

commit 61a2702ded0dfb460a91d248c2b5eb5d691edf4f Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Jan 18 17:20:13 2017 -0800 Pass on exit code from spawned task so CI fails --- proxy/Cakefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/proxy/Cakefile b/proxy/Cakefile index 6e5a413..8032034 100644 --- a/proxy/Cakefile +++ b/proxy/Cakefile @@ -38,9 +38,10 @@ task 'test', 'snowflake unit tests', -> exec 'echo "TESTING = true" > ' + outFile exec 'cat ' + jasmineFiles.join(' ') + ' | cat >> ' + outFile execSync 'coffee -cb ' + outFile - spawn 'jasmine', ['test/bundle.spec.js'], { + proc = spawn 'jasmine', ['test/bundle.spec.js'], { stdio: 'inherit' } + proc.on "exit", (code) -> process.exit code task 'build', 'build the snowflake proxy', -> exec 'mkdir -p build' @@ -49,10 +50,11 @@ task 'build', 'build the snowflake proxy', -> console.log 'Snowflake prepared.' task 'lint', 'ensure idiomatic coffeescript', -> - spawn 'coffeelint', FILES_ALL, { + proc = spawn 'coffeelint', FILES_ALL, { file: 'coffeelint.json' stdio: 'inherit' } + proc.on "exit", (code) -> process.exit code task 'clean', 'remove all built files', -> exec 'rm -r build'

1 0

[snowflake/master] Remove Makefile
by arlo＠torproject.org 19 Jan '17

19 Jan '17

commit 2fd691c49068368f64049402165bd9cc81ae0d0b Author: Arlo Breault <arlolra(a)gmail.com> Date: Wed Jan 18 16:58:16 2017 -0800 Remove Makefile --- .travis.yml | 5 +++-- Makefile | 5 ----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2cc861b..d5648b0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,8 +30,9 @@ install: - popd script: - - make check - - go test -v -race ./broker ./client + - test -z "$(go fmt ./...)" + - go vet ./... + - go test -v -race ./... - cd proxy - npm run-script lint - npm test diff --git a/Makefile b/Makefile deleted file mode 100644 index 0608eca..0000000 --- a/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -.SILENT: check -.PHONY: check -check: - ! gofmt -l . 2>&1 | read - go vet ./broker ./client ./server ./server-webrtc

1 0

[translation/tor-launcher-network-settings_completed] Update translations for tor-launcher-network-settings_completed
by translation＠torproject.org 19 Jan '17

19 Jan '17

commit 46f2807af0f08c532c943fc79da94c4b580101b1 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 23:46:11 2017 +0000 Update translations for tor-launcher-network-settings_completed --- da/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index 7baa4e1..19cfb82 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor netværksindstillinger">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Sprog"> +<!ENTITY torlauncher.localePicker.title "Tor Browser sprog"> <!ENTITY torlauncher.localePicker.prompt "Vælg venligst et sprog.">

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 19 Jan '17

19 Jan '17

commit da58eaa230b80be5956fd7ca64c63cf69015fe05 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 23:46:07 2017 +0000 Update translations for tor-launcher-network-settings --- da/network-settings.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/network-settings.dtd b/da/network-settings.dtd index 7baa4e1..19cfb82 100644 --- a/da/network-settings.dtd +++ b/da/network-settings.dtd @@ -1,7 +1,7 @@ <!ENTITY torsettings.dialog.title "Tor netværksindstillinger">  -<!ENTITY torlauncher.localePicker.title "Tor Browser Sprog"> +<!ENTITY torlauncher.localePicker.title "Tor Browser sprog"> <!ENTITY torlauncher.localePicker.prompt "Vælg venligst et sprog.">

1 0

[tor/master] whitespace fixes
by nickm＠torproject.org 19 Jan '17

19 Jan '17

commit 85a17ee2e784eeb6db32c178cbc2e2620ef3b765 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 17:14:42 2017 -0500 whitespace fixes --- src/or/hs_intropoint.c | 1 + src/test/test_hs_intropoint.c | 15 ++++++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 04f8c62..db4ba79 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -592,3 +592,4 @@ hs_intro_received_introduce1(or_circuit_t *circ, const uint8_t *request, circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_TORPROTOCOL); return -1; } + diff --git a/src/test/test_hs_intropoint.c b/src/test/test_hs_intropoint.c index e126cbc..1d620e1 100644 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@ -44,7 +44,8 @@ mock_send_intro_established_cell(or_circuit_t *circ) static int mock_relay_send_command_from_edge(streamid_t stream_id, circuit_t *circ, uint8_t relay_command, const char *payload, - size_t payload_len, crypt_path_t *cpath_layer, + size_t payload_len, + crypt_path_t *cpath_layer, const char *filename, int lineno) { (void) stream_id; @@ -763,12 +764,14 @@ test_received_introduce1_handling(void *arg) size_t request_len = hs_cell_introduce1_encoded_len(cell); tt_size_op(request_len, OP_GT, 0); request = tor_malloc_zero(request_len); - ssize_t encoded_len = hs_cell_introduce1_encode(request, request_len, cell); + ssize_t encoded_len = + hs_cell_introduce1_encode(request, request_len, cell); tt_size_op(encoded_len, OP_GT, 0); circ = helper_create_intro_circuit(); or_circuit_t *service_circ = helper_create_intro_circuit(); - circuit_change_purpose(TO_CIRCUIT(service_circ), CIRCUIT_PURPOSE_INTRO_POINT); + circuit_change_purpose(TO_CIRCUIT(service_circ), + CIRCUIT_PURPOSE_INTRO_POINT); /* Register the circuit in the map for the auth key of the cell. */ ed25519_public_key_t auth_key; const uint8_t *cell_auth_key = @@ -792,12 +795,14 @@ test_received_introduce1_handling(void *arg) size_t request_len = hs_cell_introduce1_encoded_len(cell) + 256; tt_size_op(request_len, OP_GT, 0); request = tor_malloc_zero(request_len + 256); - ssize_t encoded_len = hs_cell_introduce1_encode(request, request_len, cell); + ssize_t encoded_len = + hs_cell_introduce1_encode(request, request_len, cell); tt_size_op(encoded_len, OP_GT, 0); circ = helper_create_intro_circuit(); or_circuit_t *service_circ = helper_create_intro_circuit(); - circuit_change_purpose(TO_CIRCUIT(service_circ), CIRCUIT_PURPOSE_INTRO_POINT); + circuit_change_purpose(TO_CIRCUIT(service_circ), + CIRCUIT_PURPOSE_INTRO_POINT); /* Register the circuit in the map for the auth key of the cell. */ uint8_t token[REND_TOKEN_LEN]; memcpy(token, legacy_key_id, sizeof(token));

1 0

[tor/master] Improve a few comments.
by nickm＠torproject.org 19 Jan '17

19 Jan '17

commit d6c14915cd3c6379973340afe3fd7f4e3f069166 Author: George Kadianakis <desnacked(a)riseup.net> Date: Sun Jan 8 15:06:39 2017 +0200 Improve a few comments. - Also remove LCOV marks from blocks of code that can be reachable by tests if we mock relay_send_command_from_edge(). Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_intropoint.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 25721e9..902b2e3 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -284,7 +284,7 @@ circuit_is_suitable_intro_point(const or_circuit_t *circ, return 1; } -/* Return True if circuit is suitable for becoming an intro circuit. */ +/* Return True if circuit is suitable for being service-side intro circuit. */ int hs_intro_circuit_is_suitable_for_establish_intro(const or_circuit_t *circ) { @@ -446,7 +446,7 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request, goto send_ack; } - /* Once parsed, validate the cell expected format once parsed. */ + /* Once parsed validate the cell format. */ if (validate_introduce1_parsed_cell(parsed_cell) < 0) { /* Inform client that the INTRODUCE1 has bad format. */ status = HS_INTRO_ACK_STATUS_BAD_FORMAT; @@ -476,12 +476,10 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request, if (relay_send_command_from_edge(CONTROL_CELL_ID, TO_CIRCUIT(service_circ), RELAY_COMMAND_INTRODUCE2, (char *) request, request_len, NULL)) { - /* LCOV_EXCL_START */ log_warn(LD_REND, "Unable to send INTRODUCE2 cell to the service."); /* Inform the client that we can't relay the cell. */ status = HS_INTRO_ACK_STATUS_CANT_RELAY; goto send_ack; - /* LCOV_EXCL_STOP */ } /* Success! Send an INTRODUCE_ACK success status onto the client circuit. */ @@ -489,14 +487,12 @@ handle_introduce1(or_circuit_t *client_circ, const uint8_t *request, ret = 0; send_ack: - /* Send the INTRODUCE_ACK cell to the client with a specific status. */ + /* Send INTRODUCE_ACK or INTRODUCE_NACK to client */ if (send_introduce_ack_cell(client_circ, status) < 0) { - /* LCOV_EXCL_START */ log_warn(LD_REND, "Unable to send an INTRODUCE ACK status %d to client.", status); /* Circuit has been closed on failure of transmission. */ goto done; - /* LCOV_EXCL_STOP */ } if (status != HS_INTRO_ACK_STATUS_SUCCESS) { /* We just sent a NACK that is a non success status code so close the @@ -533,7 +529,7 @@ circuit_is_suitable_for_introduce1(const or_circuit_t *circ) { tor_assert(circ); - /* First of all, do we have a valid circuit to be an introduction point? */ + /* Is this circuit an intro point circuit? */ if (!circuit_is_suitable_intro_point(circ, "INTRODUCE1")) { return 0; }

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/ticket20029_030_06-resquash'
by nickm＠torproject.org 19 Jan '17

19 Jan '17

commit 88e4ffab9ea98d135de592c3af368940ee4f0c5f Merge: e167a0e d6c1491 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 17:13:36 2017 -0500 Merge remote-tracking branch 'dgoulet/ticket20029_030_06-resquash' src/or/hs_intropoint.c | 340 +++++++++++++++++++++++++++++++++++++++--- src/or/hs_intropoint.h | 25 +++- src/or/relay.c | 10 +- src/or/relay.h | 7 +- src/or/rendcommon.c | 2 +- src/or/rendmid.c | 30 +--- src/or/rendmid.h | 4 +- src/test/test_hs_intropoint.c | 332 ++++++++++++++++++++++++++++++++++++++++- 8 files changed, 693 insertions(+), 57 deletions(-) diff --cc src/test/test_hs_intropoint.c index dbd884c,f8f4460..e126cbc --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@@ -12,15 -12,18 +12,19 @@@ #define CIRCUITLIST_PRIVATE #include "test.h" +#include "log_test_helpers.h" #include "crypto.h" + #include "log_test_helpers.h" #include "or.h" #include "ht.h" + /* Trunnel. */ #include "hs/cell_establish_intro.h" - #include "hs_common.h" + #include "hs/cell_introduce1.h" + #include "hs/cell_common.h" - #include "hs_service.h" ++#include "hs_common.h" #include "hs_circuitmap.h" #include "hs_intropoint.h" @@@ -515,15 -673,18 +831,27 @@@ struct testcase_t hs_intropoint_tests[ { "receive_establish_intro_wrong_sig", test_establish_intro_wrong_sig, TT_FORK, NULL, NULL }, + { "receive_establish_intro_wrong_sig_len", + test_establish_intro_wrong_sig_len, TT_FORK, NULL, NULL }, + + { "receive_establish_intro_wrong_auth_key_len", + test_establish_intro_wrong_auth_key_len, TT_FORK, NULL, NULL }, + + { "receive_establish_intro_wrong_mac", + test_establish_intro_wrong_mac, TT_FORK, NULL, NULL }, + + { "introduce1_suitable_circuit", + test_introduce1_suitable_circuit, TT_FORK, NULL, NULL }, + + { "introduce1_is_legacy", + test_introduce1_is_legacy, TT_FORK, NULL, NULL }, + + { "introduce1_validation", + test_introduce1_validation, TT_FORK, NULL, NULL }, + + { "received_introduce1_handling", + test_received_introduce1_handling, TT_FORK, NULL, NULL }, + END_OF_TESTCASES };

1 0

[tor/master] hs: Rename rend_mid_introduce() with legacy semantic
by nickm＠torproject.org 19 Jan '17

19 Jan '17

commit 5208085be1deff4711b634b108052970aed6a127 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Nov 15 14:29:02 2016 -0500 hs: Rename rend_mid_introduce() with legacy semantic Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_intropoint.c | 2 +- src/or/rendmid.c | 4 ++-- src/or/rendmid.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c index 2da3ee9..b7dae7d 100644 --- a/src/or/hs_intropoint.c +++ b/src/or/hs_intropoint.c @@ -577,7 +577,7 @@ hs_intro_received_introduce1(or_circuit_t *circ, const uint8_t *request, /* We are sure here to have at least DIGEST_LEN bytes. */ if (introduce1_cell_is_legacy(request)) { /* Handle a legacy cell. */ - ret = rend_mid_introduce(circ, request, request_len); + ret = rend_mid_introduce_legacy(circ, request, request_len); } else { /* Handle a non legacy cell. */ ret = handle_introduce1(circ, request, request_len); diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 89d2482..57c8cfa 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -133,8 +133,8 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request, * INTRODUCE2 cell. */ int -rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, - size_t request_len) +rend_mid_introduce_legacy(or_circuit_t *circ, const uint8_t *request, + size_t request_len) { or_circuit_t *intro_circ; char serviceid[REND_SERVICE_ID_LEN_BASE32+1]; diff --git a/src/or/rendmid.h b/src/or/rendmid.h index 374f2b7..347d745 100644 --- a/src/or/rendmid.h +++ b/src/or/rendmid.h @@ -14,8 +14,8 @@ int rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request, size_t request_len); -int rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, - size_t request_len); +int rend_mid_introduce_legacy(or_circuit_t *circ, const uint8_t *request, + size_t request_len); int rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request, size_t request_len); int rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request,

1 0