nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Test: fix HS_DESC to expect descriptor ID

Browse Source 
With #15881 implemented, this adds the missing descriptor ID at the end of
the expected control message.

Signed-off-by: David Goulet <dgoulet@ev0ke.net>
This commit is contained in:
David Goulet 2015-05-12 16:45:56 -04:00 committed by Nick Mathewson
parent c1ffeadff4
commit acfa374048
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/test/test_hs.c
View File

@ -13,6 +13,7 @@
#include "test.h" #include "test.h"
#include "control.h" #include "control.h"
#include "config.h" #include "config.h"
#include "rendcommon.h"
#include "routerset.h" #include "routerset.h"
#include "circuitbuild.h" #include "circuitbuild.h"
#include "test_helpers.h" #include "test_helpers.h"
@ -131,11 +132,13 @@ static void
test_hs_desc_event(void *arg) test_hs_desc_event(void *arg)
{ {
#define STR_HS_ADDR "ajhb7kljbiru65qo" #define STR_HS_ADDR "ajhb7kljbiru65qo"
#define STR_HS_ID "b3oeducbhjmbqmgw2i3jtz4fekkrinwj" #define STR_HS_CONTENT_DESC_ID "g5ojobzupf275beh5ra72uyhb3dkpxwg"
#define STR_DESC_ID "g5ojobzupf275beh5ra72uyhb3dkpxwg" #define STR_DESC_ID_BASE32 "hba3gmcgpfivzfhx5rtfqkfdhv65yrj3"
int ret;
rend_data_t rend_query; rend_data_t rend_query;
const char *expected_msg; const char *expected_msg;
char desc_id_base32[REND_DESC_ID_V2_LEN_BASE32 + 1];
(void) arg; (void) arg;
MOCK(send_control_event_string, MOCK(send_control_event_string,
@ -144,31 +147,46 @@ test_hs_desc_event(void *arg)
node_describe_longname_by_id_replacement); node_describe_longname_by_id_replacement);
/* setup rend_query struct */ /* setup rend_query struct */
memset(&rend_query, 0, sizeof(rend_query));
strncpy(rend_query.onion_address, STR_HS_ADDR, strncpy(rend_query.onion_address, STR_HS_ADDR,
REND_SERVICE_ID_LEN_BASE32+1); REND_SERVICE_ID_LEN_BASE32+1);
rend_query.auth_type = 0; rend_query.auth_type = REND_NO_AUTH;
rend_query.hsdirs_fp = smartlist_new();
smartlist_add(rend_query.hsdirs_fp, tor_memdup(HSDIR_EXIST_ID,
DIGEST_LEN));
/* Compute descriptor ID for replica 0, should be STR_DESC_ID_BASE32. */
ret = rend_compute_v2_desc_id(rend_query.descriptor_id[0],
rend_query.onion_address,
NULL, 0, 0);
tt_int_op(ret, ==, 0);
base32_encode(desc_id_base32, sizeof(desc_id_base32),
rend_query.descriptor_id[0], DIGEST_LEN);
/* Make sure rend_compute_v2_desc_id works properly. */
tt_mem_op(desc_id_base32, OP_EQ, STR_DESC_ID_BASE32,
sizeof(desc_id_base32));
/* test request event */ /* test request event */
control_event_hs_descriptor_requested(&rend_query, HSDIR_EXIST_ID, control_event_hs_descriptor_requested(&rend_query, HSDIR_EXIST_ID,
STR_HS_ID); STR_DESC_ID_BASE32);
expected_msg = "650 HS_DESC REQUESTED "STR_HS_ADDR" NO_AUTH "\ expected_msg = "650 HS_DESC REQUESTED "STR_HS_ADDR" NO_AUTH "\
STR_HSDIR_EXIST_LONGNAME" "STR_HS_ID"\r\n"; STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32 "\r\n";
tt_assert(received_msg); tt_assert(received_msg);
tt_str_op(received_msg,OP_EQ, expected_msg); tt_str_op(received_msg,OP_EQ, expected_msg);
tor_free(received_msg); tor_free(received_msg);
/* test received event */ /* test received event */
rend_query.auth_type = 1; rend_query.auth_type = REND_BASIC_AUTH;
control_event_hs_descriptor_received(rend_query.onion_address, control_event_hs_descriptor_received(rend_query.onion_address,
&rend_query, HSDIR_EXIST_ID); &rend_query, HSDIR_EXIST_ID);
expected_msg = "650 HS_DESC RECEIVED "STR_HS_ADDR" BASIC_AUTH "\ expected_msg = "650 HS_DESC RECEIVED "STR_HS_ADDR" BASIC_AUTH "\
STR_HSDIR_EXIST_LONGNAME"\r\n"; STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32"\r\n";
tt_assert(received_msg); tt_assert(received_msg);
tt_str_op(received_msg,OP_EQ, expected_msg); tt_str_op(received_msg,OP_EQ, expected_msg);
tor_free(received_msg); tor_free(received_msg);
/* test failed event */ /* test failed event */
rend_query.auth_type = 2; rend_query.auth_type = REND_STEALTH_AUTH;
control_event_hs_descriptor_failed(&rend_query, control_event_hs_descriptor_failed(&rend_query,
HSDIR_NONE_EXIST_ID, HSDIR_NONE_EXIST_ID,
"QUERY_REJECTED"); "QUERY_REJECTED");
@ -184,22 +202,26 @@ test_hs_desc_event(void *arg)
HSDIR_EXIST_ID, HSDIR_EXIST_ID,
"QUERY_REJECTED"); "QUERY_REJECTED");
expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" UNKNOWN "\ expected_msg = "650 HS_DESC FAILED "STR_HS_ADDR" UNKNOWN "\
STR_HSDIR_EXIST_LONGNAME" REASON=QUERY_REJECTED\r\n"; STR_HSDIR_EXIST_LONGNAME " " STR_DESC_ID_BASE32\
" REASON=QUERY_REJECTED\r\n";
tt_assert(received_msg); tt_assert(received_msg);
tt_str_op(received_msg,OP_EQ, expected_msg); tt_str_op(received_msg,OP_EQ, expected_msg);
tor_free(received_msg); tor_free(received_msg);
/* test valid content. */ /* test valid content. */
char *exp_msg; char *exp_msg;
control_event_hs_descriptor_content(rend_query.onion_address, STR_DESC_ID, control_event_hs_descriptor_content(rend_query.onion_address, STR_HS_CONTENT_DESC_ID,
HSDIR_EXIST_ID, hs_desc_content); HSDIR_EXIST_ID, hs_desc_content);
tor_asprintf(&exp_msg, "650+HS_DESC_CONTENT " STR_HS_ADDR " " STR_DESC_ID \ tor_asprintf(&exp_msg, "650+HS_DESC_CONTENT " STR_HS_ADDR " "\
" " STR_HSDIR_EXIST_LONGNAME "\r\n%s\r\n.\r\n650 OK\r\n", STR_HS_CONTENT_DESC_ID " " STR_HSDIR_EXIST_LONGNAME\
hs_desc_content); "\r\n%s\r\n.\r\n650 OK\r\n", hs_desc_content);
tt_assert(received_msg); tt_assert(received_msg);
tt_str_op(received_msg, OP_EQ, exp_msg); tt_str_op(received_msg, OP_EQ, exp_msg);
tor_free(received_msg); tor_free(received_msg);
tor_free(exp_msg); tor_free(exp_msg);
SMARTLIST_FOREACH(rend_query.hsdirs_fp, char *, d, tor_free(d));
smartlist_free(rend_query.hsdirs_fp);
done: done:
UNMOCK(send_control_event_string); UNMOCK(send_control_event_string);