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

[tor/master] hs: Rename service config port object
by dgoulet＠torproject.org 19 Feb '21

19 Feb '21

commit a34885bc8035eb29524749582c16ce4ec8fbc715 Author: David Goulet <dgoulet(a)torproject.org> Date: Fri Feb 5 10:58:19 2021 -0500 hs: Rename service config port object Remove it from rendservice.c and move everything related to hs_common.{c|h}. Related to #40266 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/control/control_cmd.c | 7 +- src/feature/hs/hs_common.c | 149 ++++++++++++++++++++++++++++++++++++-- src/feature/hs/hs_common.h | 9 ++- src/feature/hs/hs_config.c | 4 +- src/feature/hs/hs_metrics.c | 2 +- src/feature/hs/hs_service.c | 4 +- src/feature/hs/hs_service.h | 2 +- src/feature/rend/rendservice.c | 138 +---------------------------------- src/feature/rend/rendservice.h | 10 +-- src/test/test_controller.c | 46 ++++++------ src/test/test_hs.c | 6 +- 11 files changed, 186 insertions(+), 191 deletions(-) diff --git a/src/feature/control/control_cmd.c b/src/feature/control/control_cmd.c index 737a5927e9..e88f17de09 100644 --- a/src/feature/control/control_cmd.c +++ b/src/feature/control/control_cmd.c @@ -1727,8 +1727,7 @@ handle_control_add_onion(control_connection_t *conn, for (arg = args->kwargs; arg; arg = arg->next) { if (!strcasecmp(arg->key, "Port")) { /* "Port=VIRTPORT[,TARGET]". */ - rend_service_port_config_t *cfg = - rend_service_parse_port_config(arg->value, ",", NULL); + hs_port_config_t *cfg = hs_parse_port_config(arg->value, ",", NULL); if (!cfg) { control_write_endreply(conn, 512, "Invalid VIRTPORT/TARGET"); goto out; @@ -1987,8 +1986,8 @@ handle_control_add_onion(control_connection_t *conn, out: if (port_cfgs) { - SMARTLIST_FOREACH(port_cfgs, rend_service_port_config_t*, p, - rend_service_port_config_free(p)); + SMARTLIST_FOREACH(port_cfgs, hs_port_config_t*, p, + hs_port_config_free(p)); smartlist_free(port_cfgs); } diff --git a/src/feature/hs/hs_common.c b/src/feature/hs/hs_common.c index 91cb6d529b..55cc4d5518 100644 --- a/src/feature/hs/hs_common.c +++ b/src/feature/hs/hs_common.c @@ -37,6 +37,7 @@ #include "feature/relay/routermode.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_util.h" +#include "lib/net/resolve.h" #include "core/or/edge_connection_st.h" #include "feature/nodelist/networkstatus_st.h" @@ -57,12 +58,12 @@ static const char *str_ed25519_basepoint = #ifdef HAVE_SYS_UN_H -/** Given ports, a smarlist containing rend_service_port_config_t, +/** Given ports, a smarlist containing hs_port_config_t, * add the given p, a AF_UNIX port to the list. Return 0 on success * else return -ENOSYS if AF_UNIX is not supported (see function in the * #else statement below). */ static int -add_unix_port(smartlist_t *ports, rend_service_port_config_t *p) +add_unix_port(smartlist_t *ports, hs_port_config_t *p) { tor_assert(ports); tor_assert(p); @@ -76,7 +77,7 @@ add_unix_port(smartlist_t *ports, rend_service_port_config_t *p) * on success else return -ENOSYS if AF_UNIX is not supported (see function * in the #else statement below). */ static int -set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p) +set_unix_port(edge_connection_t *conn, hs_port_config_t *p) { tor_assert(conn); tor_assert(p); @@ -92,7 +93,7 @@ set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p) #else /* !defined(HAVE_SYS_UN_H) */ static int -set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p) +set_unix_port(edge_connection_t *conn, hs_port_config_t *p) { (void) conn; (void) p; @@ -100,7 +101,7 @@ set_unix_port(edge_connection_t *conn, rend_service_port_config_t *p) } static int -add_unix_port(smartlist_t *ports, rend_service_port_config_t *p) +add_unix_port(smartlist_t *ports, hs_port_config_t *p) { (void) ports; (void) p; @@ -859,7 +860,7 @@ hs_get_subcredential(const ed25519_public_key_t *identity_pk, int hs_set_conn_addr_port(const smartlist_t *ports, edge_connection_t *conn) { - rend_service_port_config_t *chosen_port; + hs_port_config_t *chosen_port; unsigned int warn_once = 0; smartlist_t *matching_ports; @@ -867,7 +868,7 @@ hs_set_conn_addr_port(const smartlist_t *ports, edge_connection_t *conn) tor_assert(conn); matching_ports = smartlist_new(); - SMARTLIST_FOREACH_BEGIN(ports, rend_service_port_config_t *, p) { + SMARTLIST_FOREACH_BEGIN(ports, hs_port_config_t *, p) { if (TO_CONN(conn)->port != p->virtual_port) { continue; } @@ -912,6 +913,138 @@ hs_set_conn_addr_port(const smartlist_t *ports, edge_connection_t *conn) return (chosen_port) ? 0 : -1; } +/** Return a new hs_port_config_t with its path set to + * socket_path or empty if socket_path is NULL */ +static hs_port_config_t * +hs_port_config_new(const char *socket_path) +{ + if (!socket_path) + return tor_malloc_zero(sizeof(hs_port_config_t) + 1); + + const size_t pathlen = strlen(socket_path) + 1; + hs_port_config_t *conf = + tor_malloc_zero(sizeof(hs_port_config_t) + pathlen); + memcpy(conf->unix_addr, socket_path, pathlen); + conf->is_unix_addr = 1; + return conf; +} + +/** Parses a virtual-port to real-port/socket mapping separated by + * the provided separator and returns a new hs_port_config_t, + * or NULL and an optional error string on failure. + * + * The format is: VirtualPort SEP (IP|RealPort|IP:RealPort|'socket':path)? + * + * IP defaults to 127.0.0.1; RealPort defaults to VirtualPort. + */ +hs_port_config_t * +hs_parse_port_config(const char *string, const char *sep, + char **err_msg_out) +{ + smartlist_t *sl; + int virtport; + int realport = 0; + uint16_t p; + tor_addr_t addr; + hs_port_config_t *result = NULL; + unsigned int is_unix_addr = 0; + const char *socket_path = NULL; + char *err_msg = NULL; + char *addrport = NULL; + + sl = smartlist_new(); + smartlist_split_string(sl, string, sep, + SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2); + if (smartlist_len(sl) < 1 || BUG(smartlist_len(sl) > 2)) { + err_msg = tor_strdup("Bad syntax in hidden service port configuration."); + goto err; + } + virtport = (int)tor_parse_long(smartlist_get(sl,0), 10, 1, 65535, NULL,NULL); + if (!virtport) { + tor_asprintf(&err_msg, "Missing or invalid port %s in hidden service " + "port configuration", escaped(smartlist_get(sl,0))); + + goto err; + } + if (smartlist_len(sl) == 1) { + /* No addr:port part; use default. */ + realport = virtport; + tor_addr_from_ipv4h(&addr, 0x7F000001u); /* 127.0.0.1 */ + } else { + int ret; + + const char *addrport_element = smartlist_get(sl,1); + const char *rest = NULL; + int is_unix; + ret = port_cfg_line_extract_addrport(addrport_element, &addrport, + &is_unix, &rest); + + if (ret < 0) { + tor_asprintf(&err_msg, "Couldn't process address <%s> from hidden " + "service configuration", addrport_element); + goto err; + } + + if (rest && strlen(rest)) { + err_msg = tor_strdup("HiddenServicePort parse error: invalid port " + "mapping"); + goto err; + } + + if (is_unix) { + socket_path = addrport; + is_unix_addr = 1; + } else if (strchr(addrport, ':') || strchr(addrport, '.')) { + /* else try it as an IP:port pair if it has a : or . in it */ + if (tor_addr_port_lookup(addrport, &addr, &p)<0) { + err_msg = tor_strdup("Unparseable address in hidden service port " + "configuration."); + goto err; + } + realport = p?p:virtport; + } else { + /* No addr:port, no addr -- must be port. */ + realport = (int)tor_parse_long(addrport, 10, 1, 65535, NULL, NULL); + if (!realport) { + tor_asprintf(&err_msg, "Unparseable or out-of-range port %s in " + "hidden service port configuration.", + escaped(addrport)); + goto err; + } + tor_addr_from_ipv4h(&addr, 0x7F000001u); /* Default to 127.0.0.1 */ + } + } + + /* Allow room for unix_addr */ + result = hs_port_config_new(socket_path); + result->virtual_port = virtport; + result->is_unix_addr = is_unix_addr; + if (!is_unix_addr) { + result->real_port = realport; + tor_addr_copy(&result->real_addr, &addr); + result->unix_addr[0] = '\0'; + } + + err: + tor_free(addrport); + if (err_msg_out != NULL) { + *err_msg_out = err_msg; + } else { + tor_free(err_msg); + } + SMARTLIST_FOREACH(sl, char *, c, tor_free(c)); + smartlist_free(sl); + + return result; +} + +/** Release all storage held in a hs_port_config_t. */ +void +hs_port_config_free_(hs_port_config_t *p) +{ + tor_free(p); +} + /** Using a base32 representation of a service address, parse its content into * the key_out, checksum_out and version_out. Any out variable can be NULL in * case the caller would want only one field. checksum_out MUST at least be 2 @@ -1140,7 +1273,7 @@ hs_service_requires_uptime_circ(const smartlist_t *ports) { tor_assert(ports); - SMARTLIST_FOREACH_BEGIN(ports, rend_service_port_config_t *, p) { + SMARTLIST_FOREACH_BEGIN(ports, hs_port_config_t *, p) { if (smartlist_contains_int_as_string(get_options()->LongLivedPorts, p->virtual_port)) { return 1; diff --git a/src/feature/hs/hs_common.h b/src/feature/hs/hs_common.h index 4a9c7a9918..894b0e4844 100644 --- a/src/feature/hs/hs_common.h +++ b/src/feature/hs/hs_common.h @@ -150,7 +150,7 @@ typedef enum { /** Represents the mapping from a virtual port of a rendezvous service to a * real port on some IP. */ -typedef struct rend_service_port_config_t { +typedef struct hs_port_config_t { /** The incoming HS virtual port we're mapping */ uint16_t virtual_port; /** Is this an AF_UNIX port? */ @@ -161,7 +161,7 @@ typedef struct rend_service_port_config_t { tor_addr_t real_addr; /** The socket path to connect to, if is_unix_addr */ char unix_addr[FLEXIBLE_ARRAY_MEMBER]; -} rend_service_port_config_t; +} hs_port_config_t; void hs_init(void); void hs_free_all(void); @@ -260,6 +260,11 @@ void hs_purge_hid_serv_from_last_hid_serv_requests(const char *desc_id); void hs_purge_last_hid_serv_requests(void); int hs_set_conn_addr_port(const smartlist_t *ports, edge_connection_t *conn); +hs_port_config_t *hs_parse_port_config(const char *string, const char *sep, + char **err_msg_out); +void hs_port_config_free_(hs_port_config_t *p); +#define hs_port_config_free(p) \ + FREE_AND_NULL(hs_port_config_t, hs_port_config_free_, (p)) void hs_inc_rdv_stream_counter(origin_circuit_t *circ); void hs_dec_rdv_stream_counter(origin_circuit_t *circ); diff --git a/src/feature/hs/hs_config.c b/src/feature/hs/hs_config.c index 403ea151c4..b100acfcd4 100644 --- a/src/feature/hs/hs_config.c +++ b/src/feature/hs/hs_config.c @@ -487,8 +487,8 @@ config_generic_service(const hs_opts_t *hs_opts, portline; portline = portline->next) { char *err_msg = NULL; /* XXX: Can we rename this? */ - rend_service_port_config_t *portcfg = - rend_service_parse_port_config(portline->value, " ", &err_msg); + hs_port_config_t *portcfg = + hs_parse_port_config(portline->value, " ", &err_msg); if (!portcfg) { if (err_msg) { log_warn(LD_CONFIG, "%s", err_msg); diff --git a/src/feature/hs/hs_metrics.c b/src/feature/hs/hs_metrics.c index 67cae8ec0e..9688859d66 100644 --- a/src/feature/hs/hs_metrics.c +++ b/src/feature/hs/hs_metrics.c @@ -64,7 +64,7 @@ init_store(hs_service_t *service) format_label("onion", service->onion_address)); if (base_metrics[i].port_as_label && service->config.ports) { SMARTLIST_FOREACH_BEGIN(service->config.ports, - const rend_service_port_config_t *, p) { + const hs_port_config_t *, p) { metrics_store_entry_add_label(entry, format_label("port", port_to_str(p->virtual_port))); } SMARTLIST_FOREACH_END(p); diff --git a/src/feature/hs/hs_service.c b/src/feature/hs/hs_service.c index f0c493d91d..b33013ba1f 100644 --- a/src/feature/hs/hs_service.c +++ b/src/feature/hs/hs_service.c @@ -264,8 +264,8 @@ service_clear_config(hs_service_config_t *config) } tor_free(config->directory_path); if (config->ports) { - SMARTLIST_FOREACH(config->ports, rend_service_port_config_t *, p, - rend_service_port_config_free(p);); + SMARTLIST_FOREACH(config->ports, hs_port_config_t *, p, + hs_port_config_free(p);); smartlist_free(config->ports); } if (config->clients) { diff --git a/src/feature/hs/hs_service.h b/src/feature/hs/hs_service.h index 6a39dee037..54d646d3e4 100644 --- a/src/feature/hs/hs_service.h +++ b/src/feature/hs/hs_service.h @@ -210,7 +210,7 @@ typedef struct hs_service_config_t { /** Have we explicitly set HiddenServiceVersion? */ unsigned int hs_version_explicitly_set : 1; - /** List of rend_service_port_config_t */ + /** List of hs_port_config_t */ smartlist_t *ports; /** Path on the filesystem where the service persistent data is stored. NULL diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index 2be68eadbe..a744f6f93a 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -237,8 +237,8 @@ rend_service_free_(rend_service_t *service) tor_free(service->directory); if (service->ports) { - SMARTLIST_FOREACH(service->ports, rend_service_port_config_t*, p, - rend_service_port_config_free(p)); + SMARTLIST_FOREACH(service->ports, hs_port_config_t*, p, + hs_port_config_free(p)); smartlist_free(service->ports); } if (service->private_key) @@ -355,7 +355,7 @@ static int rend_add_service(smartlist_t *service_list, rend_service_t *service) { int i; - rend_service_port_config_t *p; + hs_port_config_t *p; tor_assert(service); @@ -408,138 +408,6 @@ rend_add_service(smartlist_t *service_list, rend_service_t *service) return 0; } -/** Return a new rend_service_port_config_t with its path set to - * socket_path or empty if socket_path is NULL */ -static rend_service_port_config_t * -rend_service_port_config_new(const char *socket_path) -{ - if (!socket_path) - return tor_malloc_zero(sizeof(rend_service_port_config_t) + 1); - - const size_t pathlen = strlen(socket_path) + 1; - rend_service_port_config_t *conf = - tor_malloc_zero(sizeof(rend_service_port_config_t) + pathlen); - memcpy(conf->unix_addr, socket_path, pathlen); - conf->is_unix_addr = 1; - return conf; -} - -/** Parses a virtual-port to real-port/socket mapping separated by - * the provided separator and returns a new rend_service_port_config_t, - * or NULL and an optional error string on failure. - * - * The format is: VirtualPort SEP (IP|RealPort|IP:RealPort|'socket':path)? - * - * IP defaults to 127.0.0.1; RealPort defaults to VirtualPort. - */ -rend_service_port_config_t * -rend_service_parse_port_config(const char *string, const char *sep, - char **err_msg_out) -{ - smartlist_t *sl; - int virtport; - int realport = 0; - uint16_t p; - tor_addr_t addr; - rend_service_port_config_t *result = NULL; - unsigned int is_unix_addr = 0; - const char *socket_path = NULL; - char *err_msg = NULL; - char *addrport = NULL; - - sl = smartlist_new(); - smartlist_split_string(sl, string, sep, - SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 2); - if (smartlist_len(sl) < 1 || BUG(smartlist_len(sl) > 2)) { - err_msg = tor_strdup("Bad syntax in hidden service port configuration."); - goto err; - } - virtport = (int)tor_parse_long(smartlist_get(sl,0), 10, 1, 65535, NULL,NULL); - if (!virtport) { - tor_asprintf(&err_msg, "Missing or invalid port %s in hidden service " - "port configuration", escaped(smartlist_get(sl,0))); - - goto err; - } - if (smartlist_len(sl) == 1) { - /* No addr:port part; use default. */ - realport = virtport; - tor_addr_from_ipv4h(&addr, 0x7F000001u); /* 127.0.0.1 */ - } else { - int ret; - - const char *addrport_element = smartlist_get(sl,1); - const char *rest = NULL; - int is_unix; - ret = port_cfg_line_extract_addrport(addrport_element, &addrport, - &is_unix, &rest); - - if (ret < 0) { - tor_asprintf(&err_msg, "Couldn't process address <%s> from hidden " - "service configuration", addrport_element); - goto err; - } - - if (rest && strlen(rest)) { - err_msg = tor_strdup("HiddenServicePort parse error: invalid port " - "mapping"); - goto err; - } - - if (is_unix) { - socket_path = addrport; - is_unix_addr = 1; - } else if (strchr(addrport, ':') || strchr(addrport, '.')) { - /* else try it as an IP:port pair if it has a : or . in it */ - if (tor_addr_port_lookup(addrport, &addr, &p)<0) { - err_msg = tor_strdup("Unparseable address in hidden service port " - "configuration."); - goto err; - } - realport = p?p:virtport; - } else { - /* No addr:port, no addr -- must be port. */ - realport = (int)tor_parse_long(addrport, 10, 1, 65535, NULL, NULL); - if (!realport) { - tor_asprintf(&err_msg, "Unparseable or out-of-range port %s in " - "hidden service port configuration.", - escaped(addrport)); - goto err; - } - tor_addr_from_ipv4h(&addr, 0x7F000001u); /* Default to 127.0.0.1 */ - } - } - - /* Allow room for unix_addr */ - result = rend_service_port_config_new(socket_path); - result->virtual_port = virtport; - result->is_unix_addr = is_unix_addr; - if (!is_unix_addr) { - result->real_port = realport; - tor_addr_copy(&result->real_addr, &addr); - result->unix_addr[0] = '\0'; - } - - err: - tor_free(addrport); - if (err_msg_out != NULL) { - *err_msg_out = err_msg; - } else { - tor_free(err_msg); - } - SMARTLIST_FOREACH(sl, char *, c, tor_free(c)); - smartlist_free(sl); - - return result; -} - -/** Release all storage held in a rend_service_port_config_t. */ -void -rend_service_port_config_free_(rend_service_port_config_t *p) -{ - tor_free(p); -} - /* Copy relevant data from service src to dst while pruning the service lists. * This should only be called during the pruning process which takes existing * services and copy their data to the newly configured services. The src diff --git a/src/feature/rend/rendservice.h b/src/feature/rend/rendservice.h index 012afc0f9f..cd44787ce2 100644 --- a/src/feature/rend/rendservice.h +++ b/src/feature/rend/rendservice.h @@ -71,7 +71,7 @@ typedef struct rend_service_t { * this service is ephemeral. */ int dir_group_readable; /**< if 1, allow group read permissions on directory */ - smartlist_t *ports; /**< List of rend_service_port_config_t */ + smartlist_t *ports; /**< List of hs_port_config_t */ rend_auth_type_t auth_type; /**< Client authorization type or 0 if no client * authorization is performed. */ smartlist_t *clients; /**< List of rend_authorized_client_t's of @@ -189,14 +189,6 @@ void rend_service_dump_stats(int severity); void rend_service_free_all(void); void rend_service_init(void); -rend_service_port_config_t *rend_service_parse_port_config(const char *string, - const char *sep, - char **err_msg_out); -void rend_service_port_config_free_(rend_service_port_config_t *p); -#define rend_service_port_config_free(p) \ - FREE_AND_NULL(rend_service_port_config_t, rend_service_port_config_free_, \ - (p)) - void rend_authorized_client_free_(rend_authorized_client_t *client); #define rend_authorized_client_free(client) \ FREE_AND_NULL(rend_authorized_client_t, rend_authorized_client_free_, \ diff --git a/src/test/test_controller.c b/src/test/test_controller.c index 49efeb5f88..0745651aca 100644 --- a/src/test/test_controller.c +++ b/src/test/test_controller.c @@ -460,50 +460,50 @@ test_getinfo_helper_onion(void *arg) } static void -test_rend_service_parse_port_config(void *arg) +test_hs_parse_port_config(void *arg) { const char *sep = ","; - rend_service_port_config_t *cfg = NULL; + hs_port_config_t *cfg = NULL; char *err_msg = NULL; (void)arg; /* Test "VIRTPORT" only. */ - cfg = rend_service_parse_port_config("80", sep, &err_msg); + cfg = hs_parse_port_config("80", sep, &err_msg); tt_assert(cfg); tt_ptr_op(err_msg, OP_EQ, NULL); /* Test "VIRTPORT,TARGET" (Target is port). */ - rend_service_port_config_free(cfg); - cfg = rend_service_parse_port_config("80,8080", sep, &err_msg); + hs_port_config_free(cfg); + cfg = hs_parse_port_config("80,8080", sep, &err_msg); tt_assert(cfg); tt_ptr_op(err_msg, OP_EQ, NULL); /* Test "VIRTPORT,TARGET" (Target is IPv4:port). */ - rend_service_port_config_free(cfg); - cfg = rend_service_parse_port_config("80,192.0.2.1:8080", sep, &err_msg); + hs_port_config_free(cfg); + cfg = hs_parse_port_config("80,192.0.2.1:8080", sep, &err_msg); tt_assert(cfg); tt_ptr_op(err_msg, OP_EQ, NULL); /* Test "VIRTPORT,TARGET" (Target is IPv6:port). */ - rend_service_port_config_free(cfg); - cfg = rend_service_parse_port_config("80,[2001:db8::1]:8080", sep, &err_msg); + hs_port_config_free(cfg); + cfg = hs_parse_port_config("80,[2001:db8::1]:8080", sep, &err_msg); tt_assert(cfg); tt_ptr_op(err_msg, OP_EQ, NULL); - rend_service_port_config_free(cfg); + hs_port_config_free(cfg); cfg = NULL; /* XXX: Someone should add tests for AF_UNIX targets if supported. */ /* Test empty config. */ - rend_service_port_config_free(cfg); - cfg = rend_service_parse_port_config("", sep, &err_msg); + hs_port_config_free(cfg); + cfg = hs_parse_port_config("", sep, &err_msg); tt_ptr_op(cfg, OP_EQ, NULL); tt_assert(err_msg); /* Test invalid port. */ tor_free(err_msg); - cfg = rend_service_parse_port_config("90001", sep, &err_msg); + cfg = hs_parse_port_config("90001", sep, &err_msg); tt_ptr_op(cfg, OP_EQ, NULL); tt_assert(err_msg); tor_free(err_msg); @@ -513,24 +513,24 @@ test_rend_service_parse_port_config(void *arg) /* quoted unix port */ tor_free(err_msg); - cfg = rend_service_parse_port_config("100 unix:\"/tmp/foo bar\"", + cfg = hs_parse_port_config("100 unix:\"/tmp/foo bar\"", " ", &err_msg); tt_assert(cfg); tt_ptr_op(err_msg, OP_EQ, NULL); - rend_service_port_config_free(cfg); + hs_port_config_free(cfg); cfg = NULL; /* quoted unix port */ tor_free(err_msg); - cfg = rend_service_parse_port_config("100 unix:\"/tmp/foo bar\"", + cfg = hs_parse_port_config("100 unix:\"/tmp/foo bar\"", " ", &err_msg); tt_assert(cfg); tt_ptr_op(err_msg, OP_EQ, NULL); - rend_service_port_config_free(cfg); + hs_port_config_free(cfg); cfg = NULL; /* quoted unix port, missing end quote */ - cfg = rend_service_parse_port_config("100 unix:\"/tmp/foo bar", + cfg = hs_parse_port_config("100 unix:\"/tmp/foo bar", " ", &err_msg); tt_ptr_op(cfg, OP_EQ, NULL); tt_str_op(err_msg, OP_EQ, "Couldn't process address <unix:\"/tmp/foo bar> " @@ -539,7 +539,7 @@ test_rend_service_parse_port_config(void *arg) /* bogus IP address */ MOCK(tor_addr_lookup, mock_tor_addr_lookup__fail_on_bad_addrs); - cfg = rend_service_parse_port_config("100 foo!!.example.com:9000", + cfg = hs_parse_port_config("100 foo!!.example.com:9000", " ", &err_msg); UNMOCK(tor_addr_lookup); tt_ptr_op(cfg, OP_EQ, NULL); @@ -548,7 +548,7 @@ test_rend_service_parse_port_config(void *arg) tor_free(err_msg); /* bogus port port */ - cfg = rend_service_parse_port_config("100 99999", + cfg = hs_parse_port_config("100 99999", " ", &err_msg); tt_ptr_op(cfg, OP_EQ, NULL); tt_str_op(err_msg, OP_EQ, "Unparseable or out-of-range port \"99999\" " @@ -556,14 +556,14 @@ test_rend_service_parse_port_config(void *arg) tor_free(err_msg); /* Wrong target address and port separation */ - cfg = rend_service_parse_port_config("80,127.0.0.1 1234", sep, + cfg = hs_parse_port_config("80,127.0.0.1 1234", sep, &err_msg); tt_ptr_op(cfg, OP_EQ, NULL); tt_assert(err_msg); tor_free(err_msg); done: - rend_service_port_config_free(cfg); + hs_port_config_free(cfg); tor_free(err_msg); } @@ -2214,7 +2214,7 @@ struct testcase_t controller_tests[] = { { "add_onion_helper_keyarg_v3", test_add_onion_helper_keyarg_v3, 0, NULL, NULL }, { "getinfo_helper_onion", test_getinfo_helper_onion, 0, NULL, NULL }, - { "rend_service_parse_port_config", test_rend_service_parse_port_config, 0, + { "hs_parse_port_config", test_hs_parse_port_config, 0, NULL, NULL }, { "add_onion_helper_clientauth", test_add_onion_helper_clientauth, 0, NULL, NULL }, diff --git a/src/test/test_hs.c b/src/test/test_hs.c index 46b4493a3d..42e663330a 100644 --- a/src/test/test_hs.c +++ b/src/test/test_hs.c @@ -646,14 +646,12 @@ test_single_onion_poisoning(void *arg) /* Add port to service 1 */ service_1->ports = smartlist_new(); service_2->ports = smartlist_new(); - rend_service_port_config_t *port1 = rend_service_parse_port_config("80", " ", - &err_msg); + hs_port_config_t *port1 = hs_parse_port_config("80", " ", &err_msg); tt_assert(port1); tt_ptr_op(err_msg, OP_EQ, NULL); smartlist_add(service_1->ports, port1); - rend_service_port_config_t *port2 = rend_service_parse_port_config("90", " ", - &err_msg); + hs_port_config_t *port2 = hs_parse_port_config("90", " ", &err_msg); /* Add port to service 2 */ tt_assert(port2); tt_ptr_op(err_msg, OP_EQ, NULL);

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit 36877312337b44d34ff7b1649cadc84aceb4df26 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:46:27 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- cs.po | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/cs.po b/cs.po index f98d5c3da2..a6690d26de 100644 --- a/cs.po +++ b/cs.po @@ -8,6 +8,7 @@ # David Nowak <user412(a)secmail.pro>, 2020 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 # Fourdee Foureight, 2020 +# Jan Pechacek <jan386(a)gmail.com>, 2021 # Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 # trendspotter, 2019 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-02-19 20:33+0000\n" +"Last-Translator: Jan Pechacek <jan386(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit 0c7fe16a46a28fa2150c38cc40e4763d859ecd99 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:45:48 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc --- cs.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/cs.po b/cs.po index 6c72b74485..9787b09f87 100644 --- a/cs.po +++ b/cs.po @@ -7,7 +7,8 @@ # Adam Slovacek <adamslovacek(a)gmail.com>, 2013 # David Nowak <user412(a)secmail.pro>, 2020 # Filip Hruska <fhr(a)fhrnet.eu>, 2014 -# Fourdee Foureight <x4D48(a)protonmail.ch>, 2020 +# Fourdee Foureight, 2020 +# Jan Pechacek <jan386(a)gmail.com>, 2021 # Pivoj, 2015 # Jiří Vírava <appukonrad(a)gmail.com>, 2013-2014 # trendspotter, 2019 @@ -25,8 +26,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" -"PO-Revision-Date: 2021-01-05 12:15+0000\n" -"Last-Translator: Transifex Bot <>\n" +"PO-Revision-Date: 2021-02-19 20:33+0000\n" +"Last-Translator: Jan Pechacek <jan386(a)gmail.com>\n" "Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -241,7 +242,7 @@ msgid "" "It is not possible to automatically upgrade your device to this new version: {explanation}.\n" "\n" "To learn how to do a manual upgrade, go to {manual_upgrade_url}" -msgstr "" +msgstr "Měli byste provést ruční aktualizaci na {name}{version}.\n\nVíce informací o této nové verzi naleznete na {details_url}\n\nNení možné automaticky aktualizovat vaše zařízení na tuto novou verzi: {explanation}.\n\nChcete-li zjistit, jak provést ruční aktualizaci, podívejte se na {manual_upgrade_url}" #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:471 msgid "New version available" @@ -302,7 +303,7 @@ msgid "" "The network connection will be disabled when applying the upgrade.\n" "\n" "Please save your work and close all other applications." -msgstr "" +msgstr "Aktualizace byla úspěšně stažena.\n\nSíťové připojení bude během provádění aktualizace vypnuto.\n\nUložte prosím svou práci a ukončete všechny ostatní aplikace." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:700 msgid "Upgrade successfully downloaded" @@ -367,7 +368,7 @@ msgid "" "Your Tails device is being upgraded...\n" "\n" "For security reasons, the network connection is now disabled." -msgstr "" +msgstr "Vaše zařízení Tails se právě aktualizuje...\n\nZ důvodu bezpečnosti je nyní síťové připojení vypnuto." #: config/chroot_local-includes/usr/src/iuk/lib/Tails/IUK/Frontend.pm:796 msgid "" @@ -537,7 +538,7 @@ msgstr "Zapsáno na zařízení rychlostí %(speed)d MB/s" msgid "" "There was a problem executing the following command: `%(command)s`.\n" "A more detailed error log has been written to \"%(filename)s\"." -msgstr "" +msgstr "Vyskytl se problém při provádění následujícího příkazu: `%(command)s`.\nPodrobnější záznam o chybě byl zapsán do \"%(filename)s\"." #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:424 #, python-format @@ -608,17 +609,17 @@ msgstr "Nenalezeny žádné body připojení" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:661 #, python-format msgid "Entering unmount_device for \"%(device)s\"" -msgstr "" +msgstr "Provádím unmount_device pro \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:670 #, python-format msgid "Unmounting mounted filesystems on \"%(device)s\"" -msgstr "" +msgstr "Odpojuji připojené systémy souborů na \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:674 #, python-format msgid "Unmounting \"%(udi)s\" on \"%(device)s\"" -msgstr "" +msgstr "Odpojuji \"%(udi)s\" na \"%(device)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/creator.py:685 #, python-format @@ -788,7 +789,7 @@ msgstr "Zařízení \"%(pretty_name)s\" je moc malé pro instalaci Tails (je vy msgid "" "To upgrade device \"%(pretty_name)s\" from this Tails, you need to use a downloaded Tails ISO image:\n" "%(dl_url)s" -msgstr "" +msgstr "Pro aktualizaci zařízení \"%(pretty_name)s\" z této verze Tails budete muset použít stažený ISO obraz Tails:\n%(dl_url)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/gui.py:513 msgid "An error happened while installing Tails" @@ -869,17 +870,17 @@ msgstr "Nastal problém při spouštění '%(cmd)s'.\n%(out)s\n%(err)s" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:64 #, python-format msgid "\"%s\" does not exist" -msgstr "" +msgstr "\"%s\" neexistuje" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:66 #, python-format msgid "\"%s\" is not a directory" -msgstr "" +msgstr "\"%s\" není adresář" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/source.py:77 #, python-format msgid "Skipping \"%(filename)s\"" -msgstr "" +msgstr "Přeskakuji \"%(filename)s\"" #: config/chroot_local-includes/usr/lib/python3/dist-packages/tails_installer/utils.py:54 #, python-format @@ -1592,7 +1593,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See {manual_upgrade_url}" -msgstr "" +msgstr "Není dostupný dostatek paměti pro kontrolu aktualizací.\n\nUjistěte se, že tento systém splňuje podmínky pro běh Tails.\nViz file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nZkuste restartovat Tails a znovu zkontrolovat aktualizace.\n\nNebo proveďte ruční aktualizaci.\nViz {manual_upgrade_url}" #: config/chroot_local-includes/usr/local/bin/tails-upgrade-frontend-wrapper:76 #: config/chroot_local-includes/usr/local/sbin/unsafe-browser:27 @@ -1617,7 +1618,7 @@ msgstr "Hostitelský operační systém i virtualizační software mohou monitor #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:40 msgid "Don't Show Again" -msgstr "" +msgstr "Příště nezobrazovat" #: config/chroot_local-includes/usr/local/lib/tails-virt-notify-user:42 msgid "Learn More"

1 0

[translation/https_everywhere] https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit df33d1e7eb2fdb145b7e7c2e3f7449ee7b4b936b Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 20:45:21 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=https_everywhere --- cs/https-everywhere.dtd | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cs/https-everywhere.dtd b/cs/https-everywhere.dtd index c092e0ecb6..3782dcc11f 100644 --- a/cs/https-everywhere.dtd +++ b/cs/https-everywhere.dtd @@ -49,8 +49,8 @@ <!ENTITY https-everywhere.cancel.he_blocking_network "síťový degradační útok"> <!ENTITY https-everywhere.cancel.copy_url "Zkopírovat URL"> <!ENTITY https-everywhere.cancel.copied_url "Zkopírováno do schránky"> -<!ENTITY https-everywhere.cancel.open_page "Disable on this site"> -<!ENTITY https-everywhere.cancel.http_once "Proceed anyway (unsafe)"> +<!ENTITY https-everywhere.cancel.open_page "Vypnout na této stránce"> +<!ENTITY https-everywhere.cancel.http_once "Přesto pokračovat (nebezpečné)"> <!ENTITY https-everywhere.onboarding.intro "Šifrujte! Používejte automaticky zabezpečené HTTPS na mnoha stránkách."> <!ENTITY https-everywhere.onboarding.header "HTTPS Everywhere byl aktualizován!"> @@ -63,8 +63,8 @@ <!ENTITY https-everywhere.chrome.stable_rules_description "Vynutit šifrovaná spojení pro tyto stránky:"> <!ENTITY https-everywhere.chrome.experimental_rules "Experimentální pravidla"> <!ENTITY https-everywhere.chrome.experimental_rules_description "Může způsobit upozornění nebo chyby. Zakázáno ve výchozím nastavení."> -<!ENTITY https-everywhere.chrome.disable_on_this_site "Disable on this site"> -<!ENTITY https-everywhere.chrome.enable_on_this_site "Enable on this site"> +<!ENTITY https-everywhere.chrome.disable_on_this_site "Vypnout na této stránce"> +<!ENTITY https-everywhere.chrome.enable_on_this_site "Zapnout na této stránce"> <!ENTITY https-everywhere.chrome.add_rule "Přidat pravidlo pro tuto stránku"> <!ENTITY https-everywhere.chrome.add_new_rule "Přidat nové pravidlo pro tuto stránku"> <!ENTITY https-everywhere.chrome.always_https_for_host "Pro tento server vždy používat https">

1 0

[translation/tails-misc_release] https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release
by translation＠torproject.org 19 Feb '21

19 Feb '21

commit adebde9fc79b4fd839827715c8d0305c719e7772 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Feb 19 19:16:36 2021 +0000 https://gitweb.torproject.org/translation.git/commit/?h=tails-misc_release --- hu.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hu.po b/hu.po index 6102e47858..bff2e4c506 100644 --- a/hu.po +++ b/hu.po @@ -9,7 +9,7 @@ # Blackywantscookies, 2014 # Blackywantscookies, 2014 # 774f2855e7016a193f9916f715f8a14e_4f42736 <c37fb76cde6546c7b7a80bc0899da2f7_124500>, 2013 -# Kovacs Zeteny <vvv.big.ed(a)protonmail.com>, 2021 +# 2bf2a1b19224666a9fd46a721e1498fd_cf6ff7b <06435adb4e599f62423b0c8619c8eba7_967332>, 2021 # Lajos Pasztor <mrlajos(a)gmail.com>, 2014 # Robert Zsolt <physx_ms(a)outlook.com>, 2016 # vargaviktor <viktor.varga(a)gmail.com>, 2013,2015,2018-2020 @@ -19,7 +19,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2021-01-05 11:44+0100\n" "PO-Revision-Date: 2021-02-15 22:55+0000\n" -"Last-Translator: Kovacs Zeteny <vvv.big.ed(a)protonmail.com>\n" +"Last-Translator: 2bf2a1b19224666a9fd46a721e1498fd_cf6ff7b <06435adb4e599f62423b0c8619c8eba7_967332>\n" "Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[tor-browser-build/maint-10.0-desktop] Bug 40239: Don't download mar tools from old versions
by sysrqb＠torproject.org 19 Feb '21

19 Feb '21

commit 35227374db93e0b7d1e5a1f09afd1db4289e7c00 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 19 17:04:43 2021 +0100 Bug 40239: Don't download mar tools from old versions Before generating incremental mar files, we download mar files and mar-tools-linux64.zip from the previous version. However we use mar-tools from the new version and don't use the one from the old version, so there is no need to download it. --- tools/update-responses/update_responses | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index de24235..237a2be 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -565,21 +565,6 @@ sub download_version { my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-signed-build.txt"; - my $martools = 'mar-tools-linux64.zip'; - exit_error "Error downloading $urldir/$martools\n" - unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; - exit_error "Error downloading $urldir/$martools.asc\n" - unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; - if (system('gpg', '--no-default-keyring', '--keyring', - "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/$martools.asc", "$tmpdir/$martools")) { - exit_error "Error checking gpg signature for $version/$martools"; - } - exit_error "Wrong checksum for $version/$martools" - unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); - move "$tmpdir/$martools", "$destdir/$martools"; - move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n"

1 0

[tor-browser-build/master] Bug 40239: Don't download mar tools from old versions
by sysrqb＠torproject.org 19 Feb '21

19 Feb '21

commit e979fe32266998a508821669a613f6101875bd51 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Fri Feb 19 17:04:43 2021 +0100 Bug 40239: Don't download mar tools from old versions Before generating incremental mar files, we download mar files and mar-tools-linux64.zip from the previous version. However we use mar-tools from the new version and don't use the one from the old version, so there is no need to download it. --- tools/update-responses/update_responses | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/tools/update-responses/update_responses b/tools/update-responses/update_responses index 35b971f..e897563 100755 --- a/tools/update-responses/update_responses +++ b/tools/update-responses/update_responses @@ -565,21 +565,6 @@ sub download_version { my %sums = map { chomp; reverse split ' ', $_ } read_file "$destdir/sha256sums-signed-build.txt"; - my $martools = 'mar-tools-linux64.zip'; - exit_error "Error downloading $urldir/$martools\n" - unless getstore("$urldir/$martools", "$tmpdir/$martools") == 200; - exit_error "Error downloading $urldir/$martools.asc\n" - unless getstore("$urldir/$martools.asc", "$tmpdir/$martools.asc") == 200; - if (system('gpg', '--no-default-keyring', '--keyring', - "$FindBin::Bin/$config->{download}{gpg_keyring}", '--verify', - "$tmpdir/$martools.asc", "$tmpdir/$martools")) { - exit_error "Error checking gpg signature for $version/$martools"; - } - exit_error "Wrong checksum for $version/$martools" - unless $sums{$martools} eq sha256_hex(read_file("$tmpdir/$martools")); - move "$tmpdir/$martools", "$destdir/$martools"; - move "$tmpdir/$martools.asc", "$destdir/$martools.asc"; - foreach my $file (sort grep { $_ =~ m/\.mar$/ } keys %sums) { print "Downloading $file\n"; exit_error "Error downloading $urldir/$file\n"

1 0

[sbws/master] fix: resultdump: Log if relay was measured as exit
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit beaf6de889bc75d53a6b0b90d12ab85aa0db56a0 Author: juga0 <juga(a)riseup.net> Date: Wed Feb 3 13:15:45 2021 +0000 fix: resultdump: Log if relay was measured as exit or entry. Closes #40048 --- sbws/lib/resultdump.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sbws/lib/resultdump.py b/sbws/lib/resultdump.py index 542837e..6673e9a 100644 --- a/sbws/lib/resultdump.py +++ b/sbws/lib/resultdump.py @@ -792,6 +792,10 @@ class ResultDump: "destination {}: {}".format( result.fingerprint, result.nickname, result.circ, result.dest_url, result.msg) + # The result doesn't store the exit policies, so it can't be logged + # whether it was an exit. + as_exit = result.circ[1] == result.fingerprint + msg += ". As exit." if as_exit else ". As entry." # When the error is that there are not more functional destinations. if result.type == "error-destination": log.info("Shutting down because there are not functional "

1 0

[sbws/master] Merge branch 'maint-1.1'
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit 749540147d79cec2aff487fd2a736c2e38f6d1e3 Merge: c8d1cc4 e375cd2 Author: juga0 <juga(a)riseup.net> Date: Fri Feb 19 17:51:43 2021 +0000 Merge branch 'maint-1.1' .gitignore | 1 + AUTHORS.md | 3 +- README.md | 3 +- docs/source/conf.py | 2 +- docs/source/config.rst | 4 +- docs/source/config_tor.rst | 14 ++- docs/source/how_works.rst | 3 +- .../images/20210111_consensushealth_bwauths.png | Bin 0 -> 100029 bytes docs/source/man_sbws.ini.rst | 47 ++++--- docs/source/monitoring_bandwidth.rst | 2 +- docs/source/torflow_aggr.rst | 2 +- sbws/config.default.ini | 14 ++- sbws/core/cleanup.py | 25 ---- sbws/core/generate.py | 9 +- sbws/core/scanner.py | 32 +++-- sbws/globals.py | 23 ++-- sbws/lib/circuitbuilder.py | 78 ++---------- sbws/lib/relaylist.py | 32 ++--- sbws/lib/relayprioritizer.py | 1 + sbws/lib/resultdump.py | 7 +- sbws/lib/v3bwfile.py | 12 +- sbws/util/config.py | 4 +- sbws/util/stem.py | 107 ++++++++++------ tests/integration/chutney_data/bwscanner | 15 +++ .../integration/chutney_data/client_bwscanner.tmpl | 23 ++++ tests/integration/chutney_data/non-exit.tmpl | 4 + tests/integration/chutney_data/relay-MAB.tmpl | 4 + tests/integration/chutney_data/relay-MBR.tmpl | 4 + tests/integration/conftest.py | 14 +-- tests/integration/core/test_scanner.py | 2 + tests/integration/lib/test_circuitbuilder.py | 20 +-- tests/integration/lib/test_destination.py | 6 +- tests/integration/lib/test_relaylist.py | 16 +-- tests/integration/lib/test_relayprioritizer.py | 30 ++--- tests/integration/net/auth1/fingerprint | 1 - .../net/auth1/keys/authority_certificate | 45 ------- .../net/auth1/keys/authority_identity_key | 41 ------- .../net/auth1/keys/authority_signing_key | 27 ---- .../net/auth1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth1/keys/secret_id_key | 15 --- tests/integration/net/auth1/keys/secret_onion_key | 15 --- .../net/auth1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth1/torrc | 33 ----- tests/integration/net/auth2/fingerprint | 1 - .../net/auth2/keys/authority_certificate | 45 ------- .../net/auth2/keys/authority_identity_key | 41 ------- .../net/auth2/keys/authority_signing_key | 27 ---- .../net/auth2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth2/keys/secret_id_key | 15 --- tests/integration/net/auth2/keys/secret_onion_key | 15 --- .../net/auth2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth2/torrc | 33 ----- tests/integration/net/auth3/fingerprint | 1 - .../net/auth3/keys/authority_certificate | 45 ------- .../net/auth3/keys/authority_identity_key | 41 ------- .../net/auth3/keys/authority_signing_key | 27 ---- .../net/auth3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/auth3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/auth3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/auth3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/auth3/keys/secret_id_key | 15 --- tests/integration/net/auth3/keys/secret_onion_key | 15 --- .../net/auth3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/auth3/torrc | 33 ----- tests/integration/net/exit1/fingerprint | 1 - .../net/exit1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit1/keys/secret_id_key | 15 --- tests/integration/net/exit1/keys/secret_onion_key | 15 --- .../net/exit1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit1/torrc | 26 ---- tests/integration/net/exit2/fingerprint | 1 - .../net/exit2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit2/keys/secret_id_key | 15 --- tests/integration/net/exit2/keys/secret_onion_key | 15 --- .../net/exit2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit2/torrc | 26 ---- tests/integration/net/exit3/fingerprint | 1 - .../net/exit3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/exit3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/exit3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/exit3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/exit3/keys/secret_id_key | 15 --- tests/integration/net/exit3/keys/secret_onion_key | 15 --- .../net/exit3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/exit3/torrc | 26 ---- tests/integration/net/relay1/fingerprint | 1 - .../net/relay1/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay1/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay1/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay1/keys/secret_id_key | 15 --- tests/integration/net/relay1/keys/secret_onion_key | 15 --- .../net/relay1/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1/torrc | 23 ---- tests/integration/net/relay1mbyteMAB/fingerprint | 1 - .../keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteMAB/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../relay1mbyteMAB/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteMAB/keys/secret_id_key | 15 --- .../net/relay1mbyteMAB/keys/secret_onion_key | 15 --- .../net/relay1mbyteMAB/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1mbyteMAB/torrc | 25 ---- tests/integration/net/relay1mbyteRBR/fingerprint | 1 - .../keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteRBR/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../relay1mbyteRBR/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes .../net/relay1mbyteRBR/keys/secret_id_key | 15 --- .../net/relay1mbyteRBR/keys/secret_onion_key | 15 --- .../net/relay1mbyteRBR/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay1mbyteRBR/torrc | 25 ---- tests/integration/net/relay2/fingerprint | 1 - .../net/relay2/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay2/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay2/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay2/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay2/keys/secret_id_key | 15 --- tests/integration/net/relay2/keys/secret_onion_key | 15 --- .../net/relay2/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay2/torrc | 23 ---- tests/integration/net/relay3/fingerprint | 1 - .../net/relay3/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay3/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay3/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay3/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay3/keys/secret_id_key | 15 --- tests/integration/net/relay3/keys/secret_onion_key | 15 --- .../net/relay3/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay3/torrc | 23 ---- tests/integration/net/relay4/fingerprint | 1 - .../net/relay4/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay4/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay4/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay4/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay4/keys/secret_id_key | 15 --- tests/integration/net/relay4/keys/secret_onion_key | 15 --- .../net/relay4/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay4/torrc | 23 ---- tests/integration/net/relay5/fingerprint | 1 - .../net/relay5/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay5/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay5/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay5/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay5/keys/secret_id_key | 15 --- tests/integration/net/relay5/keys/secret_onion_key | 15 --- .../net/relay5/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay5/torrc | 23 ---- tests/integration/net/relay6/fingerprint | 1 - .../net/relay6/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay6/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay6/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay6/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay6/keys/secret_id_key | 15 --- tests/integration/net/relay6/keys/secret_onion_key | 15 --- .../net/relay6/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay6/torrc | 23 ---- tests/integration/net/relay7/fingerprint | 1 - .../net/relay7/keys/ed25519_master_id_public_key | Bin 64 -> 0 bytes .../net/relay7/keys/ed25519_master_id_secret_key | Bin 96 -> 0 bytes .../net/relay7/keys/ed25519_signing_cert | Bin 172 -> 0 bytes .../net/relay7/keys/ed25519_signing_secret_key | Bin 96 -> 0 bytes tests/integration/net/relay7/keys/secret_id_key | 15 --- tests/integration/net/relay7/keys/secret_onion_key | 15 --- .../net/relay7/keys/secret_onion_key_ntor | Bin 96 -> 0 bytes tests/integration/net/relay7/torrc | 23 ---- tests/integration/net/start.sh | 15 --- tests/integration/net/stop.sh | 4 - tests/integration/net/wait.py | 136 --------------------- tests/integration/run.sh | 14 +++ tests/integration/sbws_testnet.ini | 7 +- tests/integration/start_chutney.sh | 26 ++++ tests/integration/stop_chutney.sh | 10 ++ tests/integration/test_files.py | 7 +- tests/unit/lib/test_heartbeat.py | 2 + tests/unit/lib/test_relaylist.py | 8 +- tests/unit/lib/test_v3bwfile.py | 2 + tox.ini | 22 +--- 190 files changed, 361 insertions(+), 1647 deletions(-)

1 0

[sbws/master] chg: stem: Set default torrc options
by juga＠torproject.org 19 Feb '21

19 Feb '21

commit 5f5f968a5fc65ea334b96e6deeda934980b371e6 Author: juga0 <juga(a)riseup.net> Date: Thu Dec 17 15:09:39 2020 +0000 chg: stem: Set default torrc options when connecting to an external tor and they are not already set. --- sbws/util/stem.py | 38 +++++++++++++++++++++++++++++++++++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/sbws/util/stem.py b/sbws/util/stem.py index 4e8f321..9fea31f 100644 --- a/sbws/util/stem.py +++ b/sbws/util/stem.py @@ -161,6 +161,16 @@ def parse_user_torrc_config(torrc, torrc_text): return torrc_dict +def set_torrc_starting_point(controller): + """Set the torrc starting point options.""" + for k, v in TORRC_STARTING_POINT.items(): + try: + controller.set_conf(k, v) + except (ControllerError, InvalidRequest, InvalidArguments) as e: + log.exception("Error setting option %s, %s: %s", k, v, e) + exit(1) + + def set_torrc_runtime_options(controller): """Set torrc options at runtime.""" try: @@ -228,16 +238,16 @@ def launch_tor(conf): def launch_or_connect_to_tor(conf): - # If connecting to an existing controller, there is no need to configure - # own tor. cont = init_controller(conf) if not cont: cont = launch_tor(conf) + else: + if not is_torrc_starting_point_set(cont): + set_torrc_starting_point(cont) # Set options that can fail at runtime set_torrc_options_can_fail(cont) # Set runtime options set_torrc_runtime_options(cont) - log.info('Started or connected to Tor %s.', cont.get_version()) return cont @@ -293,3 +303,25 @@ def circuit_str(controller, circ_id): return '[' +\ ' -> '.join(['{} ({})'.format(n, fp[0:8]) for fp, n in circ.path]) +\ ']' + + +def is_torrc_starting_point_set(tor_controller): + """Verify that the tor controller has the correct configuration. + + When connecting to a tor controller that has not been launched by sbws, + it should have been configured to work with sbws. + + """ + bad_options = False + torrc = TORRC_STARTING_POINT + for k, v in torrc.items(): + value_set = tor_controller.get_conf(k) + if v != value_set: + log.exception( + "Uncorrectly configured %s, should be %s, is %s", + k, v, value_set + ) + bad_options = True + if not bad_options: + log.info("Tor is correctly configured to work with sbws.") + return bad_options

1 0