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

[tor/master] Merge branch 'ticket24963_042_02'
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit ab1f82ea2a3ef9f9bc920885e40e7b477b3dfb93 Merge: ab1f39322 df12ff3de Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 14:03:30 2019 -0400 Merge branch 'ticket24963_042_02' changes/ticket24963 | 5 +++++ src/feature/hs/hs_intropoint.c | 9 +++++++++ src/test/test_hs_intropoint.c | 13 ++++++++++++- 3 files changed, 26 insertions(+), 1 deletion(-)

1 0

[snowflake/master] Make tabs uniform in manifest.json.
by dcf＠torproject.org 23 Jul '19

23 Jul '19

commit f795fb5a3366c80a7ea24c11128366ab39b179f7 Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 23 11:06:53 2019 -0600 Make tabs uniform in manifest.json. --- proxy/webext/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index 6c41839..71b5eb7 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -14,5 +14,5 @@ "default_title": "Snowflake", "default_popup": "popup.html" }, - "permissions": ["storage"] + "permissions": ["storage"] }

1 0

[snowflake/master] Make the "Turn On/Off" text a label for the slider.
by dcf＠torproject.org 23 Jul '19

23 Jul '19

commit 74d3895ee9ef359e686809e4403cb012fd52041f Author: David Fifield <david(a)bamsoftware.com> Date: Tue Jul 23 10:51:47 2019 -0600 Make the "Turn On/Off" text a label for the slider. So that you can click on the text as well as the slider. --- proxy/webext/popup.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/webext/popup.html b/proxy/webext/popup.html index 2c8943e..e3ba2f5 100644 --- a/proxy/webext/popup.html +++ b/proxy/webext/popup.html @@ -12,7 +12,7 @@ <p></p> </div> <div class="b button"> - <label id="toggle">Turn On</label> + <label id="toggle" for="enabled">Turn On</label> <label class="switch"> <input id="enabled" type="checkbox" checked/> <span class="slider round"></span>

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1185'
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit ab1f39322c22c3801ffd3a7e6842352230fff113 Merge: f6db290e5 aed82bf41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 12:32:14 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1185' changes/bug31112 | 3 +++ src/core/or/circuitpadding_machines.c | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-)

1 0

[tor/master] Add changes file for #31112 and #31098.
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit aed82bf4109126a3088752d7bec45bab4f5e1537 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 23 11:46:07 2019 +0300 Add changes file for #31112 and #31098. --- changes/bug31112 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/bug31112 b/changes/bug31112 new file mode 100644 index 000000000..882efaad5 --- /dev/null +++ b/changes/bug31112 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Various simplifications and minor improvements to the circuit padding + machines. Patch by Tobias Pulls. Closes tickets 31112 and 31098.

1 0

[tor/master] remove specified target_hopnum from relay-side machines (only for origin-side machines)
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit 5f95b37f6c76d0f8772cb00db5bc7b7f97d942fa Author: pulls <tobias.pulls(a)kau.se> Date: Mon Jul 8 18:09:14 2019 +0200 remove specified target_hopnum from relay-side machines (only for origin-side machines) --- src/core/or/circuitpadding_machines.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/core/or/circuitpadding_machines.c b/src/core/or/circuitpadding_machines.c index 75d2614ac..97828553a 100644 --- a/src/core/or/circuitpadding_machines.c +++ b/src/core/or/circuitpadding_machines.c @@ -155,7 +155,6 @@ circpad_machine_relay_hide_intro_circuits(smartlist_t *machines_sl) relay_machine->name = "relay_ip_circ"; relay_machine->conditions.state_mask = CIRCPAD_CIRC_OPENED; - relay_machine->target_hopnum = 2; /* This is a relay-side machine */ relay_machine->is_origin_side = 0; @@ -387,7 +386,6 @@ circpad_machine_relay_hide_rend_circuits(smartlist_t *machines_sl) /* Only pad after the circuit has been built and pad to the middle */ relay_machine->conditions.min_hops = 2; relay_machine->conditions.state_mask = CIRCPAD_CIRC_OPENED; - relay_machine->target_hopnum = 2; /* This is a relay-side machine */ relay_machine->is_origin_side = 0;

1 0

[tor/master] transition when we send our first padding packet, not on received
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit fd1f28518903924c4cd1a6494411128672b2689d Author: pulls <tobias.pulls(a)kau.se> Date: Mon Jul 8 15:51:57 2019 +0200 transition when we send our first padding packet, not on received --- src/core/or/circuitpadding_machines.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/or/circuitpadding_machines.c b/src/core/or/circuitpadding_machines.c index 97828553a..7220d657f 100644 --- a/src/core/or/circuitpadding_machines.c +++ b/src/core/or/circuitpadding_machines.c @@ -406,7 +406,7 @@ circpad_machine_relay_hide_rend_circuits(smartlist_t *machines_sl) /* OBFUSCATE_CIRC_SETUP -> END transition when we send our first * padding packet and/or hit the state length (the state length is 1). */ relay_machine->states[CIRCPAD_STATE_OBFUSCATE_CIRC_SETUP]. - next_state[CIRCPAD_EVENT_PADDING_RECV] = CIRCPAD_STATE_END; + next_state[CIRCPAD_EVENT_PADDING_SENT] = CIRCPAD_STATE_END; relay_machine->states[CIRCPAD_STATE_OBFUSCATE_CIRC_SETUP]. next_state[CIRCPAD_EVENT_LENGTH_COUNT] = CIRCPAD_STATE_END;

1 0

[tor/master] Changes file for #31113.
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit fdfee3d06f05973f54cd7550450096ef2f8b5f55 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 23 12:40:33 2019 +0300 Changes file for #31113. --- changes/bug31113 | 3 +++ scripts/maint/practracker/exceptions.txt | 1 + 2 files changed, 4 insertions(+) diff --git a/changes/bug31113 b/changes/bug31113 new file mode 100644 index 000000000..f48328f0f --- /dev/null +++ b/changes/bug31113 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Improve documentation in circuit padding subsystem. Patch by Tobias + Pulls. Closes ticket 31113. diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index f28392537..66e9f7a0c 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -87,6 +87,7 @@ problem function-size /src/core/or/circuitlist.c:circuit_about_to_free() 120 problem function-size /src/core/or/circuitlist.c:circuits_handle_oom() 117 problem function-size /src/core/or/circuitmux.c:circuitmux_set_policy() 110 problem function-size /src/core/or/circuitmux.c:circuitmux_attach_circuit() 114 +problem file-size /src/core/or/circuitpadding.c 3001 problem function-size /src/core/or/circuitpadding.c:circpad_machine_schedule_padding() 107 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_relay_hide_intro_circuits() 104 problem function-size /src/core/or/circuitpadding_machines.c:circpad_machine_client_hide_rend_circuits() 112

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/1186'
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit f6db290e5a7268ebe9dc504af53d50294766ac22 Merge: ef2dd1ba9 fdfee3d06 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jul 23 12:30:19 2019 -0400 Merge remote-tracking branch 'tor-github/pr/1186' changes/bug31113 | 3 +++ scripts/maint/practracker/exceptions.txt | 1 + src/core/or/circuitpadding.c | 40 +++++++++++++++++++------------- src/core/or/circuitpadding.h | 21 +++++++++-------- 4 files changed, 39 insertions(+), 26 deletions(-)

1 0

[tor/master] Improve circpad documentation.
by nickm＠torproject.org 23 Jul '19

23 Jul '19

commit c2f6064325af710b309ec6f1a7c920eddc97e028 Author: pulls <tobias.pulls(a)kau.se> Date: Mon Jul 8 16:53:29 2019 +0200 Improve circpad documentation. Patch by Tobias Pulls. --- src/core/or/circuitpadding.c | 40 ++++++++++++++++++++++++---------------- src/core/or/circuitpadding.h | 21 +++++++++++---------- 2 files changed, 35 insertions(+), 26 deletions(-) diff --git a/src/core/or/circuitpadding.c b/src/core/or/circuitpadding.c index 017ef7b6b..911794861 100644 --- a/src/core/or/circuitpadding.c +++ b/src/core/or/circuitpadding.c @@ -17,7 +17,7 @@ * Each padding type is described by a state machine (circpad_machine_spec_t), * which is also referred as a "padding machine" in this file. Currently, * these state machines are hardcoded in the source code (e.g. see - * circpad_circ_client_machine_init()), but in the future we will be able to + * circpad_machines_init()), but in the future we will be able to * serialize them in the torrc or the consensus. * * As specified by prop#254, clients can negotiate padding with relays by using @@ -552,11 +552,12 @@ circpad_distribution_sample_iat_delay(const circpad_state_t *state, } /** - * Sample an expected time-until-next-packet delay from the histogram. + * Sample an expected time-until-next-packet delay from the histogram or + * probability distribution. * - * The bin is chosen with probability proportional to the number - * of tokens in each bin, and then a time value is chosen uniformly from - * that bin's [start,end) time range. + * A bin of the histogram is chosen with probability proportional to the number + * of tokens in each bin, and then a time value is chosen uniformly from that + * bin's [start,end) time range. */ STATIC circpad_delay_t circpad_machine_sample_delay(circpad_machine_runtime_t *mi) @@ -655,12 +656,7 @@ circpad_machine_sample_delay(circpad_machine_runtime_t *mi) /** * Sample a value from the specified probability distribution. * - * This performs inverse transform sampling - * (https://en.wikipedia.org/wiki/Inverse_transform_sampling) - * - * XXX: These formulas were taken verbatim. Need a floating wizard - * to check them for catastropic cancellation and other issues (teor?). - * Also: is 32bits of double from [0.0,1.0) enough? + * Uses functions from src/lib/math/prob_distr.c . */ static double circpad_distribution_sample(circpad_distribution_t dist) @@ -744,6 +740,8 @@ circpad_distribution_sample(circpad_distribution_t dist) /** * Find the index of the first bin whose upper bound is * greater than the target, and that has tokens remaining. + * + * Used for histograms with token removal. */ static circpad_hist_index_t circpad_machine_first_higher_index(const circpad_machine_runtime_t *mi, @@ -766,6 +764,8 @@ circpad_machine_first_higher_index(const circpad_machine_runtime_t *mi, /** * Find the index of the first bin whose lower bound is lower or equal to * <b>target_bin_usec</b>, and that still has tokens remaining. + * + * Used for histograms with token removal. */ static circpad_hist_index_t circpad_machine_first_lower_index(const circpad_machine_runtime_t *mi, @@ -787,6 +787,8 @@ circpad_machine_first_lower_index(const circpad_machine_runtime_t *mi, /** * Remove a token from the first non-empty bin whose upper bound is * greater than the target. + * + * Used for histograms with token removal. */ STATIC void circpad_machine_remove_higher_token(circpad_machine_runtime_t *mi, @@ -808,6 +810,8 @@ circpad_machine_remove_higher_token(circpad_machine_runtime_t *mi, /** * Remove a token from the first non-empty bin whose upper bound is * lower than the target. + * + * Used for histograms with token removal. */ STATIC void circpad_machine_remove_lower_token(circpad_machine_runtime_t *mi, @@ -837,6 +841,8 @@ circpad_machine_remove_lower_token(circpad_machine_runtime_t *mi, * midpoint. * * If it is false, use bin index distance only. + * + * Used for histograms with token removal. */ STATIC void circpad_machine_remove_closest_token(circpad_machine_runtime_t *mi, @@ -919,6 +925,8 @@ circpad_machine_remove_closest_token(circpad_machine_runtime_t *mi, * Remove a token from the exact bin corresponding to the target. * * If it is empty, do nothing. + * + * Used for histograms with token removal. */ static void circpad_machine_remove_exact(circpad_machine_runtime_t *mi, @@ -1352,7 +1360,7 @@ circpad_machine_reached_padding_limit(circpad_machine_runtime_t *mi) /* If circpad_max_global_padding_pct is non-zero, and we've * sent more than the global padding cell limit, then check our - * gloabl tor process percentage limit on padding. */ + * global tor process percentage limit on padding. */ if (circpad_global_max_padding_percent && circpad_global_padding_sent >= circpad_global_allowed_cells) { uint64_t total_cells = circpad_global_padding_sent + @@ -1492,7 +1500,7 @@ circpad_machine_schedule_padding,(circpad_machine_runtime_t *mi)) /** * If the machine transitioned to the END state, we need * to check to see if it wants us to shut it down immediately. - * If it does, then we need to send the appropate negotation commands + * If it does, then we need to send the appropiate negotiation commands * depending on which side it is. * * After this function is called, mi may point to freed memory. Do @@ -1509,7 +1517,7 @@ circpad_machine_spec_transitioned_to_end(circpad_machine_runtime_t *mi) * we can handle the case where this machine started while it was * the only machine that matched conditions, but *since* then more * "higher ranking" machines now match the conditions, and would - * be given a chance to take precidence over this one in + * be given a chance to take precedence over this one in * circpad_add_matching_machines(). * * Returning to START or waiting forever in END would not give those @@ -1636,7 +1644,7 @@ circpad_estimate_circ_rtt_on_received(circuit_t *circ, if (CIRCUIT_IS_ORIGIN(circ) || mi->stop_rtt_update) return; - /* If we already have a last receieved packet time, that means we + /* If we already have a last received packet time, that means we * did not get a response before this packet. The RTT estimate * only makes sense if we do not have multiple packets on the * wire, so stop estimating if this is the second packet @@ -2300,7 +2308,7 @@ circpad_deliver_sent_relay_cell_events(circuit_t *circ, /* Optimization: The event for RELAY_COMMAND_DROP is sent directly * from circpad_send_padding_cell_for_callback(). This is to avoid * putting a cell_t and a relay_header_t on the stack repeatedly - * if we decide to send a long train of padidng cells back-to-back + * if we decide to send a long train of padding cells back-to-back * with 0 delay. So we do nothing here. */ return; } else { diff --git a/src/core/or/circuitpadding.h b/src/core/or/circuitpadding.h index 3cf40e11d..fc2e595c0 100644 --- a/src/core/or/circuitpadding.h +++ b/src/core/or/circuitpadding.h @@ -51,7 +51,7 @@ typedef enum { CIRCPAD_EVENT_INFINITY = 4, /* All histogram bins are empty (we are out of tokens) */ CIRCPAD_EVENT_BINS_EMPTY = 5, - /* just a counter of the events above */ + /* This state has used up its cell count */ CIRCPAD_EVENT_LENGTH_COUNT = 6 } circpad_event_t; #define CIRCPAD_NUM_EVENTS ((int)CIRCPAD_EVENT_LENGTH_COUNT+1) @@ -79,7 +79,7 @@ typedef uint32_t circpad_delay_t; * An infinite padding cell delay means don't schedule any padding -- * simply wait until a different event triggers a transition. * - * This means that the maximum delay we can scedule is UINT32_MAX-1 + * This means that the maximum delay we can schedule is UINT32_MAX-1 * microseconds, or about 4300 seconds (1.25 hours). * XXX: Is this enough if we want to simulate light, intermittent * activity on an onion service? @@ -106,8 +106,8 @@ typedef uint32_t circpad_delay_t; * * If any of these elements is set, then the circuit will be tested against * that specific condition. If an element is unset, then we don't test it. - * (E.g. If neither NO_STREAMS or STREAMS are set, then we will not care - * whether a circuit has streams attached when we apply a state machine) + * (E.g., if neither NO_STREAMS or STREAMS are set, then we will not care + * whether a circuit has streams attached when we apply a state machine.) * * The helper function circpad_circuit_state() converts circuit state * flags into this more compact representation. @@ -255,8 +255,9 @@ typedef struct circpad_distribution_t { typedef uint16_t circpad_statenum_t; #define CIRCPAD_STATENUM_MAX (UINT16_MAX) -/** A histogram is used to sample padding delays given a machine state. This - * constant defines the maximum histogram width (i.e. the max number of bins). +/** A histogram can be used to sample padding delays given a machine state. + * This constant defines the maximum histogram width (i.e. the max number of + * bins). * * The current limit is arbitrary and could be raised if there is a need, * however too many bins will be hard to serialize in the future. @@ -275,10 +276,10 @@ typedef uint16_t circpad_statenum_t; * happen. The mutable information that gets updated in runtime are carried in * a circpad_machine_runtime_t. * - * This struct describes the histograms and parameters of a single - * state in the adaptive padding machine. Instances of this struct - * exist in global circpad machine definitions that come from torrc - * or the consensus. + * This struct describes the histograms and/or probability distributions, as + * well as parameters of a single state in the adaptive padding machine. + * Instances of this struct exist in global circpad machine definitions that + * come from torrc or the consensus. */ typedef struct circpad_state_t { /**

1 0