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

[tor/master] prop224: Make prop224 time periods smaller in testnets.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 6c00bd1f10f4683824deeaa7dd8a23aaf6b9a40e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 18 18:10:26 2017 +0300 prop224: Make prop224 time periods smaller in testnets. It used to be that time periods were 24 hours long even on chutney, which made testing harder. With this commit, time periods have the same length as a full SRV protocol run, which means that they will change every 4 minutes in a 10-second voting interval chutney network! --- src/or/hs_common.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 0ae196d93..9c3d2c171 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -181,6 +181,17 @@ hs_check_service_private_dir(const char *username, const char *path, STATIC uint64_t get_time_period_length(void) { + /* If we are on a test network, make the time period smaller than normal so + that we actually see it rotate. Specifically, make it the same length as + an SRV protocol run. */ + if (get_options()->TestingTorNetwork) { + unsigned run_duration = sr_state_get_protocol_run_duration(); + /* An SRV run should take more than a minute (it's 24 rounds) */ + tor_assert_nonfatal(run_duration > 60); + /* Turn it from seconds to minutes before returning: */ + return sr_state_get_protocol_run_duration() / 60; + } + int32_t time_period_length = networkstatus_get_param(NULL, "hsdir-interval", HS_TIME_PERIOD_LENGTH_DEFAULT, HS_TIME_PERIOD_LENGTH_MIN,

1 0

[tor/master] prop224: Refactor hs_get_time_period_num() to not use absolute time.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit cf58451a8ba03e869a805f973ef5b5f3f6d82b6b Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 24 13:31:17 2017 +0300 prop224: Refactor hs_get_time_period_num() to not use absolute time. Instead use the SRV protocol duration to calculate the rotation offset that was previously hardcoded to 12 hours. --- src/or/hs_common.c | 13 +++++++++---- src/or/hs_common.h | 2 -- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 0d81063cf..0ae196d93 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -196,13 +196,18 @@ uint64_t hs_get_time_period_num(time_t now) { uint64_t time_period_num; + + /* Start by calculating minutes since the epoch */ uint64_t time_period_length = get_time_period_length(); uint64_t minutes_since_epoch = now / 60; - /* Now subtract half a day to fit the prop224 time period schedule (see - * section [TIME-PERIODS]). */ - tor_assert(minutes_since_epoch > HS_TIME_PERIOD_ROTATION_OFFSET); - minutes_since_epoch -= HS_TIME_PERIOD_ROTATION_OFFSET; + /* Apply the rotation offset as specified by prop224 (section + * [TIME-PERIODS]), so that new time periods synchronize nicely with SRV + * publication */ + unsigned int time_period_rotation_offset = sr_state_get_phase_duration(); + time_period_rotation_offset /= 60; /* go from seconds to minutes */ + tor_assert(minutes_since_epoch > time_period_rotation_offset); + minutes_since_epoch -= time_period_rotation_offset; /* Calculate the time period */ time_period_num = minutes_since_epoch / time_period_length; diff --git a/src/or/hs_common.h b/src/or/hs_common.h index 519485d57..268a69bb5 100644 --- a/src/or/hs_common.h +++ b/src/or/hs_common.h @@ -52,8 +52,6 @@ #define HS_TIME_PERIOD_LENGTH_MIN 30 /* minutes */ /* The minimum time period length as seen in prop224 section [TIME-PERIODS] */ #define HS_TIME_PERIOD_LENGTH_MAX (60 * 24 * 10) /* 10 days or 14400 minutes */ -/* The time period rotation offset as seen in prop224 section [TIME-PERIODS] */ -#define HS_TIME_PERIOD_ROTATION_OFFSET (12 * 60) /* minutes */ /* Prefix of the onion address checksum. */ #define HS_SERVICE_ADDR_CHECKSUM_PREFIX ".onion checksum"

1 0

[tor/master] test: Unit tests for the revision counter state file codethe
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit b47139d7583ff247fcdd07904144dc99c412028a Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 24 13:03:19 2017 +0300 test: Unit tests for the revision counter state file codethe Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_service.c | 6 ++--- src/or/hs_service.h | 10 ++++++++ src/test/test_hs_service.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 3 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 6519cb1b6..131c4ff9f 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -924,7 +924,7 @@ load_service_keys(hs_service_t *service) } /* Free a given service descriptor object and all key material is wiped. */ -static void +STATIC void service_descriptor_free(hs_service_descriptor_t *desc) { if (!desc) { @@ -1947,7 +1947,7 @@ upload_descriptor_to_hsdir(const hs_service_t *service, * * HidServRevCounter <blinded_pubkey> <rev_counter> */ -static char * +STATIC char * encode_desc_rev_counter_for_state(const hs_service_descriptor_t *desc) { char *state_str = NULL; @@ -2009,7 +2009,7 @@ update_revision_counters_in_state(void) * with blinded_pubkey. Set service_found_out to True if the * line is relevant to this service, and return the cached revision * counter. Else set service_found_out to False. */ -static uint64_t +STATIC uint64_t check_state_line_for_service_rev_counter(const char *state_line, ed25519_public_key_t *blinded_pubkey, int *service_found_out) diff --git a/src/or/hs_service.h b/src/or/hs_service.h index f46c4f51a..cb2a7aa80 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -325,6 +325,16 @@ STATIC void build_all_descriptors(time_t now); STATIC void update_all_descriptors(time_t now); STATIC void run_upload_descriptor_event(time_t now); +STATIC char * +encode_desc_rev_counter_for_state(const hs_service_descriptor_t *desc); + +STATIC void service_descriptor_free(hs_service_descriptor_t *desc); + +STATIC uint64_t +check_state_line_for_service_rev_counter(const char *state_line, + ed25519_public_key_t *blinded_pubkey, + int *service_found_out); + #endif /* TOR_UNIT_TESTS */ #endif /* HS_SERVICE_PRIVATE */ diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 30f1682d8..664277b19 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -1194,6 +1194,65 @@ test_upload_desctriptors(void *arg) UNMOCK(hs_overlap_mode_is_active); } +/** Test the functions that save and load HS revision counters to state. */ +static void +test_revision_counter_state(void *arg) +{ + char *state_line_one = NULL; + char *state_line_two = NULL; + + hs_service_descriptor_t *desc_one = service_descriptor_new(); + hs_service_descriptor_t *desc_two = service_descriptor_new(); + + (void) arg; + + /* Prepare both descriptors */ + desc_one->desc->plaintext_data.revision_counter = 42; + desc_two->desc->plaintext_data.revision_counter = 240; + memset(&desc_one->blinded_kp.pubkey.pubkey, '\x42', + sizeof(desc_one->blinded_kp.pubkey.pubkey)); + memset(&desc_two->blinded_kp.pubkey.pubkey, '\xf0', + sizeof(desc_one->blinded_kp.pubkey.pubkey)); + + /* Turn the descriptor rev counters into state lines */ + state_line_one = encode_desc_rev_counter_for_state(desc_one); + tt_str_op(state_line_one, OP_EQ, + "QkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkJCQkI 42"); + + state_line_two = encode_desc_rev_counter_for_state(desc_two); + tt_str_op(state_line_two, OP_EQ, + "8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PDw8PA 240"); + + /* Now let's test our state parsing function: */ + int service_found; + uint64_t cached_rev_counter; + + /* First's try with wrong pubkey and check that no service was found */ + cached_rev_counter =check_state_line_for_service_rev_counter(state_line_one, + &desc_two->blinded_kp.pubkey, + &service_found); + tt_int_op(service_found, OP_EQ, 0); + + /* Now let's try with the right pubkeys */ + cached_rev_counter =check_state_line_for_service_rev_counter(state_line_one, + &desc_one->blinded_kp.pubkey, + &service_found); + tt_int_op(service_found, OP_EQ, 1); + tt_int_op(cached_rev_counter, OP_EQ, 42); + + cached_rev_counter =check_state_line_for_service_rev_counter(state_line_two, + &desc_two->blinded_kp.pubkey, + &service_found); + tt_int_op(service_found, OP_EQ, 1); + tt_int_op(cached_rev_counter, OP_EQ, 240); + + done: + tor_free(state_line_one); + tor_free(state_line_two); + service_descriptor_free(desc_one); + service_descriptor_free(desc_two); +} + struct testcase_t hs_service_tests[] = { { "e2e_rend_circuit_setup", test_e2e_rend_circuit_setup, TT_FORK, NULL, NULL }, @@ -1221,6 +1280,8 @@ struct testcase_t hs_service_tests[] = { NULL, NULL }, { "upload_desctriptors", test_upload_desctriptors, TT_FORK, NULL, NULL }, + { "revision_counter_state", test_revision_counter_state, TT_FORK, + NULL, NULL }, END_OF_TESTCASES };

1 0

[tor/master] test: Unbreak test_upload_descriptors()
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit ec0da9a6f150c3e96a5aa777dea38105350a2b53 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 24 13:17:59 2017 +0300 test: Unbreak test_upload_descriptors() To upload the descriptor we needed a state file to write the rev counters in, but that test did not have a state file initialized. Also fix the typo in its func name. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/test/test_hs_service.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 664277b19..6d5ea7ed7 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -16,6 +16,7 @@ #define HS_INTROPOINT_PRIVATE #define MAIN_PRIVATE #define NETWORKSTATUS_PRIVATE +#define STATEFILE_PRIVATE #define TOR_CHANNEL_INTERNAL_ #include "test.h" @@ -43,6 +44,7 @@ #include "hs_service.h" #include "main.h" #include "rendservice.h" +#include "statefile.h" /* Trunnel */ #include "hs/cell_establish_intro.h" @@ -56,6 +58,15 @@ mock_networkstatus_get_live_consensus(time_t now) return &mock_ns; } +static or_state_t *dummy_state = NULL; + +/* Mock function to get fake or state (used for rev counters) */ +static or_state_t * +get_or_state_replacement(void) +{ + return dummy_state; +} + /* Mock function because we are not trying to test the close circuit that does * an awful lot of checks on the circuit object. */ static void @@ -779,6 +790,10 @@ test_introduce2(void *arg) hs_init(); MOCK(circuit_mark_for_close_, mock_circuit_mark_for_close); + MOCK(get_or_state, + get_or_state_replacement); + + dummy_state = tor_malloc_zero(sizeof(or_state_t)); circ = helper_create_origin_circuit(CIRCUIT_PURPOSE_S_INTRO, flags); @@ -830,6 +845,8 @@ test_introduce2(void *arg) tt_u64_op(ip->introduce2_count, OP_EQ, 0); done: + or_state_free(dummy_state); + dummy_state = NULL; circuit_free(TO_CIRCUIT(circ)); hs_free_all(); UNMOCK(circuit_mark_for_close_); @@ -1011,6 +1028,10 @@ test_build_update_descriptors(void *arg) hs_init(); MOCK(hs_overlap_mode_is_active, mock_hs_overlap_mode_is_active_true); + MOCK(get_or_state, + get_or_state_replacement); + + dummy_state = tor_malloc_zero(sizeof(or_state_t)); /* Create a service without a current descriptor to trigger a build. */ service = hs_service_new(get_options()); @@ -1133,7 +1154,7 @@ test_build_update_descriptors(void *arg) } static void -test_upload_desctriptors(void *arg) +test_upload_descriptors(void *arg) { int ret; time_t now = time(NULL); @@ -1144,6 +1165,10 @@ test_upload_desctriptors(void *arg) hs_init(); MOCK(hs_overlap_mode_is_active, mock_hs_overlap_mode_is_active_true); + MOCK(get_or_state, + get_or_state_replacement); + + dummy_state = tor_malloc_zero(sizeof(or_state_t)); /* Create a service with no descriptor. It's added to the global map. */ service = hs_service_new(get_options()); @@ -1278,7 +1303,7 @@ struct testcase_t hs_service_tests[] = { NULL, NULL }, { "build_update_descriptors", test_build_update_descriptors, TT_FORK, NULL, NULL }, - { "upload_desctriptors", test_upload_desctriptors, TT_FORK, + { "upload_descriptors", test_upload_descriptors, TT_FORK, NULL, NULL }, { "revision_counter_state", test_revision_counter_state, TT_FORK, NULL, NULL },

1 0

[tor/master] SR: Compute the start time of the current protocol run.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 2af254096f68f0cefadb5cb06b010d19edd2e6e1 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 17 14:45:14 2017 +0300 SR: Compute the start time of the current protocol run. This function will be used to make the HS desc overlap function be independent of absolute times. --- src/or/shared_random_state.c | 20 ++++++++++++ src/or/shared_random_state.h | 2 ++ src/test/test_shared_random.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 95 insertions(+) diff --git a/src/or/shared_random_state.c b/src/or/shared_random_state.c index 89d2e8d7f..1fc1440d0 100644 --- a/src/or/shared_random_state.c +++ b/src/or/shared_random_state.c @@ -156,6 +156,26 @@ get_start_time_of_current_round(time_t now) return curr_start; } +/** Return the start time of the current SR protocol run. For example, if the + * time is 23/06/2017 23:47:08 and a full SR protocol run is 24 hours, this + * function should return 23/06/2017 00:00:00. */ +time_t +sr_state_get_start_time_of_current_protocol_run(time_t now) +{ + int total_rounds = SHARED_RANDOM_N_ROUNDS * SHARED_RANDOM_N_PHASES; + int voting_interval = get_voting_interval(); + /* Find the time the current round started. */ + time_t beginning_of_current_round = get_start_time_of_current_round(now); + + /* Get current SR protocol round */ + int current_round = (now / voting_interval) % total_rounds; + + /* Get start time by subtracting the time elapsed from the beginning of the + protocol run */ + time_t time_elapsed_since_start_of_run = current_round * voting_interval; + return beginning_of_current_round - time_elapsed_since_start_of_run; +} + /* Return the time we should expire the state file created at now. * We expire the state file in the beginning of the next protocol run. */ STATIC time_t diff --git a/src/or/shared_random_state.h b/src/or/shared_random_state.h index 3526ad47d..ae1c5ac21 100644 --- a/src/or/shared_random_state.h +++ b/src/or/shared_random_state.h @@ -121,6 +121,8 @@ int sr_state_is_initialized(void); void sr_state_save(void); void sr_state_free(void); +time_t sr_state_get_start_time_of_current_protocol_run(time_t now); + #ifdef SHARED_RANDOM_STATE_PRIVATE STATIC int disk_state_load_from_disk_impl(const char *fname); diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 026a0f382..3eb47dfbc 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -189,6 +189,77 @@ test_get_state_valid_until_time(void *arg) ; } +/** Test the function that calculates the start time of the current SRV + * protocol run. */ +static void +test_get_start_time_of_current_run(void *arg) +{ + int retval; + char tbuf[ISO_TIME_LEN + 1]; + time_t current_time, run_start_time; + + (void) arg; + + { + /* Get start time if called at 00:00:01 */ + retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:01 UTC", + &current_time); + tt_int_op(retval, ==, 0); + run_start_time = + sr_state_get_start_time_of_current_protocol_run(current_time); + + /* Compare it with the correct result */ + format_iso_time(tbuf, run_start_time); + tt_str_op("2015-04-20 00:00:00", OP_EQ, tbuf); + } + + { + retval = parse_rfc1123_time("Mon, 20 Apr 2015 23:59:59 UTC", + &current_time); + tt_int_op(retval, ==, 0); + run_start_time = + sr_state_get_start_time_of_current_protocol_run(current_time); + + /* Compare it with the correct result */ + format_iso_time(tbuf, run_start_time); + tt_str_op("2015-04-20 00:00:00", OP_EQ, tbuf); + } + + { + retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:00:00 UTC", + &current_time); + tt_int_op(retval, ==, 0); + run_start_time = + sr_state_get_start_time_of_current_protocol_run(current_time); + + /* Compare it with the correct result */ + format_iso_time(tbuf, run_start_time); + tt_str_op("2015-04-20 00:00:00", OP_EQ, tbuf); + } + + /* Now let's alter the voting schedule and check the correctness of the + * function. Voting interval of 10 seconds, means that an SRV protocol run + * takes 10 seconds * 24 rounds = 4 mins */ + { + or_options_t *options = get_options_mutable(); + options->V3AuthVotingInterval = 10; + options->TestingV3AuthInitialVotingInterval = 10; + retval = parse_rfc1123_time("Mon, 20 Apr 2015 00:15:32 UTC", + &current_time); + + tt_int_op(retval, ==, 0); + run_start_time = + sr_state_get_start_time_of_current_protocol_run(current_time); + + /* Compare it with the correct result */ + format_iso_time(tbuf, run_start_time); + tt_str_op("2015-04-20 00:12:00", OP_EQ, tbuf); + } + + done: + ; +} + /* Mock function to immediately return our local 'mock_consensus'. */ static networkstatus_t * mock_networkstatus_get_live_consensus(time_t now) @@ -1272,6 +1343,8 @@ struct testcase_t sr_tests[] = { NULL, NULL }, { "get_next_valid_after_time", test_get_next_valid_after_time, TT_FORK, NULL, NULL }, + { "get_start_time_of_current_run", test_get_start_time_of_current_run, + TT_FORK, NULL, NULL }, { "get_state_valid_until_time", test_get_state_valid_until_time, TT_FORK, NULL, NULL }, { "vote", test_vote, TT_FORK,

1 0

[tor/master] prop224: Refactor the overlap function to not use absolute time.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 2e5a2d64bd4d26323a226d1069b960b28bd25440 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jul 18 16:06:12 2017 +0300 prop224: Refactor the overlap function to not use absolute time. We consider to be in overlap mode when we are in the period of time between a fresh SRV and the beginning of the new time period (in the normal network this is between 00:00 and 12:00 UTC). This commit edits that function to use the above semantic logic instead of absolute times. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_common.c | 19 ++++++------ src/test/test_hs_common.c | 72 ++++++++++++++++++++++++++++++++++++++++++++-- src/test/test_hs_service.c | 6 ++++ 3 files changed, 86 insertions(+), 11 deletions(-) diff --git a/src/or/hs_common.c b/src/or/hs_common.c index 9c3d2c171..20b470ff6 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -908,7 +908,8 @@ hs_build_blinded_keypair(const ed25519_keypair_t *kp, MOCK_IMPL(int, hs_overlap_mode_is_active, (const networkstatus_t *consensus, time_t now)) { - struct tm valid_after_tm; + time_t valid_after; + time_t srv_start_time, tp_start_time; if (!consensus) { consensus = networkstatus_get_live_consensus(now); @@ -917,16 +918,18 @@ hs_overlap_mode_is_active, (const networkstatus_t *consensus, time_t now)) } } - /* XXX: Futur commits will change this to a slot system so it can be - * fine tuned better for testing networks in terms of timings. */ + /* We consider to be in overlap mode when we are in the period of time + * between a fresh SRV and the beginning of the new time period (in the + * normal network this is between 00:00 (inclusive) and 12:00 UTC + * (exclusive)) */ + valid_after = consensus->valid_after; + srv_start_time =sr_state_get_start_time_of_current_protocol_run(valid_after); + tp_start_time = hs_get_start_time_of_next_time_period(srv_start_time); - /* From the spec: "Specifically, when a hidden service fetches a consensus - * with "valid-after" between 00:00UTC and 12:00UTC, it goes into - * "descriptor overlap" mode." */ - tor_gmtime_r(&consensus->valid_after, &valid_after_tm); - if (valid_after_tm.tm_hour > 0 && valid_after_tm.tm_hour < 12) { + if (valid_after >= srv_start_time && valid_after < tp_start_time) { return 1; } + return 0; } diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index e41d68d42..a5c499112 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -200,9 +200,9 @@ test_desc_overlap_period(void *arg) time_t now = time(NULL); networkstatus_t *dummy_consensus = NULL; - /* First try with a consensus inside the overlap period */ + /* First try with a consensus just inside the overlap period */ dummy_consensus = tor_malloc_zero(sizeof(networkstatus_t)); - retval = parse_rfc1123_time("Wed, 13 Apr 2016 10:00:00 UTC", + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:00:00 UTC", &dummy_consensus->valid_after); tt_int_op(retval, ==, 0); @@ -211,7 +211,7 @@ test_desc_overlap_period(void *arg) /* Now increase the valid_after so that it goes to 11:00:00 UTC. Overlap period is still active. */ - dummy_consensus->valid_after += 3600; + dummy_consensus->valid_after += 3600*11; retval = hs_overlap_mode_is_active(dummy_consensus, now); tt_int_op(retval, ==, 1); @@ -238,6 +238,70 @@ test_desc_overlap_period(void *arg) tor_free(dummy_consensus); } +/* Test the overlap period functions on a testnet with altered voting + * schedule */ +static void +test_desc_overlap_period_testnet(void *arg) +{ + int retval; + time_t now = approx_time(); + networkstatus_t *dummy_consensus = NULL; + or_options_t *options = get_options_mutable(); + + (void) arg; + + /* Set the testnet option and a 10-second voting interval */ + options->TestingTorNetwork = 1; + options->V3AuthVotingInterval = 10; + options->TestingV3AuthInitialVotingInterval = 10; + + dummy_consensus = tor_malloc_zero(sizeof(networkstatus_t)); + + /* A 10-second voting interval means that the lengths of an SRV run and of a + * time period are both 10*24 seconds (4 minutes). The SRV gets published at + * 00:00:00 and the TP starts at 00:02:00 (rotation offset: 2 mins). Those + * two minutes between SRV publish and TP start is the overlap period + * window. Let's test it: */ + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:00:00 UTC", + &dummy_consensus->valid_after); + tt_int_op(retval, ==, 0); + retval = hs_overlap_mode_is_active(dummy_consensus, now); + tt_int_op(retval, ==, 1); + + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:01:59 UTC", + &dummy_consensus->valid_after); + tt_int_op(retval, ==, 0); + retval = hs_overlap_mode_is_active(dummy_consensus, now); + tt_int_op(retval, ==, 1); + + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:02:00 UTC", + &dummy_consensus->valid_after); + tt_int_op(retval, ==, 0); + retval = hs_overlap_mode_is_active(dummy_consensus, now); + tt_int_op(retval, ==, 0); + + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:04:00 UTC", + &dummy_consensus->valid_after); + tt_int_op(retval, ==, 0); + retval = hs_overlap_mode_is_active(dummy_consensus, now); + tt_int_op(retval, ==, 1); + + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:05:59 UTC", + &dummy_consensus->valid_after); + tt_int_op(retval, ==, 0); + retval = hs_overlap_mode_is_active(dummy_consensus, now); + tt_int_op(retval, ==, 1); + + retval = parse_rfc1123_time("Wed, 13 Apr 2016 00:06:00 UTC", + &dummy_consensus->valid_after); + tt_int_op(retval, ==, 0); + retval = hs_overlap_mode_is_active(dummy_consensus, now); + tt_int_op(retval, ==, 0); + + done: + tor_free(dummy_consensus); +} + struct testcase_t hs_common_tests[] = { { "build_address", test_build_address, TT_FORK, NULL, NULL }, @@ -249,6 +313,8 @@ struct testcase_t hs_common_tests[] = { TT_FORK, NULL, NULL }, { "desc_overlap_period", test_desc_overlap_period, TT_FORK, NULL, NULL }, + { "desc_overlap_period_testnet", test_desc_overlap_period_testnet, TT_FORK, + NULL, NULL }, END_OF_TESTCASES }; diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 1b8d8252e..30f1682d8 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -936,6 +936,8 @@ test_rotate_descriptors(void *arg) * overlap check doesn't care about the year. */ ret = parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", &mock_ns.valid_after); + ret = parse_rfc1123_time("Sat, 26 Oct 1985 14:00:00 UTC", + &mock_ns.fresh_until); tt_int_op(ret, OP_EQ, 0); /* Create a service with a default descriptor and state. It's added to the @@ -954,6 +956,8 @@ test_rotate_descriptors(void *arg) /* Entering an overlap period. */ ret = parse_rfc1123_time("Sat, 26 Oct 1985 01:00:00 UTC", &mock_ns.valid_after); + ret = parse_rfc1123_time("Sat, 26 Oct 1985 02:00:00 UTC", + &mock_ns.fresh_until); tt_int_op(ret, OP_EQ, 0); desc_next = service_descriptor_new(); desc_next->next_upload_time = 42; /* Our marker to recognize it. */ @@ -977,6 +981,8 @@ test_rotate_descriptors(void *arg) /* Going out of the overlap period. */ ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", &mock_ns.valid_after); + ret = parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", + &mock_ns.fresh_until); /* This should reset the state and not touch the current descriptor. */ tt_int_op(ret, OP_EQ, 0); rotate_all_descriptors(now);

1 0

[tor/master] prop224: Remove INTRODUCE2 legacy handling
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 708789025da9369f45ff18a6bcf743f005d9abff Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Aug 1 13:30:04 2017 -0400 prop224: Remove INTRODUCE2 legacy handling Turns out that introduction points don't care about the INTRODUCE2 cell format as long as the top field is LEGACY_KEY_ID as expected. So let's use a single INTRODUCE format regardless of the introduction point being legacy or not. This also removes the polymorphic void* situation. Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_cell.c | 105 ++++++++++------------------------------------------ src/or/hs_cell.h | 2 - src/or/hs_circuit.c | 1 - 3 files changed, 19 insertions(+), 89 deletions(-) diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index 4c476b138..712faa335 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -208,100 +208,35 @@ build_legacy_establish_intro(const char *circ_nonce, crypto_pk_t *enc_key, return cell_len; } -/* Free the given cell pointer. If is_legacy_cell is set, cell_ptr is cast to - * a rend_intro_cell_t else to a trn_cell_introduce1_t. */ -static void -introduce2_free_cell(void *cell_ptr, unsigned int is_legacy_cell) -{ - if (cell_ptr == NULL) { - return; - } - if (is_legacy_cell) { - rend_intro_cell_t *legacy_cell = cell_ptr; - rend_service_free_intro(legacy_cell); - } else { - trn_cell_introduce1_free((trn_cell_introduce1_t *) cell_ptr); - } -} - -/* Return the length of the encrypted section of the cell_ptr. If - * is_legacy_cell is set, cell_ptr is cast to a rend_intro_cell_t else to a - * trn_cell_introduce1_t. */ -static size_t -get_introduce2_encrypted_section_len(const void *cell_ptr, - unsigned int is_legacy_cell) -{ - tor_assert(cell_ptr); - if (is_legacy_cell) { - return ((const rend_intro_cell_t *) cell_ptr)->ciphertext_len; - } - return trn_cell_introduce1_getlen_encrypted( - (const trn_cell_introduce1_t *) cell_ptr); -} - -/* Return the encrypted section pointer from the the cell_ptr. If - * is_legacy_cell is set, cell_ptr is cast to a rend_intro_cell_t else to a - * trn_cell_introduce1_t. */ -static const uint8_t * -get_introduce2_encrypted_section(const void *cell_ptr, - unsigned int is_legacy_cell) -{ - tor_assert(cell_ptr); - if (is_legacy_cell) { - return ((const rend_intro_cell_t *) cell_ptr)->ciphertext; - } - return trn_cell_introduce1_getconstarray_encrypted( - (const trn_cell_introduce1_t *) cell_ptr); -} - /* Parse an INTRODUCE2 cell from payload of size payload_len for the given * service and circuit which are used only for logging purposes. The resulting - * parsed cell is put in cell_ptr_out. If is_legacy_cell is set, the type of - * the returned cell is rend_intro_cell_t else trn_cell_introduce1_t. + * parsed cell is put in cell_ptr_out. * * Return 0 on success else a negative value and cell_ptr_out is untouched. */ static int parse_introduce2_cell(const hs_service_t *service, const origin_circuit_t *circ, const uint8_t *payload, - size_t payload_len, unsigned int is_legacy_cell, - void **cell_ptr_out) + size_t payload_len, + trn_cell_introduce1_t **cell_ptr_out) { + trn_cell_introduce1_t *cell = NULL; + tor_assert(service); tor_assert(circ); tor_assert(payload); tor_assert(cell_ptr_out); - /* We parse the cell differently for legacy. */ - if (is_legacy_cell) { - char *err_msg; - rend_intro_cell_t *legacy_cell = NULL; - - legacy_cell = rend_service_begin_parse_intro(payload, payload_len, 2, - &err_msg); - if (legacy_cell == NULL) { - log_info(LD_REND, "Unable to parse legacy INTRODUCE2 cell on " - "circuit %u for service %s: %s", - TO_CIRCUIT(circ)->n_circ_id, err_msg, - safe_str_client(service->onion_address)); - tor_free(err_msg); - goto err; - } - *cell_ptr_out = legacy_cell; - } else { - trn_cell_introduce1_t *cell = NULL; - /* Parse the cell so we can start cell validation. */ - if (trn_cell_introduce1_parse(&cell, payload, payload_len) < 0) { - log_info(LD_PROTOCOL, "Unable to parse INTRODUCE2 cell on circuit %u " - "for service %s", - TO_CIRCUIT(circ)->n_circ_id, - safe_str_client(service->onion_address)); - goto err; - } - *cell_ptr_out = cell; + /* Parse the cell so we can start cell validation. */ + if (trn_cell_introduce1_parse(&cell, payload, payload_len) < 0) { + log_info(LD_PROTOCOL, "Unable to parse INTRODUCE2 cell on circuit %u " + "for service %s", + TO_CIRCUIT(circ)->n_circ_id, + safe_str_client(service->onion_address)); + goto err; } - /* On success, we must have set the cell pointer. */ - tor_assert(*cell_ptr_out); + /* Success. */ + *cell_ptr_out = cell; return 0; err: return -1; @@ -465,9 +400,9 @@ hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data, uint8_t *decrypted = NULL; size_t encrypted_section_len; const uint8_t *encrypted_section; + trn_cell_introduce1_t *cell = NULL; trn_cell_introduce_encrypted_t *enc_cell = NULL; hs_ntor_intro_cell_keys_t *intro_keys = NULL; - void *cell_ptr = NULL; tor_assert(data); tor_assert(circ); @@ -475,7 +410,7 @@ hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data, /* Parse the cell into a decoded data structure pointed by cell_ptr. */ if (parse_introduce2_cell(service, circ, data->payload, data->payload_len, - data->is_legacy, &cell_ptr) < 0) { + &cell) < 0) { goto done; } @@ -484,10 +419,8 @@ hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data, TO_CIRCUIT(circ)->n_circ_id, safe_str_client(service->onion_address)); - encrypted_section = - get_introduce2_encrypted_section(cell_ptr, data->is_legacy); - encrypted_section_len = - get_introduce2_encrypted_section_len(cell_ptr, data->is_legacy); + encrypted_section = trn_cell_introduce1_getconstarray_encrypted(cell); + encrypted_section_len = trn_cell_introduce1_getlen_encrypted(cell); /* Encrypted section must at least contain the CLIENT_PK and MAC which is * defined in section 3.3.2 of the specification. */ @@ -603,7 +536,7 @@ hs_cell_parse_introduce2(hs_cell_introduce2_data_t *data, } tor_free(decrypted); trn_cell_introduce_encrypted_free(enc_cell); - introduce2_free_cell(cell_ptr, data->is_legacy); + trn_cell_introduce1_free(cell); return ret; } diff --git a/src/or/hs_cell.h b/src/or/hs_cell.h index 1336a399a..b7c3d1127 100644 --- a/src/or/hs_cell.h +++ b/src/or/hs_cell.h @@ -34,8 +34,6 @@ typedef struct hs_cell_introduce2_data_t { const uint8_t *payload; /* Size of the payload of the received encoded cell. */ size_t payload_len; - /* Is this a legacy introduction point? */ - unsigned int is_legacy : 1; /*** Muttable Section. ***/ diff --git a/src/or/hs_circuit.c b/src/or/hs_circuit.c index adca189ad..c78ac6057 100644 --- a/src/or/hs_circuit.c +++ b/src/or/hs_circuit.c @@ -945,7 +945,6 @@ hs_circ_handle_introduce2(const hs_service_t *service, data.payload = payload; data.payload_len = payload_len; data.link_specifiers = smartlist_new(); - data.is_legacy = ip->base.is_only_legacy; data.replay_cache = ip->replay_cache; if (hs_cell_parse_introduce2(&data, circ, service) < 0) {

1 0

[tor/master] memwipe interesting unused memory
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 74981d1f133f0ecb1050715af4ee5d409fcebd41 Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 3 15:42:30 2017 +0300 memwipe interesting unused memory --- src/or/hs_cell.c | 15 +++++++++------ src/or/hs_common.c | 8 ++++++++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index 712faa335..922ff7346 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -193,18 +193,16 @@ build_legacy_establish_intro(const char *circ_nonce, crypto_pk_t *enc_key, uint8_t *cell_out) { ssize_t cell_len; - char buf[RELAY_PAYLOAD_SIZE] = {0}; tor_assert(circ_nonce); tor_assert(enc_key); tor_assert(cell_out); - cell_len = rend_service_encode_establish_intro_cell(buf, sizeof(buf), + memwipe(cell_out, 0, RELAY_PAYLOAD_SIZE); + + cell_len = rend_service_encode_establish_intro_cell((char*)cell_out, + RELAY_PAYLOAD_SIZE, enc_key, circ_nonce); - tor_assert(cell_len <= RELAY_PAYLOAD_SIZE); - if (cell_len >= 0) { - memcpy(cell_out, buf, cell_len); - } return cell_len; } @@ -326,6 +324,9 @@ hs_cell_build_establish_intro(const char *circ_nonce, tmp_cell_enc, tmp_cell_enc_len - tmp_cell_mac_offset); handshake_ptr = trn_cell_establish_intro_getarray_handshake_mac(cell); memcpy(handshake_ptr, mac, sizeof(mac)); + + memwipe(mac, 0, sizeof(mac)); + memwipe(tmp_cell_enc, 0, sizeof(tmp_cell_enc)); } /* Calculate the cell signature SIG. */ @@ -353,6 +354,8 @@ hs_cell_build_establish_intro(const char *circ_nonce, /* Copy the signature into the cell. */ sig_ptr = trn_cell_establish_intro_getarray_sig(cell); memcpy(sig_ptr, sig.sig, sig_len); + + memwipe(tmp_cell_enc, 0, sizeof(tmp_cell_enc)); } /* Encode the cell. Can't be bigger than a standard cell. */ diff --git a/src/or/hs_common.c b/src/or/hs_common.c index f3604d67c..f63adf51b 100644 --- a/src/or/hs_common.c +++ b/src/or/hs_common.c @@ -582,6 +582,8 @@ build_blinded_key_param(const ed25519_public_key_t *pubkey, /* Extract digest and put it in the param. */ crypto_digest_get_digest(digest, (char *) param_out, DIGEST256_LEN); crypto_digest_free(digest); + + memwipe(nonce, 0, sizeof(nonce)); } /* Using an ed25519 public key and version to build the checksum of an @@ -701,6 +703,8 @@ hs_get_subcredential(const ed25519_public_key_t *identity_pk, ED25519_PUBKEY_LEN); crypto_digest_get_digest(digest, (char *) subcred_out, DIGEST256_LEN); crypto_digest_free(digest); + + memwipe(credential, 0, sizeof(credential)); } /* From the given list of hidden service ports, find the matching one from the @@ -892,6 +896,8 @@ hs_build_blinded_pubkey(const ed25519_public_key_t *pk, build_blinded_key_param(pk, secret, secret_len, time_period_num, get_time_period_length(), param); ed25519_public_blind(blinded_pk_out, pk, param); + + memwipe(param, 0, sizeof(param)); } /* From a given ed25519 keypair kp and an optional secret, compute a blinded @@ -916,6 +922,8 @@ hs_build_blinded_keypair(const ed25519_keypair_t *kp, build_blinded_key_param(&kp->pubkey, secret, secret_len, time_period_num, get_time_period_length(), param); ed25519_keypair_blind(blinded_kp_out, kp, param); + + memwipe(param, 0, sizeof(param)); } /* Return true if overlap mode is active given the date in consensus. If

1 0

[tor/master] Fix ternary operator abuse.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 434112df4bfd4f94e553d5a41579a70765949904 Author: George Kadianakis <desnacked(a)riseup.net> Date: Mon Jul 31 13:27:16 2017 +0300 Fix ternary operator abuse. --- src/or/hs_service.c | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 131c4ff9f..6fa714e5e 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -2215,9 +2215,11 @@ should_service_upload_descriptor(const hs_service_t *service, * instead of waiting an arbitrary amount of time breaking the service. * Else, if we have no missing intro points, we use the value taken from the * service configuration. */ - (desc->missing_intro_points) ? - (num_intro_points = digest256map_size(desc->intro_points.map)) : - (num_intro_points = service->config.num_intro_points); + if (desc->missing_intro_points) { + num_intro_points = digest256map_size(desc->intro_points.map); + } else { + num_intro_points = service->config.num_intro_points; + } /* This means we tried to pick intro points but couldn't get any so do not * upload descriptor in this case. We need at least one for the service to @@ -2768,10 +2770,12 @@ hs_service_receive_introduce2(origin_circuit_t *circ, const uint8_t *payload, goto done; } - ret = (circ->hs_ident) ? service_handle_introduce2(circ, payload, - payload_len) : - rend_service_receive_introduction(circ, payload, - payload_len); + if (circ->hs_ident) { + ret = service_handle_introduce2(circ, payload, payload_len); + } else { + ret = rend_service_receive_introduction(circ, payload, payload_len); + } + done: return ret; } @@ -2798,10 +2802,12 @@ hs_service_receive_intro_established(origin_circuit_t *circ, /* Handle both version. v2 uses rend_data and v3 uses the hs circuit * identifier hs_ident. Can't be both. */ - ret = (circ->hs_ident) ? service_handle_intro_established(circ, payload, - payload_len) : - rend_service_intro_established(circ, payload, - payload_len); + if (circ->hs_ident) { + ret = service_handle_intro_established(circ, payload, payload_len); + } else { + ret = rend_service_intro_established(circ, payload, payload_len); + } + if (ret < 0) { goto err; } @@ -2822,12 +2828,18 @@ hs_service_circuit_has_opened(origin_circuit_t *circ) * identifier hs_ident. Can't be both. */ switch (TO_CIRCUIT(circ)->purpose) { case CIRCUIT_PURPOSE_S_ESTABLISH_INTRO: - (circ->hs_ident) ? service_intro_circ_has_opened(circ) : + if (circ->hs_ident) { + service_intro_circ_has_opened(circ); + } else { rend_service_intro_has_opened(circ); + } break; case CIRCUIT_PURPOSE_S_CONNECT_REND: - (circ->hs_ident) ? service_rendezvous_circ_has_opened(circ) : + if (circ->hs_ident) { + service_rendezvous_circ_has_opened(circ); + } else { rend_service_rendezvous_has_opened(circ); + } break; default: tor_assert(0);

1 0

[tor/master] Relax assertions: turn them to BUGs and non-fatal asserts.
by nickm＠torproject.org 09 Aug '17

09 Aug '17

commit 7c507a1f7f58adb48be887cd26686190c3b22cfd Author: George Kadianakis <desnacked(a)riseup.net> Date: Thu Aug 3 15:47:06 2017 +0300 Relax assertions: turn them to BUGs and non-fatal asserts. --- src/or/connection_edge.c | 4 +++- src/or/hs_service.c | 33 ++++++++++++++++++++++++--------- src/or/hs_service.h | 4 ++-- src/test/test_hs_service.c | 2 +- 4 files changed, 30 insertions(+), 13 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 41e5f88ab..9f0cc061e 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -3098,10 +3098,12 @@ handle_hs_exit_conn(circuit_t *circ, edge_connection_t *conn) /* Setup the identifier to be the one for the circuit service. */ conn->hs_ident = hs_ident_edge_conn_new(&origin_circ->hs_ident->identity_pk); + tor_assert(connection_edge_is_rendezvous_stream(conn)); ret = hs_service_set_conn_addr_port(origin_circ, conn); } else { /* We should never get here if the circuit's purpose is rendezvous. */ - tor_assert(0); + tor_assert_nonfatal_unreached(); + return -1; } if (ret < 0) { log_info(LD_REND, "Didn't find rendezvous service (addr%s, port %d)", diff --git a/src/or/hs_service.c b/src/or/hs_service.c index 30f693108..22739334d 100644 --- a/src/or/hs_service.c +++ b/src/or/hs_service.c @@ -377,12 +377,16 @@ service_intro_point_new(const extend_info_t *ei, unsigned int is_legacy) * mandatory. */ ls = hs_desc_link_specifier_new(ei, LS_IPV4); /* It is impossible to have an extend info object without a v4. */ - tor_assert(ls); + if (BUG(!ls)) { + goto err; + } smartlist_add(ip->base.link_specifiers, ls); ls = hs_desc_link_specifier_new(ei, LS_LEGACY_ID); /* It is impossible to have an extend info object without an identity * digest. */ - tor_assert(ls); + if (BUG(!ls)) { + goto err; + } smartlist_add(ip->base.link_specifiers, ls); ls = hs_desc_link_specifier_new(ei, LS_ED25519_ID); /* It is impossible to have an extend info object without an ed25519 @@ -546,8 +550,9 @@ get_node_from_intro_point(const hs_service_intro_point_t *ip) tor_assert(ip); ls = get_link_spec_by_type(ip, LS_LEGACY_ID); - /* Legacy ID is mandatory for an intro point object to have. */ - tor_assert(ls); + if (BUG(!ls)) { + return NULL; + } /* XXX In the future, we want to only use the ed25519 ID (#22173). */ return node_get_by_id((const char *) ls->u.legacy_id); } @@ -1427,7 +1432,10 @@ pick_needed_intro_points(hs_service_t *service, * robin so they are considered valid nodes to pick again. */ DIGEST256MAP_FOREACH(desc->intro_points.map, key, hs_service_intro_point_t *, ip) { - smartlist_add(exclude_nodes, (void *) get_node_from_intro_point(ip)); + const node_t *intro_node = get_node_from_intro_point(ip); + if (intro_node) { + smartlist_add(exclude_nodes, (void*)intro_node); + } } DIGEST256MAP_FOREACH_END; /* Also, add the failing intro points that our descriptor encounteered in * the exclude node list. */ @@ -2299,10 +2307,17 @@ service_intro_circ_has_opened(origin_circuit_t *circ) hs_service_descriptor_t *desc = NULL; tor_assert(circ); - tor_assert(circ->cpath); - /* Getting here means this is a v3 intro circuit. */ - tor_assert(circ->hs_ident); - tor_assert(TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO); + + /* Let's do some basic sanity checking of the circ state */ + if (BUG(!circ->cpath)) { + return; + } + if (BUG(TO_CIRCUIT(circ)->purpose != CIRCUIT_PURPOSE_S_ESTABLISH_INTRO)) { + return; + } + if (BUG(!circ->hs_ident)) { + return; + } /* Get the corresponding service and intro point. */ get_objects_from_ident(circ->hs_ident, &service, &ip, &desc); diff --git a/src/or/hs_service.h b/src/or/hs_service.h index cb2a7aa80..cf2e1fa6f 100644 --- a/src/or/hs_service.h +++ b/src/or/hs_service.h @@ -313,8 +313,8 @@ STATIC void get_objects_from_ident(const hs_ident_circuit_t *ident, hs_service_t **service, hs_service_intro_point_t **ip, hs_service_descriptor_t **desc); -STATIC const node_t *get_node_from_intro_point( - const hs_service_intro_point_t *ip); +STATIC const node_t * +get_node_from_intro_point(const hs_service_intro_point_t *ip); STATIC int can_service_launch_intro_circuit(hs_service_t *service, time_t now); STATIC int intro_point_should_expire(const hs_service_intro_point_t *ip, diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 6d5ea7ed7..2ad8393e8 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -540,7 +540,7 @@ test_helper_functions(void *arg) /* Testing get_node_from_intro_point() */ { const node_t *node = get_node_from_intro_point(ip); - tt_assert(node == &mock_node); + tt_ptr_op(node, OP_EQ, &mock_node); SMARTLIST_FOREACH_BEGIN(ip->base.link_specifiers, hs_desc_link_specifier_t *, ls) { if (ls->type == LS_LEGACY_ID) {

1 0