February 2022 - tor-commits - lists.torproject.org

[translation/fenix-torbrowserstringsxml] new translations in fenix-torbrowserstringsxml
by translation＠torproject.org 23 Feb '22

23 Feb '22

commit a679846c9a77ab4cbd0128648943dabd87a7beb6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 23 04:45:17 2022 +0000 new translations in fenix-torbrowserstringsxml --- km/torbrowser_strings.xml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/km/torbrowser_strings.xml b/km/torbrowser_strings.xml index 6c8e597780..92ae103ae1 100644 --- a/km/torbrowser_strings.xml +++ b/km/torbrowser_strings.xml @@ -3,10 +3,10 @@ - file, You can obtain one at http://mozilla.org/MPL/2.0/. --> <resources>  - <string name="tor_about_content">%1$sត្រូវបានបង្កើតឡើងដោយគម្រោង Tor ជាអង្គការមិនរកប្រាក់ចំណេញ 501(c)(3) មានមូលដ្ឋាននៅសហរដ្ឋអាមេរិក។</string> + <string name="tor_about_content">%1$sត្រូវបានបង្កើតឡើងដោយគម្រោង Tor ជាអង្គការមិនរកប្រាក់ចំណេញ 501(c)(3) មានមូលដ្ឋាននៅសហរដ្ឋអាមេរិក។</string>  - <string name="preferences_disable_normal_mode">អនុញ្ញាតតែមុខងាររុករកឯកជនតែប៉ុណ្ណោះ</string> + <string name="preferences_disable_normal_mode">អនុញ្ញាតតែកម្មវិធីរុករកឯកជនតែប៉ុណ្ណោះ </string>  <string name="preferences_donate">បរិច្ចាគទៅគម្រោង Tor</string>  @@ -68,8 +68,8 @@ <string name="tor_security_level_safer_option">សុវត្ថិភាពជាង</string> <string name="tor_security_level_safer_description">បិទមុខងារវែបសាយដែលជារឿយៗមានគ្រោះថ្នាក់ ដែលបណ្ដាលឱ្យវែបសាយមួយចំនួនមិនដំណើរការ។</string> <string name="tor_security_level_safest_option">សុវត្ថិភាពបំផុត</string> - <string name="tor_security_level_safest_description">អនុញ្ញាតតែមុខងារវែបសាយត្រូវការសម្រាប់វែបសាយថេរ និងសេវាកម្មមូលដ្ឋាន។ ការផ្លាស់ប្ដូរទាំងនេះប៉ះពាល់ទៅលើរូបភាព មេឌៀ និងស្គ្រីប។</string> + <string name="tor_security_level_safest_description">អនុញ្ញាតតែមុខងារណាត្រូវការសម្រាប់ស្ថេរភាពនៃគេហទំព័រ និងសេវាកម្មមូលដ្ឋាន។ ការផ្លាស់ប្ដូរទាំងនេះប៉ះពាល់ទៅលើរូបភាព មេឌៀ និងស្គ្រីប។</string>  - <string name="tor_spoof_english">ស្នើសុំគេហទំព័រជាភាសាអង់គ្លេស ដើម្បីធ្វើឱ្យប្រសើរឡើងនៃឯកជនភាព</string> + <string name="tor_spoof_english">ស្នើសុំគេហទំព័រជាភាសាអង់គ្លេស ដើម្បីពង្រឹងឯកជនភាព</string> </resources>

1 0

[translation/tbmanual-contentspot] new translations in tbmanual-contentspot
by translation＠torproject.org 23 Feb '22

23 Feb '22

commit 582f43de941a226d8e6e37f03eb96f7e23e04a5f Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 23 03:46:48 2022 +0000 new translations in tbmanual-contentspot --- contents+km.po | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/contents+km.po b/contents+km.po index 4fe0dba26f..066f82c458 100644 --- a/contents+km.po +++ b/contents+km.po @@ -2950,6 +2950,13 @@ msgid "" " privacy and security. It is strongly discouraged to install additional add-" "ons, and the Tor Project will not offer support for these configurations." msgstr "" +"ទោះយ៉ាងណា មានតែកម្មវិធីបន្ថែមដែលបានតេស្តជាមួយកម្មវិធីរុករុក Tor " +"ប៉ុណ្ណោះត្រូវបានដាក់បញ្ចូលជាស្រេច។ " +"ការដំឡើងកម្មវិធីបន្ថែមសម្រាប់កម្មវិធីរុករកផ្សេងទៀត " +"អាចនឹងធ្វើឱ្យខូចមុខងារខ្លះនៅក្នុងកម្មវិធីរុករក Tor " +"ឬបង្កបញ្ហាធ្ងន់ធ្ងរដែលប៉ះពាល់ដល់ឯកជនភាព និងសន្ដិសុខរបស់អ្នក។ " +"យើងពិតជាមិនលើកទឹកចិត្តឱ្យដំឡើងកម្មវិធីបន្ថែមផ្សេងទេ ហើយគម្រោង Tor " +"នឹងមិនផ្ដល់ការគាំទ្រសម្រាប់ការកំណត់ទាំងនោះឡើយ។" #: https//tb-manual.torproject.org/uninstalling/ #: (content/uninstalling/contents+en.lrtopic.title) @@ -3308,6 +3315,9 @@ msgid "" "tracking across websites, defending against surveillance, resisting browser " "fingerprinting, and circumventing censorship." msgstr "" +"មុខងារចម្បងមួយចំនួនរបស់កម្មវិធីរុករក Tor សម្រាប់ Android រួមមាន៖ " +"កាត់បន្ថយការតាមដាននៅលើវែបសាយ ការពារប្រឆាំងនឹងការឃ្លាំមើល " +"ទប់ទល់នឹងការបោះពុម្ពខ្ចៅដៃកម្មវិធីរុករក និងការជៀសវាងការឃ្លាំមើល។" #: https//tb-manual.torproject.org/mobile-tor/ #: (content/mobile-tor/contents+en.lrtopic.body)

1 0

[translation/tbmanual-contentspot] new translations in tbmanual-contentspot
by translation＠torproject.org 23 Feb '22

23 Feb '22

commit e3880bfaad87fa7eac96d2490d1b656bb93509e9 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Feb 23 03:16:48 2022 +0000 new translations in tbmanual-contentspot --- contents+km.po | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/contents+km.po b/contents+km.po index ab9151652e..4fe0dba26f 100644 --- a/contents+km.po +++ b/contents+km.po @@ -8,8 +8,8 @@ # Emma Peel, 2022 # Piseth KONG <pisethk(a)gmail.com>, 2022 # sophat CHY <sophatchy(a)gmail.com>, 2022 -# Rasy Chum <rasychum(a)gmail.com>, 2022 # Moses Ngeth, 2022 +# Rasy Chum <rasychum(a)gmail.com>, 2022 # msgid "" msgstr "" @@ -17,7 +17,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-02-17 14:39+UTC\n" "PO-Revision-Date: 2018-11-14 12:31+0000\n" -"Last-Translator: Moses Ngeth, 2022\n" +"Last-Translator: Rasy Chum <rasychum(a)gmail.com>, 2022\n" "Language-Team: Khmer (https://www.transifex.com/otf/teams/1519/km/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -2916,6 +2916,14 @@ msgid "" " displaying correctly, so Tor Browser’s default setting is to allow all " "websites to run scripts in \"Standard\" mode." msgstr "" +"អ្នកប្រើប្រាស់ដែលត្រូវការកម្រិតសន្ដិសុខខ្ពស់នៅក្នុងការរុករកអ៉ីនធឺណិត " +"គួរកំណត់កម្មវិធីរុករក Tor [កម្រិតសន្ដិសុខ](../security-settings/) ទៅកាន់ " +"\"សុវត្ថិភាពជាង\" (ដែលបិទ JavaScript សម្រាប់វែបសាយអត់មាន HTTPS) ឬ " +"\"សុវត្ថិភាពបំផុត\" (ដែលកំណត់ដូចគ្នាសម្រាប់គ្រប់វែបសាយ)។ ទោះយ៉ាងណា " +"ការបិទ JavaScript នឹងធ្វើឱ្យវែបសាយមួយចំនួនបង្ហាញមិនត្រឹមត្រូវ " +"ដូច្នេះការកំណត់លំនាំដើមនៃកម្មវិធីរុករក Tor " +"គឺអនុញ្ញាតឱ្យគ្រប់វែបសាយទាំងអស់ដំណើរការស្ក្រីបនៅក្នុងទម្រង់ " +"\"ស្ដង់ដារ\"។" #: https//tb-manual.torproject.org/plugins/ #: (content/plugins/contents+en.lrtopic.body)

1 0

[tor/main] Use protover to signal support for ntor3 + congestion control.
by dgoulet＠torproject.org 22 Feb '22

22 Feb '22

commit baaabb503c9c9fc81e0d95b2d5baeefef7423b7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 14 16:31:48 2021 -0400 Use protover to signal support for ntor3 + congestion control. --- src/core/or/circuituse.c | 3 ++- src/core/or/extendinfo.c | 14 ++++++++++---- src/core/or/extendinfo.h | 3 ++- src/core/or/or.h | 4 ++++ src/core/or/protover.c | 2 ++ src/core/or/versions.c | 9 +++++++++ src/feature/hs/hs_common.c | 6 +++++- src/feature/nodelist/nodelist.c | 2 +- src/feature/relay/circuitbuild_relay.c | 3 ++- src/feature/relay/selftest.c | 3 ++- src/test/test_circuitpadding.c | 2 +- src/test/test_hs_client.c | 8 ++++---- 12 files changed, 44 insertions(+), 15 deletions(-) diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 2ec391eca0..104e898d6c 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2462,7 +2462,8 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, digest, NULL, /* Ed25519 ID */ NULL, NULL, /* onion keys */ - &addr, conn->socks_request->port); + &addr, conn->socks_request->port, + NULL); } else { /* ! (want_onehop && conn->chosen_exit_name[0] == '$') */ /* We will need an onion key for the router, and we * don't have one. Refuse or relax requirements. */ diff --git a/src/core/or/extendinfo.c b/src/core/or/extendinfo.c index f33e887e7d..ca2288e0a4 100644 --- a/src/core/or/extendinfo.c +++ b/src/core/or/extendinfo.c @@ -35,7 +35,8 @@ extend_info_new(const char *nickname, const ed25519_public_key_t *ed_id, crypto_pk_t *onion_key, const curve25519_public_key_t *ntor_key, - const tor_addr_t *addr, uint16_t port) + const tor_addr_t *addr, uint16_t port, + const protover_summary_flags_t *pv) { extend_info_t *info = tor_malloc_zero(sizeof(extend_info_t)); if (rsa_id_digest) @@ -57,7 +58,10 @@ extend_info_new(const char *nickname, extend_info_add_orport(info, addr, port); } - info->supports_ntor3_and_param_negotiation = false; // TODO: set this. + if (pv) { + info->supports_ntor3_and_param_negotiation = + pv->supports_ntor3_and_param_negotiation; + } return info; } @@ -152,7 +156,8 @@ extend_info_from_node(const node_t *node, int for_direct_connect) rsa_pubkey, curve_pubkey, &ap.addr, - ap.port); + ap.port, + &node->ri->pv); } else if (valid_addr && node->rs && node->md) { info = extend_info_new(node->rs->nickname, node->identity, @@ -160,7 +165,8 @@ extend_info_from_node(const node_t *node, int for_direct_connect) rsa_pubkey, curve_pubkey, &ap.addr, - ap.port); + ap.port, + &node->rs->pv); } crypto_pk_free(rsa_pubkey); diff --git a/src/core/or/extendinfo.h b/src/core/or/extendinfo.h index ffe8317431..8781cc7047 100644 --- a/src/core/or/extendinfo.h +++ b/src/core/or/extendinfo.h @@ -17,7 +17,8 @@ extend_info_t *extend_info_new(const char *nickname, const struct ed25519_public_key_t *ed_id, crypto_pk_t *onion_key, const struct curve25519_public_key_t *ntor_key, - const tor_addr_t *addr, uint16_t port); + const tor_addr_t *addr, uint16_t port, + const struct protover_summary_flags_t *pv); extend_info_t *extend_info_from_node(const node_t *r, int for_direct_connect); extend_info_t *extend_info_dup(extend_info_t *info); void extend_info_free_(extend_info_t *info); diff --git a/src/core/or/or.h b/src/core/or/or.h index 3911797563..409f4a0fea 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -732,6 +732,10 @@ typedef struct protover_summary_flags_t { * negotiate hs circuit setup padding. Requires Padding=2. */ unsigned int supports_hs_setup_padding : 1; + /** True iff this router supports ntor3 _and_ supports negotiating + * additional circuit parameters via the handshake used in ntor3. + */ + unsigned int supports_ntor3_and_param_negotiation : 1; } protover_summary_flags_t; typedef struct routerinfo_t routerinfo_t; diff --git a/src/core/or/protover.c b/src/core/or/protover.c index bd9cc60115..63e9a33b72 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -430,6 +430,8 @@ protover_get_supported_protocols(void) * XXX: WARNING! */ + /* TODO: Add a new Relay=* and a new FlowCtrl=* version to indicate support + * for Ntorv3 and prop324. Make sure they get into the spec. */ return "Cons=1-2 " "Desc=1-2 " diff --git a/src/core/or/versions.c b/src/core/or/versions.c index b9fad22c04..322121b43f 100644 --- a/src/core/or/versions.c +++ b/src/core/or/versions.c @@ -482,6 +482,15 @@ memoize_protover_summary(protover_summary_flags_t *out, protocol_list_supports_protocol(protocols, PRT_PADDING, PROTOVER_HS_SETUP_PADDING); + /* TODO: Set these flags based on real values. + out->supports_ntor3_and_param_negotiation = + protocol_list_supports_protocol(protocols, PRT_RELAY, + XXXX) + && + protocol_list_supports_protocol(protocols, PRT_FLOWCTRL, + XXXX); + */ + protover_summary_flags_t *new_cached = tor_memdup(out, sizeof(*out)); cached = strmap_set(protover_summary_map, protocols, new_cached); tor_assert(!cached); diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index c9195c2934..ee4ec25b01 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -1687,7 +1687,11 @@ hs_get_extend_info_from_lspecs(const smartlist_t *lspecs, /* We do have everything for which we think we can connect successfully. */ info = extend_info_new(NULL, legacy_id, (have_ed25519_id) ? &ed25519_pk : NULL, NULL, - onion_key, &ap.addr, ap.port); + onion_key, &ap.addr, ap.port, + /* TODO: The protover summary here needs to explain + if we support the newer congestion control or + not. This may require new specification stuff */ + NULL); done: return info; } diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index c676e8dfb4..b895a2c7f8 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -1205,7 +1205,7 @@ node_ed25519_id_matches(const node_t *node, const ed25519_public_key_t *id) /** Dummy object that should be unreturnable. Used to ensure that * node_get_protover_summary_flags() always returns non-NULL. */ static const protover_summary_flags_t zero_protover_flags = { - 0,0,0,0,0,0,0,0,0,0,0,0 + 0,0,0,0,0,0,0,0,0,0,0,0,0 }; /** Return the protover_summary_flags for a given node. */ diff --git a/src/feature/relay/circuitbuild_relay.c b/src/feature/relay/circuitbuild_relay.c index 2d346b1809..af3b488ae1 100644 --- a/src/feature/relay/circuitbuild_relay.c +++ b/src/feature/relay/circuitbuild_relay.c @@ -392,7 +392,8 @@ circuit_open_connection_for_extend(const struct extend_cell_t *ec, NULL, /*onion_key*/ NULL, /*curve25519_key*/ &chosen_ap->addr, - chosen_ap->port); + chosen_ap->port, + NULL /* protover summary */); circ->n_chan_create_cell = tor_memdup(&ec->create_cell, sizeof(ec->create_cell)); diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index d029c05053..d52fea3c11 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -228,7 +228,8 @@ extend_info_from_router(const routerinfo_t *r, int family) info = extend_info_new(r->nickname, r->cache_info.identity_digest, ed_id_key, rsa_pubkey, r->onion_curve25519_pkey, - &ap.addr, ap.port); + &ap.addr, ap.port, + NULL /* should self-tests use ntor3? */); crypto_pk_free(rsa_pubkey); return info; } diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index 6ced3f4111..5dc5fc5201 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -1609,7 +1609,7 @@ simulate_single_hop_extend(circuit_t *client, circuit_t *mid_relay, hop->extend_info = extend_info_new( padding ? "padding" : "non-padding", digest, NULL, NULL, NULL, - &addr, padding); + &addr, padding, NULL); cpath_init_circuit_crypto(hop, whatevs_key, sizeof(whatevs_key), 0, 0); diff --git a/src/test/test_hs_client.c b/src/test/test_hs_client.c index 15573d945c..3d84238249 100644 --- a/src/test/test_hs_client.c +++ b/src/test/test_hs_client.c @@ -1186,7 +1186,7 @@ test_socks_hs_errors(void *arg) /* Code path will log this exit so build it. */ ocirc->build_state->chosen_exit = extend_info_new("TestNickname", digest, NULL, NULL, NULL, &addr, - 4242); + 4242, NULL); /* Attach socks connection to this rendezvous circuit. */ ocirc->p_streams = ENTRY_TO_EDGE_CONN(socks_conn); /* Trigger the rendezvous failure. Timeout the circuit and free. */ @@ -1281,7 +1281,7 @@ test_close_intro_circuit_failure(void *arg) /* Code path will log this exit so build it. */ ocirc->build_state->chosen_exit = extend_info_new("TestNickname", digest, NULL, NULL, NULL, &addr, - 4242); + 4242, NULL); ed25519_pubkey_copy(&ocirc->hs_ident->intro_auth_pk, &intro_kp.pubkey); /* We'll make for close the circuit for a timeout failure. It should _NOT_ @@ -1308,7 +1308,7 @@ test_close_intro_circuit_failure(void *arg) /* Code path will log this exit so build it. */ ocirc->build_state->chosen_exit = extend_info_new("TestNickname", digest, NULL, NULL, NULL, &addr, - 4242); + 4242, NULL); ed25519_pubkey_copy(&ocirc->hs_ident->intro_auth_pk, &intro_kp.pubkey); /* On free, we should get an unreachable failure. */ @@ -1331,7 +1331,7 @@ test_close_intro_circuit_failure(void *arg) /* Code path will log this exit so build it. */ ocirc->build_state->chosen_exit = extend_info_new("TestNickname", digest, NULL, NULL, NULL, &addr, - 4242); + 4242, NULL); ed25519_pubkey_copy(&ocirc->hs_ident->intro_auth_pk, &intro_kp.pubkey); circuit_mark_for_close(circ, END_CIRC_REASON_TIMEOUT);

1 0

[tor/main] Negotiated circuit parameters must pass from worker.
by dgoulet＠torproject.org 22 Feb '22

22 Feb '22

commit a511718a30796e9441cdd066bdce1ad00aaec046 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 14 17:06:30 2021 -0400 Negotiated circuit parameters must pass from worker. --- src/core/crypto/onion_crypto.c | 8 ++++++++ src/core/mainloop/cpuworker.c | 11 +++++++---- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/src/core/crypto/onion_crypto.c b/src/core/crypto/onion_crypto.c index b0808b80a8..390151b5df 100644 --- a/src/core/crypto/onion_crypto.c +++ b/src/core/crypto/onion_crypto.c @@ -312,6 +312,14 @@ onion_skin_server_handshake(int type, * parameters we've just negotiated */ + /* NOTE! DANGER, DANGER, DANGER! + + Remember that this function can be run in a worker thread, and so + therefore you can't access "global" state that isn't lock-protected. + + CAVEAT HAXX0R! + */ + tor_free(client_msg); } diff --git a/src/core/mainloop/cpuworker.c b/src/core/mainloop/cpuworker.c index 2f6dae36a8..8da042aa57 100644 --- a/src/core/mainloop/cpuworker.c +++ b/src/core/mainloop/cpuworker.c @@ -158,6 +158,8 @@ typedef struct cpuworker_reply_t { uint8_t keys[CPATH_KEY_MATERIAL_LEN]; /** Input to use for authenticating introduce1 cells. */ uint8_t rend_auth_material[DIGEST_LEN]; + /** Negotiated circuit parameters. */ + circuit_params_t circ_params; } cpuworker_reply_t; typedef struct cpuworker_job_u_t { @@ -387,6 +389,10 @@ cpuworker_onion_handshake_replyfn(void *work_) circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); goto done_processing; } + + /* TODO! We need to use rpl.circ_params here to initialize the congestion + control parameters of the circuit. */ + log_debug(LD_OR,"onionskin_answer succeeded. Yay."); done_processing: @@ -416,7 +422,6 @@ cpuworker_onion_handshake_threadfn(void *state_, void *work_) const create_cell_t *cc = &req.create_cell; created_cell_t *cell_out = &rpl.created_cell; struct timeval tv_start = {0,0}, tv_end; - circuit_params_t params; int n; rpl.timed = req.timed; rpl.started_at = req.started_at; @@ -430,7 +435,7 @@ cpuworker_onion_handshake_threadfn(void *state_, void *work_) sizeof(cell_out->reply), rpl.keys, CPATH_KEY_MATERIAL_LEN, rpl.rend_auth_material, - &params); + &rpl.circ_params); if (n < 0) { /* failure */ log_debug(LD_OR,"onion_skin_server_handshake failed."); @@ -454,8 +459,6 @@ cpuworker_onion_handshake_threadfn(void *state_, void *work_) rpl.success = 1; } - // TODO: pass the parameters back up so we can initialize the cc paremeters. - rpl.magic = CPUWORKER_REPLY_MAGIC; if (req.timed) { struct timeval tv_diff;

1 0

[tor/main] Hook up client usage of congestion control negotiation
by dgoulet＠torproject.org 22 Feb '22

22 Feb '22

commit 76bdadce121b0c33f46bb3d4e5eb0e8dc3277614 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 4 00:46:11 2021 +0000 Hook up client usage of congestion control negotiation --- src/core/or/circuitbuild.c | 52 ++++++++++++++++++++++++++++++++------- src/core/or/circuituse.c | 6 +++-- src/core/or/command.c | 4 +-- src/core/or/extend_info_st.h | 7 +++--- src/core/or/extendinfo.c | 20 +++++++++------ src/core/or/extendinfo.h | 6 +++-- src/feature/control/control_cmd.c | 5 +++- 7 files changed, 72 insertions(+), 28 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 53582d2829..61d67c350d 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -72,6 +72,7 @@ #include "feature/stats/predict_ports.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/trace/events.h" +#include "core/or/congestion_control_common.h" #include "core/or/cell_st.h" #include "core/or/cpath_build_state_st.h" @@ -80,6 +81,7 @@ #include "feature/nodelist/node_st.h" #include "core/or/or_circuit_st.h" #include "core/or/origin_circuit_st.h" +#include "trunnel/circ_params.h" static int circuit_send_first_onion_skin(origin_circuit_t *circ); static int circuit_build_no_more_hops(origin_circuit_t *circ); @@ -841,7 +843,10 @@ circuit_pick_create_handshake(uint8_t *cell_type_out, * using the TAP handshake, and CREATE2 otherwise. */ if (extend_info_supports_ntor(ei)) { *cell_type_out = CELL_CREATE2; - if (ei->supports_ntor3_and_param_negotiation) + /* Only use ntor v3 with exits that support congestion control, + * and only when it is enabled. */ + if (ei->exit_supports_congestion_control && + congestion_control_enabled()) *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR_V3; else *handshake_type_out = ONION_HANDSHAKE_TYPE_NTOR; @@ -1263,12 +1268,14 @@ circuit_finish_handshake(origin_circuit_t *circ, onion_handshake_state_release(&hop->handshake_state); - // XXXX TODO-324: use `params` to initialize the congestion control. - if (cpath_init_circuit_crypto(hop, keys, sizeof(keys), 0, 0)<0) { return -END_CIRC_REASON_TORPROTOCOL; } + if (params.cc_enabled) { + hop->ccontrol = congestion_control_new(&params); + } + hop->state = CPATH_STATE_OPEN; log_info(LD_CIRC,"Finished building circuit hop:"); circuit_log_path(LOG_INFO,LD_CIRC,circ); @@ -2068,7 +2075,10 @@ onion_pick_cpath_exit(origin_circuit_t *circ, extend_info_t *exit_ei, log_warn(LD_CIRC,"Failed to choose an exit server"); return -1; } - exit_ei = extend_info_from_node(node, state->onehop_tunnel); + exit_ei = extend_info_from_node(node, state->onehop_tunnel, + /* for_exit_use */ + !state->is_internal && TO_CIRCUIT(circ)->purpose == + CIRCUIT_PURPOSE_C_GENERAL); if (BUG(exit_ei == NULL)) return -1; } @@ -2464,7 +2474,7 @@ onion_extend_cpath(origin_circuit_t *circ) primary address, for potentially connecting to an IPv6 OR port. Servers always want the primary (IPv4) address. */ int client = (server_mode(get_options()) == 0); - info = extend_info_from_node(r, client); + info = extend_info_from_node(r, client, false); /* Clients can fail to find an allowed address */ tor_assert_nonfatal(info || client); } @@ -2472,7 +2482,7 @@ onion_extend_cpath(origin_circuit_t *circ) const node_t *r = choose_good_middle_server(purpose, state, circ->cpath, cur_len); if (r) { - info = extend_info_from_node(r, 0); + info = extend_info_from_node(r, 0, false); } } @@ -2597,9 +2607,33 @@ client_circ_negotiation_message(const extend_info_t *ei, size_t *msg_len_out) { tor_assert(ei && msg_out && msg_len_out); - if (! ei->supports_ntor3_and_param_negotiation) + circ_params_request_t params = {0}; + ssize_t msg_len = 0; + + if (! ei->exit_supports_congestion_control) return -1; - /* TODO-324: fill in the client message that gets sent. */ - tor_assert_unreached(); + circ_params_request_set_version(&params, 0); + + circ_params_request_set_cc_supported(&params, + congestion_control_enabled()); + + msg_len = circ_params_request_encoded_len(&params); + + if (msg_len < 0) { + return -1; + } + + *msg_out = tor_malloc_zero(msg_len); + + msg_len = circ_params_request_encode(*msg_out, msg_len, &params); + + if (msg_len < 0) { + tor_free(*msg_out); + return -1; + } + + *msg_len_out = (size_t)msg_len; + + return 0; } diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 104e898d6c..a259957d37 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2427,7 +2427,8 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, /* We might want to connect to an IPv6 bridge for loading descriptors so we use the preferred address rather than the primary. */ - extend_info = extend_info_from_node(r, conn->want_onehop ? 1 : 0); + extend_info = extend_info_from_node(r, conn->want_onehop ? 1 : 0, + desired_circuit_purpose == CIRCUIT_PURPOSE_C_GENERAL); if (!extend_info) { log_warn(LD_CIRC,"Could not make a one-hop connection to %s. " "Discarding this circuit.", conn->chosen_exit_name); @@ -2463,7 +2464,8 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn, NULL, /* Ed25519 ID */ NULL, NULL, /* onion keys */ &addr, conn->socks_request->port, - NULL); + NULL, + false); } else { /* ! (want_onehop && conn->chosen_exit_name[0] == '$') */ /* We will need an onion key for the router, and we * don't have one. Refuse or relax requirements. */ diff --git a/src/core/or/command.c b/src/core/or/command.c index 12e4c26768..ffdd1f19d9 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -367,6 +367,7 @@ command_process_create_cell(cell_t *cell, channel_t *chan) create_cell->onionskin, create_cell->handshake_len, NULL, + NULL, created_cell.reply, sizeof(created_cell.reply), keys, CPATH_KEY_MATERIAL_LEN, @@ -381,9 +382,6 @@ command_process_create_cell(cell_t *cell, channel_t *chan) created_cell.cell_type = CELL_CREATED_FAST; created_cell.handshake_len = len; - // TODO-324: We should in theory look at params here, though it will - // always tell us to use the old-fashioned congestion control. - if (onionskin_answer(circ, &created_cell, (const char *)keys, sizeof(keys), rend_circ_nonce)<0) { diff --git a/src/core/or/extend_info_st.h b/src/core/or/extend_info_st.h index 1666b168ad..2ab0beb7e6 100644 --- a/src/core/or/extend_info_st.h +++ b/src/core/or/extend_info_st.h @@ -38,9 +38,10 @@ struct extend_info_t { crypto_pk_t *onion_key; /** Ntor onion key for this hop. */ curve25519_public_key_t curve25519_onion_key; - /** True if this hop supports NtorV3 _and_ negotiation of at least one - * relevant circuit parameter (currently only congestion control). */ - bool supports_ntor3_and_param_negotiation; + /** True if this hop is to be used as an _exit_, + * and it also supports supports NtorV3 _and_ negotiation + * of congestion control parameters */ + bool exit_supports_congestion_control; }; #endif /* !defined(EXTEND_INFO_ST_H) */ diff --git a/src/core/or/extendinfo.c b/src/core/or/extendinfo.c index ca2288e0a4..ca623f09ce 100644 --- a/src/core/or/extendinfo.c +++ b/src/core/or/extendinfo.c @@ -36,7 +36,8 @@ extend_info_new(const char *nickname, crypto_pk_t *onion_key, const curve25519_public_key_t *ntor_key, const tor_addr_t *addr, uint16_t port, - const protover_summary_flags_t *pv) + const protover_summary_flags_t *pv, + bool for_exit_use) { extend_info_t *info = tor_malloc_zero(sizeof(extend_info_t)); if (rsa_id_digest) @@ -58,9 +59,9 @@ extend_info_new(const char *nickname, extend_info_add_orport(info, addr, port); } - if (pv) { - info->supports_ntor3_and_param_negotiation = - pv->supports_ntor3_and_param_negotiation; + if (pv && for_exit_use) { + info->exit_supports_congestion_control = + pv->supports_congestion_control; } return info; @@ -96,7 +97,8 @@ extend_info_add_orport(extend_info_t *ei, * and IP version config. **/ extend_info_t * -extend_info_from_node(const node_t *node, int for_direct_connect) +extend_info_from_node(const node_t *node, int for_direct_connect, + bool for_exit) { crypto_pk_t *rsa_pubkey = NULL; extend_info_t *info = NULL; @@ -157,7 +159,8 @@ extend_info_from_node(const node_t *node, int for_direct_connect) curve_pubkey, &ap.addr, ap.port, - &node->ri->pv); + &node->ri->pv, + for_exit); } else if (valid_addr && node->rs && node->md) { info = extend_info_new(node->rs->nickname, node->identity, @@ -166,7 +169,8 @@ extend_info_from_node(const node_t *node, int for_direct_connect) curve_pubkey, &ap.addr, ap.port, - &node->rs->pv); + &node->rs->pv, + for_exit); } crypto_pk_free(rsa_pubkey); @@ -225,7 +229,7 @@ extend_info_supports_ntor_v3(const extend_info_t *ei) { tor_assert(ei); return extend_info_supports_ntor(ei) && - ei->supports_ntor3_and_param_negotiation; + ei->exit_supports_congestion_control; } /* Does ei have an onion key which it would prefer to use? diff --git a/src/core/or/extendinfo.h b/src/core/or/extendinfo.h index 8781cc7047..6d1f20597b 100644 --- a/src/core/or/extendinfo.h +++ b/src/core/or/extendinfo.h @@ -18,8 +18,10 @@ extend_info_t *extend_info_new(const char *nickname, crypto_pk_t *onion_key, const struct curve25519_public_key_t *ntor_key, const tor_addr_t *addr, uint16_t port, - const struct protover_summary_flags_t *pv); -extend_info_t *extend_info_from_node(const node_t *r, int for_direct_connect); + const struct protover_summary_flags_t *pv, + bool for_exit_use); +extend_info_t *extend_info_from_node(const node_t *r, int for_direct_connect, + bool for_exit); extend_info_t *extend_info_dup(extend_info_t *info); void extend_info_free_(extend_info_t *info); #define extend_info_free(info) \ diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index b19935e456..dd0cde4f7d 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -823,7 +823,10 @@ handle_control_extendcircuit(control_connection_t *conn, first_node = zero_circ; SMARTLIST_FOREACH(nodes, const node_t *, node, { - extend_info_t *info = extend_info_from_node(node, first_node); + /* We treat every hop as an exit to try to negotiate congestion + * control, because we have no idea which hop the controller wil + * try to use for streams and when */ + extend_info_t *info = extend_info_from_node(node, first_node, true); if (!info) { tor_assert_nonfatal(first_node); log_warn(LD_CONTROL,

1 0

[tor/main] Add stub argument for constructing congestion_control_t
by dgoulet＠torproject.org 22 Feb '22

22 Feb '22

commit 662b9c1c0d3a279359703487d97b155dcb89151a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 14 17:13:05 2021 -0400 Add stub argument for constructing congestion_control_t --- src/core/or/congestion_control_common.c | 6 +++++- src/core/or/congestion_control_common.h | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/or/congestion_control_common.c b/src/core/or/congestion_control_common.c index 0919f037db..f2becb9b20 100644 --- a/src/core/or/congestion_control_common.c +++ b/src/core/or/congestion_control_common.c @@ -10,6 +10,7 @@ #include "core/or/or.h" +#include "core/crypto/onion_crypto.h" #include "core/or/circuitlist.h" #include "core/or/crypt_path.h" #include "core/or/or_circuit_st.h" @@ -272,10 +273,13 @@ congestion_control_init(congestion_control_t *cc, cc_alg_t cc_alg, /** Allocate and initialize a new congestion control object */ congestion_control_t * -congestion_control_new(void) +congestion_control_new(const circuit_params_t *params) { congestion_control_t *cc = tor_malloc_zero(sizeof(congestion_control_t)); + /* TODO: Use `params` to pick the algorithm and the window. */ + (void) params; + // XXX: the alg and the sendme_inc need to be negotiated during // circuit handshake congestion_control_init(cc, CC_ALG_VEGAS, SENDME_INC_DFLT); diff --git a/src/core/or/congestion_control_common.h b/src/core/or/congestion_control_common.h index 01dbc1ceb4..1c44e6b0ef 100644 --- a/src/core/or/congestion_control_common.h +++ b/src/core/or/congestion_control_common.h @@ -20,7 +20,10 @@ typedef struct congestion_control_t congestion_control_t; void congestion_control_free_(congestion_control_t *cc); -congestion_control_t *congestion_control_new(void); +/* TODO: Whisky Tango Foxtot‽ Nothing calls this function anywhere! */ +struct circuit_params_t; +congestion_control_t *congestion_control_new( + const struct circuit_params_t *params); int congestion_control_dispatch_cc_alg(congestion_control_t *cc, const circuit_t *circ,

1 0

[tor/main] Add circuit param payload definitions to trunnel
by dgoulet＠torproject.org 22 Feb '22

22 Feb '22

commit 095224cdfa5563973e4832c46f0d162310393156 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 4 00:01:33 2021 +0000 Add circuit param payload definitions to trunnel --- src/trunnel/circ_params.c | 452 ++++++++++++++++++++++++++++++++++++++++ src/trunnel/circ_params.h | 147 +++++++++++++ src/trunnel/circ_params.trunnel | 25 +++ src/trunnel/include.am | 3 + 4 files changed, 627 insertions(+) diff --git a/src/trunnel/circ_params.c b/src/trunnel/circ_params.c new file mode 100644 index 0000000000..650b533a0c --- /dev/null +++ b/src/trunnel/circ_params.c @@ -0,0 +1,452 @@ +/* circ_params.c -- generated by Trunnel v1.5.3. + * https://gitweb.torproject.org/trunnel.git + * You probably shouldn't edit this file. + */ +#include <stdlib.h> +#include "trunnel-impl.h" + +#include "circ_params.h" + +#define TRUNNEL_SET_ERROR_CODE(obj) \ + do { \ + (obj)->trunnel_error_code_ = 1; \ + } while (0) + +#if defined(__COVERITY__) || defined(__clang_analyzer__) +/* If we're running a static analysis tool, we don't want it to complain + * that some of our remaining-bytes checks are dead-code. */ +int circparams_deadcode_dummy__ = 0; +#define OR_DEADCODE_DUMMY || circparams_deadcode_dummy__ +#else +#define OR_DEADCODE_DUMMY +#endif + +#define CHECK_REMAINING(nbytes, label) \ + do { \ + if (remaining < (nbytes) OR_DEADCODE_DUMMY) { \ + goto label; \ + } \ + } while (0) + +circ_params_request_t * +circ_params_request_new(void) +{ + circ_params_request_t *val = trunnel_calloc(1, sizeof(circ_params_request_t)); + if (NULL == val) + return NULL; + return val; +} + +/** Release all storage held inside 'obj', but do not free 'obj'. + */ +static void +circ_params_request_clear(circ_params_request_t *obj) +{ + (void) obj; +} + +void +circ_params_request_free(circ_params_request_t *obj) +{ + if (obj == NULL) + return; + circ_params_request_clear(obj); + trunnel_memwipe(obj, sizeof(circ_params_request_t)); + trunnel_free_(obj); +} + +uint8_t +circ_params_request_get_version(const circ_params_request_t *inp) +{ + return inp->version; +} +int +circ_params_request_set_version(circ_params_request_t *inp, uint8_t val) +{ + if (! ((val == 0))) { + TRUNNEL_SET_ERROR_CODE(inp); + return -1; + } + inp->version = val; + return 0; +} +uint8_t +circ_params_request_get_cc_supported(const circ_params_request_t *inp) +{ + return inp->cc_supported; +} +int +circ_params_request_set_cc_supported(circ_params_request_t *inp, uint8_t val) +{ + if (! ((val == 0 || val == 1))) { + TRUNNEL_SET_ERROR_CODE(inp); + return -1; + } + inp->cc_supported = val; + return 0; +} +const char * +circ_params_request_check(const circ_params_request_t *obj) +{ + if (obj == NULL) + return "Object was NULL"; + if (obj->trunnel_error_code_) + return "A set function failed on this object"; + if (! (obj->version == 0)) + return "Integer out of bounds"; + if (! (obj->cc_supported == 0 || obj->cc_supported == 1)) + return "Integer out of bounds"; + return NULL; +} + +ssize_t +circ_params_request_encoded_len(const circ_params_request_t *obj) +{ + ssize_t result = 0; + + if (NULL != circ_params_request_check(obj)) + return -1; + + + /* Length of u8 version IN [0] */ + result += 1; + + /* Length of u8 cc_supported IN [0, 1] */ + result += 1; + return result; +} +int +circ_params_request_clear_errors(circ_params_request_t *obj) +{ + int r = obj->trunnel_error_code_; + obj->trunnel_error_code_ = 0; + return r; +} +ssize_t +circ_params_request_encode(uint8_t *output, const size_t avail, const circ_params_request_t *obj) +{ + ssize_t result = 0; + size_t written = 0; + uint8_t *ptr = output; + const char *msg; +#ifdef TRUNNEL_CHECK_ENCODED_LEN + const ssize_t encoded_len = circ_params_request_encoded_len(obj); +#endif + + if (NULL != (msg = circ_params_request_check(obj))) + goto check_failed; + +#ifdef TRUNNEL_CHECK_ENCODED_LEN + trunnel_assert(encoded_len >= 0); +#endif + + /* Encode u8 version IN [0] */ + trunnel_assert(written <= avail); + if (avail - written < 1) + goto truncated; + trunnel_set_uint8(ptr, (obj->version)); + written += 1; ptr += 1; + + /* Encode u8 cc_supported IN [0, 1] */ + trunnel_assert(written <= avail); + if (avail - written < 1) + goto truncated; + trunnel_set_uint8(ptr, (obj->cc_supported)); + written += 1; ptr += 1; + + + trunnel_assert(ptr == output + written); +#ifdef TRUNNEL_CHECK_ENCODED_LEN + { + trunnel_assert(encoded_len >= 0); + trunnel_assert((size_t)encoded_len == written); + } + +#endif + + return written; + + truncated: + result = -2; + goto fail; + check_failed: + (void)msg; + result = -1; + goto fail; + fail: + trunnel_assert(result < 0); + return result; +} + +/** As circ_params_request_parse(), but do not allocate the output + * object. + */ +static ssize_t +circ_params_request_parse_into(circ_params_request_t *obj, const uint8_t *input, const size_t len_in) +{ + const uint8_t *ptr = input; + size_t remaining = len_in; + ssize_t result = 0; + (void)result; + + /* Parse u8 version IN [0] */ + CHECK_REMAINING(1, truncated); + obj->version = (trunnel_get_uint8(ptr)); + remaining -= 1; ptr += 1; + if (! (obj->version == 0)) + goto fail; + + /* Parse u8 cc_supported IN [0, 1] */ + CHECK_REMAINING(1, truncated); + obj->cc_supported = (trunnel_get_uint8(ptr)); + remaining -= 1; ptr += 1; + if (! (obj->cc_supported == 0 || obj->cc_supported == 1)) + goto fail; + trunnel_assert(ptr + remaining == input + len_in); + return len_in - remaining; + + truncated: + return -2; + fail: + result = -1; + return result; +} + +ssize_t +circ_params_request_parse(circ_params_request_t **output, const uint8_t *input, const size_t len_in) +{ + ssize_t result; + *output = circ_params_request_new(); + if (NULL == *output) + return -1; + result = circ_params_request_parse_into(*output, input, len_in); + if (result < 0) { + circ_params_request_free(*output); + *output = NULL; + } + return result; +} +circ_params_response_t * +circ_params_response_new(void) +{ + circ_params_response_t *val = trunnel_calloc(1, sizeof(circ_params_response_t)); + if (NULL == val) + return NULL; + return val; +} + +/** Release all storage held inside 'obj', but do not free 'obj'. + */ +static void +circ_params_response_clear(circ_params_response_t *obj) +{ + (void) obj; +} + +void +circ_params_response_free(circ_params_response_t *obj) +{ + if (obj == NULL) + return; + circ_params_response_clear(obj); + trunnel_memwipe(obj, sizeof(circ_params_response_t)); + trunnel_free_(obj); +} + +uint8_t +circ_params_response_get_version(const circ_params_response_t *inp) +{ + return inp->version; +} +int +circ_params_response_set_version(circ_params_response_t *inp, uint8_t val) +{ + if (! ((val == 0))) { + TRUNNEL_SET_ERROR_CODE(inp); + return -1; + } + inp->version = val; + return 0; +} +uint8_t +circ_params_response_get_cc_enabled(const circ_params_response_t *inp) +{ + return inp->cc_enabled; +} +int +circ_params_response_set_cc_enabled(circ_params_response_t *inp, uint8_t val) +{ + if (! ((val == 0 || val == 1))) { + TRUNNEL_SET_ERROR_CODE(inp); + return -1; + } + inp->cc_enabled = val; + return 0; +} +uint8_t +circ_params_response_get_sendme_inc_cells(const circ_params_response_t *inp) +{ + return inp->sendme_inc_cells; +} +int +circ_params_response_set_sendme_inc_cells(circ_params_response_t *inp, uint8_t val) +{ + inp->sendme_inc_cells = val; + return 0; +} +const char * +circ_params_response_check(const circ_params_response_t *obj) +{ + if (obj == NULL) + return "Object was NULL"; + if (obj->trunnel_error_code_) + return "A set function failed on this object"; + if (! (obj->version == 0)) + return "Integer out of bounds"; + if (! (obj->cc_enabled == 0 || obj->cc_enabled == 1)) + return "Integer out of bounds"; + return NULL; +} + +ssize_t +circ_params_response_encoded_len(const circ_params_response_t *obj) +{ + ssize_t result = 0; + + if (NULL != circ_params_response_check(obj)) + return -1; + + + /* Length of u8 version IN [0] */ + result += 1; + + /* Length of u8 cc_enabled IN [0, 1] */ + result += 1; + + /* Length of u8 sendme_inc_cells */ + result += 1; + return result; +} +int +circ_params_response_clear_errors(circ_params_response_t *obj) +{ + int r = obj->trunnel_error_code_; + obj->trunnel_error_code_ = 0; + return r; +} +ssize_t +circ_params_response_encode(uint8_t *output, const size_t avail, const circ_params_response_t *obj) +{ + ssize_t result = 0; + size_t written = 0; + uint8_t *ptr = output; + const char *msg; +#ifdef TRUNNEL_CHECK_ENCODED_LEN + const ssize_t encoded_len = circ_params_response_encoded_len(obj); +#endif + + if (NULL != (msg = circ_params_response_check(obj))) + goto check_failed; + +#ifdef TRUNNEL_CHECK_ENCODED_LEN + trunnel_assert(encoded_len >= 0); +#endif + + /* Encode u8 version IN [0] */ + trunnel_assert(written <= avail); + if (avail - written < 1) + goto truncated; + trunnel_set_uint8(ptr, (obj->version)); + written += 1; ptr += 1; + + /* Encode u8 cc_enabled IN [0, 1] */ + trunnel_assert(written <= avail); + if (avail - written < 1) + goto truncated; + trunnel_set_uint8(ptr, (obj->cc_enabled)); + written += 1; ptr += 1; + + /* Encode u8 sendme_inc_cells */ + trunnel_assert(written <= avail); + if (avail - written < 1) + goto truncated; + trunnel_set_uint8(ptr, (obj->sendme_inc_cells)); + written += 1; ptr += 1; + + + trunnel_assert(ptr == output + written); +#ifdef TRUNNEL_CHECK_ENCODED_LEN + { + trunnel_assert(encoded_len >= 0); + trunnel_assert((size_t)encoded_len == written); + } + +#endif + + return written; + + truncated: + result = -2; + goto fail; + check_failed: + (void)msg; + result = -1; + goto fail; + fail: + trunnel_assert(result < 0); + return result; +} + +/** As circ_params_response_parse(), but do not allocate the output + * object. + */ +static ssize_t +circ_params_response_parse_into(circ_params_response_t *obj, const uint8_t *input, const size_t len_in) +{ + const uint8_t *ptr = input; + size_t remaining = len_in; + ssize_t result = 0; + (void)result; + + /* Parse u8 version IN [0] */ + CHECK_REMAINING(1, truncated); + obj->version = (trunnel_get_uint8(ptr)); + remaining -= 1; ptr += 1; + if (! (obj->version == 0)) + goto fail; + + /* Parse u8 cc_enabled IN [0, 1] */ + CHECK_REMAINING(1, truncated); + obj->cc_enabled = (trunnel_get_uint8(ptr)); + remaining -= 1; ptr += 1; + if (! (obj->cc_enabled == 0 || obj->cc_enabled == 1)) + goto fail; + + /* Parse u8 sendme_inc_cells */ + CHECK_REMAINING(1, truncated); + obj->sendme_inc_cells = (trunnel_get_uint8(ptr)); + remaining -= 1; ptr += 1; + trunnel_assert(ptr + remaining == input + len_in); + return len_in - remaining; + + truncated: + return -2; + fail: + result = -1; + return result; +} + +ssize_t +circ_params_response_parse(circ_params_response_t **output, const uint8_t *input, const size_t len_in) +{ + ssize_t result; + *output = circ_params_response_new(); + if (NULL == *output) + return -1; + result = circ_params_response_parse_into(*output, input, len_in); + if (result < 0) { + circ_params_response_free(*output); + *output = NULL; + } + return result; +} diff --git a/src/trunnel/circ_params.h b/src/trunnel/circ_params.h new file mode 100644 index 0000000000..f69b0073dc --- /dev/null +++ b/src/trunnel/circ_params.h @@ -0,0 +1,147 @@ +/* circ_params.h -- generated by Trunnel v1.5.3. + * https://gitweb.torproject.org/trunnel.git + * You probably shouldn't edit this file. + */ +#ifndef TRUNNEL_CIRC_PARAMS_H +#define TRUNNEL_CIRC_PARAMS_H + +#include <stdint.h> +#include "trunnel.h" + +#if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_CIRC_PARAMS_REQUEST) +struct circ_params_request_st { + uint8_t version; + uint8_t cc_supported; + uint8_t trunnel_error_code_; +}; +#endif +typedef struct circ_params_request_st circ_params_request_t; +#if !defined(TRUNNEL_OPAQUE) && !defined(TRUNNEL_OPAQUE_CIRC_PARAMS_RESPONSE) +struct circ_params_response_st { + uint8_t version; + uint8_t cc_enabled; + uint8_t sendme_inc_cells; + uint8_t trunnel_error_code_; +}; +#endif +typedef struct circ_params_response_st circ_params_response_t; +/** Return a newly allocated circ_params_request with all elements set + * to zero. + */ +circ_params_request_t *circ_params_request_new(void); +/** Release all storage held by the circ_params_request in 'victim'. + * (Do nothing if 'victim' is NULL.) + */ +void circ_params_request_free(circ_params_request_t *victim); +/** Try to parse a circ_params_request from the buffer in 'input', + * using up to 'len_in' bytes from the input buffer. On success, + * return the number of bytes consumed and set *output to the newly + * allocated circ_params_request_t. On failure, return -2 if the input + * appears truncated, and -1 if the input is otherwise invalid. + */ +ssize_t circ_params_request_parse(circ_params_request_t **output, const uint8_t *input, const size_t len_in); +/** Return the number of bytes we expect to need to encode the + * circ_params_request in 'obj'. On failure, return a negative value. + * Note that this value may be an overestimate, and can even be an + * underestimate for certain unencodeable objects. + */ +ssize_t circ_params_request_encoded_len(const circ_params_request_t *obj); +/** Try to encode the circ_params_request from 'input' into the buffer + * at 'output', using up to 'avail' bytes of the output buffer. On + * success, return the number of bytes used. On failure, return -2 if + * the buffer was not long enough, and -1 if the input was invalid. + */ +ssize_t circ_params_request_encode(uint8_t *output, size_t avail, const circ_params_request_t *input); +/** Check whether the internal state of the circ_params_request in + * 'obj' is consistent. Return NULL if it is, and a short message if + * it is not. + */ +const char *circ_params_request_check(const circ_params_request_t *obj); +/** Clear any errors that were set on the object 'obj' by its setter + * functions. Return true iff errors were cleared. + */ +int circ_params_request_clear_errors(circ_params_request_t *obj); +/** Return the value of the version field of the circ_params_request_t + * in 'inp' + */ +uint8_t circ_params_request_get_version(const circ_params_request_t *inp); +/** Set the value of the version field of the circ_params_request_t in + * 'inp' to 'val'. Return 0 on success; return -1 and set the error + * code on 'inp' on failure. + */ +int circ_params_request_set_version(circ_params_request_t *inp, uint8_t val); +/** Return the value of the cc_supported field of the + * circ_params_request_t in 'inp' + */ +uint8_t circ_params_request_get_cc_supported(const circ_params_request_t *inp); +/** Set the value of the cc_supported field of the + * circ_params_request_t in 'inp' to 'val'. Return 0 on success; + * return -1 and set the error code on 'inp' on failure. + */ +int circ_params_request_set_cc_supported(circ_params_request_t *inp, uint8_t val); +/** Return a newly allocated circ_params_response with all elements + * set to zero. + */ +circ_params_response_t *circ_params_response_new(void); +/** Release all storage held by the circ_params_response in 'victim'. + * (Do nothing if 'victim' is NULL.) + */ +void circ_params_response_free(circ_params_response_t *victim); +/** Try to parse a circ_params_response from the buffer in 'input', + * using up to 'len_in' bytes from the input buffer. On success, + * return the number of bytes consumed and set *output to the newly + * allocated circ_params_response_t. On failure, return -2 if the + * input appears truncated, and -1 if the input is otherwise invalid. + */ +ssize_t circ_params_response_parse(circ_params_response_t **output, const uint8_t *input, const size_t len_in); +/** Return the number of bytes we expect to need to encode the + * circ_params_response in 'obj'. On failure, return a negative value. + * Note that this value may be an overestimate, and can even be an + * underestimate for certain unencodeable objects. + */ +ssize_t circ_params_response_encoded_len(const circ_params_response_t *obj); +/** Try to encode the circ_params_response from 'input' into the + * buffer at 'output', using up to 'avail' bytes of the output buffer. + * On success, return the number of bytes used. On failure, return -2 + * if the buffer was not long enough, and -1 if the input was invalid. + */ +ssize_t circ_params_response_encode(uint8_t *output, size_t avail, const circ_params_response_t *input); +/** Check whether the internal state of the circ_params_response in + * 'obj' is consistent. Return NULL if it is, and a short message if + * it is not. + */ +const char *circ_params_response_check(const circ_params_response_t *obj); +/** Clear any errors that were set on the object 'obj' by its setter + * functions. Return true iff errors were cleared. + */ +int circ_params_response_clear_errors(circ_params_response_t *obj); +/** Return the value of the version field of the + * circ_params_response_t in 'inp' + */ +uint8_t circ_params_response_get_version(const circ_params_response_t *inp); +/** Set the value of the version field of the circ_params_response_t + * in 'inp' to 'val'. Return 0 on success; return -1 and set the error + * code on 'inp' on failure. + */ +int circ_params_response_set_version(circ_params_response_t *inp, uint8_t val); +/** Return the value of the cc_enabled field of the + * circ_params_response_t in 'inp' + */ +uint8_t circ_params_response_get_cc_enabled(const circ_params_response_t *inp); +/** Set the value of the cc_enabled field of the + * circ_params_response_t in 'inp' to 'val'. Return 0 on success; + * return -1 and set the error code on 'inp' on failure. + */ +int circ_params_response_set_cc_enabled(circ_params_response_t *inp, uint8_t val); +/** Return the value of the sendme_inc_cells field of the + * circ_params_response_t in 'inp' + */ +uint8_t circ_params_response_get_sendme_inc_cells(const circ_params_response_t *inp); +/** Set the value of the sendme_inc_cells field of the + * circ_params_response_t in 'inp' to 'val'. Return 0 on success; + * return -1 and set the error code on 'inp' on failure. + */ +int circ_params_response_set_sendme_inc_cells(circ_params_response_t *inp, uint8_t val); + + +#endif diff --git a/src/trunnel/circ_params.trunnel b/src/trunnel/circ_params.trunnel new file mode 100644 index 0000000000..74f84b05ff --- /dev/null +++ b/src/trunnel/circ_params.trunnel @@ -0,0 +1,25 @@ +/* This file contains the definition for the encrypted payload of + * a circuit parameter negotiation request/response portion of the + * ntorv3 onionskin handshake. Currently only supports congestion + * control params. */ + +/* Param definitions */ +struct circ_params_request { + /* Version */ + u8 version IN [0]; + + /* Is cc supported or not? */ + u8 cc_supported IN [0, 1]; +} + +/* Param definitions */ +struct circ_params_response { + /* Version */ + u8 version IN [0]; + + /* Is cc supported or not? */ + u8 cc_enabled IN [0, 1]; + + /* How many cells does a SENDME ack? */ + u8 sendme_inc_cells; +} diff --git a/src/trunnel/include.am b/src/trunnel/include.am index 00a96536f1..d551af83bd 100644 --- a/src/trunnel/include.am +++ b/src/trunnel/include.am @@ -13,6 +13,7 @@ TRUNNELINPUTS = \ src/trunnel/channelpadding_negotiation.trunnel \ src/trunnel/sendme_cell.trunnel \ src/trunnel/flow_control_cells.trunnel \ + src/trunnel/circ_params.trunnel \ src/trunnel/socks5.trunnel \ src/trunnel/circpad_negotiation.trunnel @@ -28,6 +29,7 @@ TRUNNELSOURCES = \ src/trunnel/channelpadding_negotiation.c \ src/trunnel/sendme_cell.c \ src/trunnel/flow_control_cells.c \ + src/trunnel/circ_params.c \ src/trunnel/socks5.c \ src/trunnel/netinfo.c \ src/trunnel/circpad_negotiation.c @@ -46,6 +48,7 @@ TRUNNELHEADERS = \ src/trunnel/channelpadding_negotiation.h \ src/trunnel/sendme_cell.h \ src/trunnel/flow_control_cells.h \ + src/trunnel/circ_params.h \ src/trunnel/socks5.h \ src/trunnel/netinfo.h \ src/trunnel/circpad_negotiation.h

1 0

[tor/main] Convert TODO into TODO-324 for better visibility.
by dgoulet＠torproject.org 22 Feb '22

22 Feb '22

commit 93318ba5e21851f486e148ff216d239c4ca25ce7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Sep 14 17:23:31 2021 -0400 Convert TODO into TODO-324 for better visibility. --- src/core/crypto/onion_crypto.c | 21 ++++++++++----------- src/core/mainloop/cpuworker.c | 2 +- src/core/or/circuitbuild.c | 4 ++-- src/core/or/command.c | 4 ++-- src/core/or/congestion_control_common.c | 4 ++-- src/core/or/congestion_control_common.h | 6 +++++- src/core/or/or.h | 2 +- src/core/or/protover.c | 4 ++-- src/core/or/versions.c | 2 +- src/feature/hs/hs_common.c | 11 +++++++++-- 10 files changed, 35 insertions(+), 25 deletions(-) diff --git a/src/core/crypto/onion_crypto.c b/src/core/crypto/onion_crypto.c index 390151b5df..1e9913539f 100644 --- a/src/core/crypto/onion_crypto.c +++ b/src/core/crypto/onion_crypto.c @@ -47,7 +47,7 @@ #include "core/or/crypt_path_st.h" #include "core/or/extend_info_st.h" -/* TODO: Add this to the specification! */ +/* TODO-324: Add this to the specification! */ const uint8_t NTOR3_CIRC_VERIFICATION[] = "circuit extend"; const size_t NTOR3_CIRC_VERIFICATION_LEN = 14; @@ -233,7 +233,7 @@ onion_skin_server_handshake(int type, circuit_params_t *params_out) { int r = -1; - memset(params_out, 0, sizeof(*params_out)); // TODO: actually set. + memset(params_out, 0, sizeof(*params_out)); // TODO-324: actually set this! switch (type) { case ONION_HANDSHAKE_TYPE_TAP: @@ -306,10 +306,10 @@ onion_skin_server_handshake(int type, uint8_t reply_msg[1] = { 0 }; size_t reply_msg_len = 1; { - /* TODO, Okay, we have a message from the client trying to negotiate - * parameters. We need to decide whether the client's request is - * okay, what we're going to say in response, and what circuit - * parameters we've just negotiated + /* TODO-324, Okay, we have a message from the client trying to negotiate + * parameters. We need to decide whether the client's request is okay, + * what we're going to say in response, and what circuit parameters + * we've just negotiated */ /* NOTE! DANGER, DANGER, DANGER! @@ -331,12 +331,12 @@ onion_skin_server_handshake(int type, reply_msg, reply_msg_len, &server_handshake, &server_handshake_len, keys_tmp, keys_tmp_len) < 0) { - // XXX TODO free some stuff + // XXX TODO-324 free some stuff return -1; } if (server_handshake_len > reply_out_maxlen) { - // XXX TODO free that stuff + // XXX TODO-324 free that stuff return -1; } @@ -382,7 +382,7 @@ onion_skin_client_handshake(int type, if (handshake_state->tag != type) return -1; - memset(params_out, 0, sizeof(*params_out)); // TODO: actually set. + memset(params_out, 0, sizeof(*params_out)); // TODO-324: actually set this! switch (type) { case ONION_HANDSHAKE_TYPE_TAP: @@ -450,9 +450,8 @@ onion_skin_client_handshake(int type, return -1; } - // XXXX handle the server message! { - // XXXX TODO: see what the server said, make sure it's okay, see what + // XXXX TODO-324: see what the server said, make sure it's okay, see what // parameters it gave us, make sure we like them, and put them into // `params_out` } diff --git a/src/core/mainloop/cpuworker.c b/src/core/mainloop/cpuworker.c index 8da042aa57..7ca66a1c45 100644 --- a/src/core/mainloop/cpuworker.c +++ b/src/core/mainloop/cpuworker.c @@ -390,7 +390,7 @@ cpuworker_onion_handshake_replyfn(void *work_) goto done_processing; } - /* TODO! We need to use rpl.circ_params here to initialize the congestion + /* TODO-324! We need to use rpl.circ_params here to initialize the congestion control parameters of the circuit. */ log_debug(LD_OR,"onionskin_answer succeeded. Yay."); diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index ffb2c00493..53582d2829 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1263,7 +1263,7 @@ circuit_finish_handshake(origin_circuit_t *circ, onion_handshake_state_release(&hop->handshake_state); - // XXXX TODO: use `params` to initialize the congestion control. + // XXXX TODO-324: use `params` to initialize the congestion control. if (cpath_init_circuit_crypto(hop, keys, sizeof(keys), 0, 0)<0) { return -END_CIRC_REASON_TORPROTOCOL; @@ -2600,6 +2600,6 @@ client_circ_negotiation_message(const extend_info_t *ei, if (! ei->supports_ntor3_and_param_negotiation) return -1; - /* TODO: fill in the client message that gets sent. */ + /* TODO-324: fill in the client message that gets sent. */ tor_assert_unreached(); } diff --git a/src/core/or/command.c b/src/core/or/command.c index fd6cebe743..12e4c26768 100644 --- a/src/core/or/command.c +++ b/src/core/or/command.c @@ -381,8 +381,8 @@ command_process_create_cell(cell_t *cell, channel_t *chan) created_cell.cell_type = CELL_CREATED_FAST; created_cell.handshake_len = len; - // TODO: We should in theory look at params here, though it will always - // tell us to use the old-fashioned congestion control. + // TODO-324: We should in theory look at params here, though it will + // always tell us to use the old-fashioned congestion control. if (onionskin_answer(circ, &created_cell, (const char *)keys, sizeof(keys), diff --git a/src/core/or/congestion_control_common.c b/src/core/or/congestion_control_common.c index f2becb9b20..b76c0957e4 100644 --- a/src/core/or/congestion_control_common.c +++ b/src/core/or/congestion_control_common.c @@ -277,10 +277,10 @@ congestion_control_new(const circuit_params_t *params) { congestion_control_t *cc = tor_malloc_zero(sizeof(congestion_control_t)); - /* TODO: Use `params` to pick the algorithm and the window. */ + /* TODO-324: Use `params` to pick the algorithm and the window. */ (void) params; - // XXX: the alg and the sendme_inc need to be negotiated during + // TODO-324: XXX: the alg and the sendme_inc need to be negotiated during // circuit handshake congestion_control_init(cc, CC_ALG_VEGAS, SENDME_INC_DFLT); diff --git a/src/core/or/congestion_control_common.h b/src/core/or/congestion_control_common.h index 1c44e6b0ef..81ec79c6e6 100644 --- a/src/core/or/congestion_control_common.h +++ b/src/core/or/congestion_control_common.h @@ -20,7 +20,11 @@ typedef struct congestion_control_t congestion_control_t; void congestion_control_free_(congestion_control_t *cc); -/* TODO: Whisky Tango Foxtot‽ Nothing calls this function anywhere! */ +/* TODO-324: Whisky Tango Foxtot‽ Nothing calls this function anywhere! + * + * It needs to be called client-side and relay-side every time we initialize a + * circuit! + */ struct circuit_params_t; congestion_control_t *congestion_control_new( const struct circuit_params_t *params); diff --git a/src/core/or/or.h b/src/core/or/or.h index 409f4a0fea..22846872a0 100644 --- a/src/core/or/or.h +++ b/src/core/or/or.h @@ -794,7 +794,7 @@ typedef enum { #define ONION_HANDSHAKE_TYPE_TAP 0x0000 #define ONION_HANDSHAKE_TYPE_FAST 0x0001 #define ONION_HANDSHAKE_TYPE_NTOR 0x0002 -#define ONION_HANDSHAKE_TYPE_NTOR_V3 0x0003 /* TODO: Add to spec */ +#define ONION_HANDSHAKE_TYPE_NTOR_V3 0x0003 /* TODO-324: Add to spec */ #define MAX_ONION_HANDSHAKE_TYPE 0x0003 typedef struct onion_handshake_state_t onion_handshake_state_t; diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 63e9a33b72..8405a720fb 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -430,8 +430,8 @@ protover_get_supported_protocols(void) * XXX: WARNING! */ - /* TODO: Add a new Relay=* and a new FlowCtrl=* version to indicate support - * for Ntorv3 and prop324. Make sure they get into the spec. */ + /* TODO-324: Add a new Relay=* and a new FlowCtrl=* version to indicate + * support for Ntorv3 and prop324. Make sure they get into the spec. */ return "Cons=1-2 " "Desc=1-2 " diff --git a/src/core/or/versions.c b/src/core/or/versions.c index 322121b43f..052351120e 100644 --- a/src/core/or/versions.c +++ b/src/core/or/versions.c @@ -482,7 +482,7 @@ memoize_protover_summary(protover_summary_flags_t *out, protocol_list_supports_protocol(protocols, PRT_PADDING, PROTOVER_HS_SETUP_PADDING); - /* TODO: Set these flags based on real values. + /* TODO-324: Set these flags based on real values. out->supports_ntor3_and_param_negotiation = protocol_list_supports_protocol(protocols, PRT_RELAY, XXXX) diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index ee4ec25b01..38c8bf2912 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -1688,9 +1688,16 @@ hs_get_extend_info_from_lspecs(const smartlist_t *lspecs, info = extend_info_new(NULL, legacy_id, (have_ed25519_id) ? &ed25519_pk : NULL, NULL, onion_key, &ap.addr, ap.port, - /* TODO: The protover summary here needs to explain + /* TODO-324: oh wow, this is a hard one. + + The protover summary here needs to explain if we support the newer congestion control or - not. This may require new specification stuff */ + not. This may require new specification changes. + + Probably there is some analogous service-side + function that needs to initialize congestion + control structures based on what the client says. + */ NULL); done: return info;

1 0

[tor/main] Implement congestion control parameter negotiation
by dgoulet＠torproject.org 22 Feb '22

22 Feb '22

commit b6d5fbba7d7e0e2cfa0c0cbb7f91e6039e3decf9 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu Nov 4 00:44:38 2021 +0000 Implement congestion control parameter negotiation --- src/core/crypto/onion_crypto.c | 200 +++++++++++++++++++++++++++++++++++------ src/core/crypto/onion_crypto.h | 10 ++- src/core/mainloop/cpuworker.c | 22 ++++- 3 files changed, 198 insertions(+), 34 deletions(-) diff --git a/src/core/crypto/onion_crypto.c b/src/core/crypto/onion_crypto.c index 1e9913539f..13f8f54b35 100644 --- a/src/core/crypto/onion_crypto.c +++ b/src/core/crypto/onion_crypto.c @@ -41,15 +41,17 @@ #include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_util.h" #include "feature/relay/routerkeys.h" +#include "core/or/congestion_control_common.h" #include "core/or/circuitbuild.h" #include "core/or/crypt_path_st.h" #include "core/or/extend_info_st.h" +#include "trunnel/circ_params.h" /* TODO-324: Add this to the specification! */ -const uint8_t NTOR3_CIRC_VERIFICATION[] = "circuit extend"; -const size_t NTOR3_CIRC_VERIFICATION_LEN = 14; +static const uint8_t NTOR3_CIRC_VERIFICATION[] = "circuit extend"; +static const size_t NTOR3_CIRC_VERIFICATION_LEN = 14; #define NTOR3_VERIFICATION_ARGS \ NTOR3_CIRC_VERIFICATION, NTOR3_CIRC_VERIFICATION_LEN @@ -210,6 +212,93 @@ onion_skin_create(int type, return r; } +/** + * Takes a param request message from the client, compares it to our + * consensus parameters, and creates a reply message and output + * parameters. + * + * This function runs in a worker thread, so it can only inspect + * arguments and local variables. + * + * Returns 0 if successful. + * Returns -1 on parsing, parameter failure, or reply creation failure. + */ +static int +negotiate_v3_ntor_server_circ_params(const uint8_t *param_request_msg, + size_t param_request_len, + const circuit_params_t *our_ns_params, + circuit_params_t *params_out, + uint8_t **resp_msg_out, + size_t *resp_msg_len_out) +{ + circ_params_response_t *resp = NULL; + circ_params_request_t *param_request = NULL; + ssize_t resp_msg_len; + + if (circ_params_request_parse(&param_request, param_request_msg, + param_request_len) < 0) { + return -1; + } + + /* CC is enabled if the client wants it, and our consensus paramers + * allow it. If both are true, its on. If either is false, it's off. */ + params_out->cc_enabled = + circ_params_request_get_cc_supported(param_request) && + our_ns_params->cc_enabled; + + resp = circ_params_response_new(); + + if (circ_params_response_set_version(resp, 0) < 0) { + circ_params_request_free(param_request); + circ_params_response_free(resp); + return -1; + } + + /* The relay always chooses its sendme_inc, and sends it to the client */ + params_out->sendme_inc_cells = our_ns_params->sendme_inc_cells; + + if (circ_params_response_set_sendme_inc_cells(resp, + our_ns_params->sendme_inc_cells) < 0) { + circ_params_request_free(param_request); + circ_params_response_free(resp); + return -1; + } + + /* Use the negotiated cc_enabled value to respond */ + if (circ_params_response_set_cc_enabled(resp, params_out->cc_enabled) < 0) { + circ_params_request_free(param_request); + circ_params_response_free(resp); + return -1; + } + + resp_msg_len = circ_params_response_encoded_len(resp); + + if (resp_msg_len < 0) { + circ_params_request_free(param_request); + circ_params_response_free(resp); + return -1; + } + + *resp_msg_out = tor_malloc_zero(resp_msg_len); + + resp_msg_len = circ_params_response_encode(*resp_msg_out, resp_msg_len, + resp); + if (resp_msg_len < 0) { + circ_params_request_free(param_request); + circ_params_response_free(resp); + + tor_free(*resp_msg_out); + return -1; + } + + *resp_msg_len_out = (size_t)resp_msg_len; + + circ_params_request_free(param_request); + circ_params_response_free(resp); + + return 0; +} + /* This is the maximum value for keys_out_len passed to * onion_skin_server_handshake, plus 16. We can make it bigger if needed: * It just defines how many bytes to stack-allocate. */ @@ -226,6 +315,7 @@ int onion_skin_server_handshake(int type, const uint8_t *onion_skin, size_t onionskin_len, const server_onion_keys_t *keys, + const circuit_params_t *our_ns_params, uint8_t *reply_out, size_t reply_out_maxlen, uint8_t *keys_out, size_t keys_out_len, @@ -233,7 +323,7 @@ onion_skin_server_handshake(int type, circuit_params_t *params_out) { int r = -1; - memset(params_out, 0, sizeof(*params_out)); // TODO-324: actually set this! + memset(params_out, 0, sizeof(*params_out)); switch (type) { case ONION_HANDSHAKE_TYPE_TAP: @@ -290,6 +380,9 @@ onion_skin_server_handshake(int type, uint8_t keys_tmp[MAX_KEYS_TMP_LEN]; uint8_t *client_msg = NULL; size_t client_msg_len = 0; + uint8_t *reply_msg = NULL; + size_t reply_msg_len = 0; + ntor3_server_handshake_state_t *state = NULL; if (onion_skin_ntor3_server_handshake_part1( @@ -303,25 +396,17 @@ onion_skin_server_handshake(int type, return -1; } - uint8_t reply_msg[1] = { 0 }; - size_t reply_msg_len = 1; - { - /* TODO-324, Okay, we have a message from the client trying to negotiate - * parameters. We need to decide whether the client's request is okay, - * what we're going to say in response, and what circuit parameters - * we've just negotiated - */ - - /* NOTE! DANGER, DANGER, DANGER! - - Remember that this function can be run in a worker thread, and so - therefore you can't access "global" state that isn't lock-protected. - - CAVEAT HAXX0R! - */ - + if (negotiate_v3_ntor_server_circ_params(client_msg, + client_msg_len, + our_ns_params, + params_out, + &reply_msg, + &reply_msg_len) < 0) { + ntor3_server_handshake_state_free(state); tor_free(client_msg); + return -1; } + tor_free(client_msg); uint8_t *server_handshake = NULL; size_t server_handshake_len = 0; @@ -331,12 +416,15 @@ onion_skin_server_handshake(int type, reply_msg, reply_msg_len, &server_handshake, &server_handshake_len, keys_tmp, keys_tmp_len) < 0) { - // XXX TODO-324 free some stuff + tor_free(reply_msg); + ntor3_server_handshake_state_free(state); return -1; } + tor_free(reply_msg); if (server_handshake_len > reply_out_maxlen) { - // XXX TODO-324 free that stuff + tor_free(server_handshake); + ntor3_server_handshake_state_free(state); return -1; } @@ -346,6 +434,7 @@ onion_skin_server_handshake(int type, memwipe(keys_tmp, 0, keys_tmp_len); memwipe(server_handshake, 0, server_handshake_len); tor_free(server_handshake); + ntor3_server_handshake_state_free(state); r = (int) server_handshake_len; } @@ -362,6 +451,61 @@ onion_skin_server_handshake(int type, return r; } +/** + * Takes a param response message from the exit, compares it to our + * consensus parameters for sanity, and creates output parameters + * if sane. + * + * Returns -1 on parsing or insane params, 0 if success. + */ +static int +negotiate_v3_ntor_client_circ_params(const uint8_t *param_response_msg, + size_t param_response_len, + circuit_params_t *params_out) +{ + circ_params_response_t *param_response = NULL; + bool cc_enabled; + uint8_t sendme_inc_cells; + + if (circ_params_response_parse(&param_response, param_response_msg, + param_response_len) < 0) { + return -1; + } + + cc_enabled = + circ_params_response_get_cc_enabled(param_response); + + /* If congestion control came back enabled, but we didn't ask for it + * because the consensus said no, close the circuit */ + if (cc_enabled && !congestion_control_enabled()) { + circ_params_response_free(param_response); + return -1; + } + params_out->cc_enabled = cc_enabled; + + /* We will only accept this response (and this circuit) if sendme_inc + * is within a factor of 2 of our consensus value. We should not need + * to change cc_sendme_inc much, and if we do, we can spread out those + * changes over smaller increments once every 4 hours. Exits that + * violate this range should just not be used. */ +#define MAX_SENDME_INC_NEGOTIATE_FACTOR 2 + + sendme_inc_cells = + circ_params_response_get_sendme_inc_cells(param_response); + + if (sendme_inc_cells > + MAX_SENDME_INC_NEGOTIATE_FACTOR*congestion_control_sendme_inc() || + sendme_inc_cells < + congestion_control_sendme_inc()/MAX_SENDME_INC_NEGOTIATE_FACTOR) { + circ_params_response_free(param_response); + return -1; + } + params_out->sendme_inc_cells = sendme_inc_cells; + + circ_params_response_free(param_response); + return 0; +} + /** Perform the final (client-side) step of a circuit-creation handshake of * type type, using our state in handshake_state and the * server's response in reply. On success, generate keys_out_len @@ -382,7 +526,7 @@ onion_skin_client_handshake(int type, if (handshake_state->tag != type) return -1; - memset(params_out, 0, sizeof(*params_out)); // TODO-324: actually set this! + memset(params_out, 0, sizeof(*params_out)); switch (type) { case ONION_HANDSHAKE_TYPE_TAP: @@ -450,10 +594,12 @@ onion_skin_client_handshake(int type, return -1; } - { - // XXXX TODO-324: see what the server said, make sure it's okay, see what - // parameters it gave us, make sure we like them, and put them into - // `params_out` + if (negotiate_v3_ntor_client_circ_params(server_msg, + server_msg_len, + params_out) < 0) { + tor_free(keys_tmp); + tor_free(server_msg); + return -1; } tor_free(server_msg); diff --git a/src/core/crypto/onion_crypto.h b/src/core/crypto/onion_crypto.h index 45e8eeca0c..cb0188ff54 100644 --- a/src/core/crypto/onion_crypto.h +++ b/src/core/crypto/onion_crypto.h @@ -29,10 +29,11 @@ void onion_handshake_state_release(onion_handshake_state_t *state); * Parameters negotiated as part of a circuit handshake. */ typedef struct circuit_params_t { - /* placeholder field for congestion control algorithm. Right now this - * is always set to zero */ - int cc_algorithm; - int cc_window; + /** Is true if congestion control is enabled in consensus or param, + * as per congestion_control_enabled() result. */ + bool cc_enabled; + /** The number of cells in a sendme increment. Only used if cc_enabled=1. */ + uint8_t sendme_inc_cells; } circuit_params_t; int onion_skin_create(int type, @@ -43,6 +44,7 @@ int onion_skin_create(int type, int onion_skin_server_handshake(int type, const uint8_t *onion_skin, size_t onionskin_len, const server_onion_keys_t *keys, + const circuit_params_t *ns_params, uint8_t *reply_out, size_t reply_out_maxlen, uint8_t *keys_out, size_t key_out_len, diff --git a/src/core/mainloop/cpuworker.c b/src/core/mainloop/cpuworker.c index 7ca66a1c45..2cb667615d 100644 --- a/src/core/mainloop/cpuworker.c +++ b/src/core/mainloop/cpuworker.c @@ -21,6 +21,8 @@ #include "core/or/channel.h" #include "core/or/circuitlist.h" #include "core/or/connection_or.h" +#include "core/or/congestion_control_common.h" +#include "core/or/congestion_control_flow.h" #include "app/config/config.h" #include "core/mainloop/cpuworker.h" #include "lib/crypt_ops/crypto_rand.h" @@ -126,6 +128,11 @@ typedef struct cpuworker_request_t { /** A create cell for the cpuworker to process. */ create_cell_t create_cell; + /** + * A copy of this relay's consensus params that are relevant to + * the circuit, for use in negotiation. */ + circuit_params_t circ_ns_params; + /* Turn the above into a tagged union if needed. */ } cpuworker_request_t; @@ -381,6 +388,12 @@ cpuworker_onion_handshake_replyfn(void *work_) goto done_processing; } + /* If the client asked for congestion control, if our consensus parameter + * allowed it to negotiate as enabled, allocate a congestion control obj. */ + if (rpl.circ_params.cc_enabled) { + TO_CIRCUIT(circ)->ccontrol = congestion_control_new(&rpl.circ_params); + } + if (onionskin_answer(circ, &rpl.created_cell, (const char*)rpl.keys, sizeof(rpl.keys), @@ -390,9 +403,6 @@ cpuworker_onion_handshake_replyfn(void *work_) goto done_processing; } - /* TODO-324! We need to use rpl.circ_params here to initialize the congestion - control parameters of the circuit. */ - log_debug(LD_OR,"onionskin_answer succeeded. Yay."); done_processing: @@ -431,6 +441,7 @@ cpuworker_onion_handshake_threadfn(void *state_, void *work_) n = onion_skin_server_handshake(cc->handshake_type, cc->onionskin, cc->handshake_len, onion_keys, + &req.circ_ns_params, cell_out->reply, sizeof(cell_out->reply), rpl.keys, CPATH_KEY_MATERIAL_LEN, @@ -559,6 +570,11 @@ assign_onionskin_to_cpuworker(or_circuit_t *circ, if (should_time) tor_gettimeofday(&req.started_at); + /* Copy the current cached consensus params relevant to + * circuit negotiation into the CPU worker context */ + req.circ_ns_params.cc_enabled = congestion_control_enabled(); + req.circ_ns_params.sendme_inc_cells = congestion_control_sendme_inc(); + job = tor_malloc_zero(sizeof(cpuworker_job_t)); job->circ = circ; memcpy(&job->u.request, &req, sizeof(req));

1 0