October 2018 - tor-commits - lists.torproject.org

[tor/master] Extract addr-policy parsing code.
by nickm＠torproject.org 12 Oct '18

12 Oct '18

commit 35db3f8162f132cec7afc148eda8f7482dbeeb76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 1 11:08:09 2018 -0500 Extract addr-policy parsing code. --- src/core/include.am | 2 + src/core/or/policies.c | 1 + src/feature/dirparse/parsecommon.c | 4 +- src/feature/dirparse/parsecommon.h | 4 +- src/feature/dirparse/policy_parse.c | 218 ++++++++++++++++++++++++++++++++++++ src/feature/dirparse/policy_parse.h | 25 +++++ src/feature/dirparse/routerparse.c | 200 +-------------------------------- src/feature/dirparse/routerparse.h | 6 +- src/feature/nodelist/routerset.c | 2 +- src/test/test_policy.c | 11 +- src/test/test_routerset.c | 6 +- 11 files changed, 267 insertions(+), 212 deletions(-) diff --git a/src/core/include.am b/src/core/include.am index 1cecd8ba7..1b8ef2ac5 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -77,6 +77,7 @@ LIBTOR_APP_A_SOURCES = \ src/feature/dirparse/microdesc_parse.c \ src/feature/dirparse/ns_parse.c \ src/feature/dirparse/parsecommon.c \ + src/feature/dirparse/policy_parse.c \ src/feature/dirparse/routerparse.c \ src/feature/dirparse/sigcommon.c \ src/feature/dirparse/signing.c \ @@ -301,6 +302,7 @@ noinst_HEADERS += \ src/feature/dirparse/microdesc_parse.h \ src/feature/dirparse/ns_parse.h \ src/feature/dirparse/parsecommon.h \ + src/feature/dirparse/policy_parse.h \ src/feature/dirparse/routerparse.h \ src/feature/dirparse/sigcommon.h \ src/feature/dirparse/signing.h \ diff --git a/src/core/or/policies.c b/src/core/or/policies.c index 36970cf15..a23661851 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -21,6 +21,7 @@ #include "feature/client/bridges.h" #include "app/config/config.h" #include "core/or/policies.h" +#include "feature/dirparse/policy_parse.h" #include "feature/dirparse/routerparse.h" #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" diff --git a/src/feature/dirparse/parsecommon.c b/src/feature/dirparse/parsecommon.c index ab815f585..c12f199e4 100644 --- a/src/feature/dirparse/parsecommon.c +++ b/src/feature/dirparse/parsecommon.c @@ -51,7 +51,7 @@ token_clear(directory_token_t *tok) int tokenize_string(memarea_t *area, const char *start, const char *end, smartlist_t *out, - token_rule_t *table, int flags) + const token_rule_t *table, int flags) { const char **s; directory_token_t *tok = NULL; @@ -257,7 +257,7 @@ token_check_object(memarea_t *area, const char *kwd, */ directory_token_t * get_next_token(memarea_t *area, - const char **s, const char *eos, token_rule_t *table) + const char **s, const char *eos, const token_rule_t *table) { /** Reject any object at least this big; it is probably an overflow, an * attack, a bug, or some other nonsense. */ diff --git a/src/feature/dirparse/parsecommon.h b/src/feature/dirparse/parsecommon.h index d0f3810c0..f14862f04 100644 --- a/src/feature/dirparse/parsecommon.h +++ b/src/feature/dirparse/parsecommon.h @@ -302,12 +302,12 @@ void token_clear(directory_token_t *tok); int tokenize_string(struct memarea_t *area, const char *start, const char *end, struct smartlist_t *out, - token_rule_t *table, + const token_rule_t *table, int flags); directory_token_t *get_next_token(struct memarea_t *area, const char **s, const char *eos, - token_rule_t *table); + const token_rule_t *table); directory_token_t *find_by_keyword_(struct smartlist_t *s, directory_keyword keyword, diff --git a/src/feature/dirparse/policy_parse.c b/src/feature/dirparse/policy_parse.c new file mode 100644 index 000000000..e102a6228 --- /dev/null +++ b/src/feature/dirparse/policy_parse.c @@ -0,0 +1,218 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file policy_parse.c + * \brief Code to parse address policies. + **/ + +#define EXPOSE_ROUTERDESC_TOKEN_TABLE + +#include "core/or/or.h" + +#include "core/or/policies.h" +#include "feature/dirparse/parsecommon.h" +#include "feature/dirparse/policy_parse.h" +#include "feature/dirparse/routerparse.h" +#include "feature/dirparse/unparseable.h" +#include "lib/memarea/memarea.h" + +#include "core/or/addr_policy_st.h" + +static addr_policy_t *router_parse_addr_policy_private(directory_token_t *tok); + +/** Parse the addr policy in the string s and return it. If + * assume_action is nonnegative, then insert its action (ADDR_POLICY_ACCEPT or + * ADDR_POLICY_REJECT) for items that specify no action. + * + * Returns NULL on policy errors. + * + * Set *malformed_list to true if the entire policy list should be + * discarded. Otherwise, set it to false, and only this item should be ignored + * on error - the rest of the policy list can continue to be processed and + * used. + * + * The addr_policy_t returned by this function can have its address set to + * AF_UNSPEC for '*'. Use policy_expand_unspec() to turn this into a pair + * of AF_INET and AF_INET6 items. + */ +MOCK_IMPL(addr_policy_t *, +router_parse_addr_policy_item_from_string,(const char *s, int assume_action, + int *malformed_list)) +{ + directory_token_t *tok = NULL; + const char *cp, *eos; + /* Longest possible policy is + * "accept6 [ffff:ffff:..255]/128:10000-65535", + * which contains a max-length IPv6 address, plus 26 characters. + * But note that there can be an arbitrary amount of space between the + * accept and the address:mask/port element. + * We don't need to multiply TOR_ADDR_BUF_LEN by 2, as there is only one + * IPv6 address. But making the buffer shorter might cause valid long lines, + * which parsed in previous versions, to fail to parse in new versions. + * (These lines would have to have excessive amounts of whitespace.) */ + char line[TOR_ADDR_BUF_LEN*2 + 32]; + addr_policy_t *r; + memarea_t *area = NULL; + + tor_assert(malformed_list); + *malformed_list = 0; + + s = eat_whitespace(s); + /* We can only do assume_action on []-quoted IPv6, as "a" (accept) + * and ":" (port separator) are ambiguous */ + if ((*s == '*' || *s == '[' || TOR_ISDIGIT(*s)) && assume_action >= 0) { + if (tor_snprintf(line, sizeof(line), "%s %s", + assume_action == ADDR_POLICY_ACCEPT?"accept":"reject", s)<0) { + log_warn(LD_DIR, "Policy %s is too long.", escaped(s)); + return NULL; + } + cp = line; + tor_strlower(line); + } else { /* assume an already well-formed address policy line */ + cp = s; + } + + eos = cp + strlen(cp); + area = memarea_new(); + tok = get_next_token(area, &cp, eos, routerdesc_token_table); + if (tok->tp == ERR_) { + log_warn(LD_DIR, "Error reading address policy: %s", tok->error); + goto err; + } + if (tok->tp != K_ACCEPT && tok->tp != K_ACCEPT6 && + tok->tp != K_REJECT && tok->tp != K_REJECT6) { + log_warn(LD_DIR, "Expected 'accept' or 'reject'."); + goto err; + } + + /* Use the extended interpretation of accept/reject *, + * expanding it into an IPv4 wildcard and an IPv6 wildcard. + * Also permit *4 and *6 for IPv4 and IPv6 only wildcards. */ + r = router_parse_addr_policy(tok, TAPMP_EXTENDED_STAR); + if (!r) { + goto err; + } + + /* Ensure that accept6/reject6 fields are followed by IPv6 addresses. + * AF_UNSPEC addresses are only permitted on the accept/reject field type. + * Unlike descriptors, torrcs exit policy accept/reject can be followed by + * either an IPv4 or IPv6 address. */ + if ((tok->tp == K_ACCEPT6 || tok->tp == K_REJECT6) && + tor_addr_family(&r->addr) != AF_INET6) { + /* This is a non-fatal error, just ignore this one entry. */ + *malformed_list = 0; + log_warn(LD_DIR, "IPv4 address '%s' with accept6/reject6 field type in " + "exit policy. Ignoring, but continuing to parse rules. (Use " + "accept/reject with IPv4 addresses.)", + tok->n_args == 1 ? tok->args[0] : ""); + addr_policy_free(r); + r = NULL; + goto done; + } + + goto done; + err: + *malformed_list = 1; + r = NULL; + done: + token_clear(tok); + if (area) { + DUMP_AREA(area, "policy item"); + memarea_drop_all(area); + } + return r; +} + +/** Given a K_ACCEPT[6] or K_REJECT[6] token and a router, create and return + * a new exit_policy_t corresponding to the token. If TAPMP_EXTENDED_STAR + * is set in fmt_flags, K_ACCEPT6 and K_REJECT6 tokens followed by * + * expand to IPv6-only policies, otherwise they expand to IPv4 and IPv6 + * policies */ +addr_policy_t * +router_parse_addr_policy(directory_token_t *tok, unsigned fmt_flags) +{ + addr_policy_t newe; + char *arg; + + tor_assert(tok->tp == K_REJECT || tok->tp == K_REJECT6 || + tok->tp == K_ACCEPT || tok->tp == K_ACCEPT6); + + if (tok->n_args != 1) + return NULL; + arg = tok->args[0]; + + if (!strcmpstart(arg,"private")) + return router_parse_addr_policy_private(tok); + + memset(&newe, 0, sizeof(newe)); + + if (tok->tp == K_REJECT || tok->tp == K_REJECT6) + newe.policy_type = ADDR_POLICY_REJECT; + else + newe.policy_type = ADDR_POLICY_ACCEPT; + + /* accept6/reject6 * produces an IPv6 wildcard address only. + * (accept/reject * produces rules for IPv4 and IPv6 wildcard addresses.) */ + if ((fmt_flags & TAPMP_EXTENDED_STAR) + && (tok->tp == K_ACCEPT6 || tok->tp == K_REJECT6)) { + fmt_flags |= TAPMP_STAR_IPV6_ONLY; + } + + if (tor_addr_parse_mask_ports(arg, fmt_flags, &newe.addr, &newe.maskbits, + &newe.prt_min, &newe.prt_max) < 0) { + log_warn(LD_DIR,"Couldn't parse line %s. Dropping", escaped(arg)); + return NULL; + } + + return addr_policy_get_canonical_entry(&newe); +} + +/** Parse an exit policy line of the format "accept[6]/reject[6] private:...". + * This didn't exist until Tor 0.1.1.15, so nobody should generate it in + * router descriptors until earlier versions are obsolete. + * + * accept/reject and accept6/reject6 private all produce rules for both + * IPv4 and IPv6 addresses. + */ +static addr_policy_t * +router_parse_addr_policy_private(directory_token_t *tok) +{ + const char *arg; + uint16_t port_min, port_max; + addr_policy_t result; + + arg = tok->args[0]; + if (strcmpstart(arg, "private")) + return NULL; + + arg += strlen("private"); + arg = (char*) eat_whitespace(arg); + if (!arg || *arg != ':') + return NULL; + + if (parse_port_range(arg+1, &port_min, &port_max)<0) + return NULL; + + memset(&result, 0, sizeof(result)); + if (tok->tp == K_REJECT || tok->tp == K_REJECT6) + result.policy_type = ADDR_POLICY_REJECT; + else + result.policy_type = ADDR_POLICY_ACCEPT; + result.is_private = 1; + result.prt_min = port_min; + result.prt_max = port_max; + + if (tok->tp == K_ACCEPT6 || tok->tp == K_REJECT6) { + log_warn(LD_GENERAL, + "'%s' expands into rules which apply to all private IPv4 and " + "IPv6 addresses. (Use accept/reject private:* for IPv4 and " + "IPv6.)", tok->n_args == 1 ? tok->args[0] : ""); + } + + return addr_policy_get_canonical_entry(&result); +} + diff --git a/src/feature/dirparse/policy_parse.h b/src/feature/dirparse/policy_parse.h new file mode 100644 index 000000000..887aa9261 --- /dev/null +++ b/src/feature/dirparse/policy_parse.h @@ -0,0 +1,25 @@ +/* Copyright (c) 2001 Matej Pfajfar. + * Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2018, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +/** + * \file policy_parse.h + * \brief Header file for policy_parse.c. + **/ + +#ifndef TOR_POLICY_PARSE_H +#define TOR_POLICY_PARSE_H + +#include "lib/testsupport/testsupport.h" + +struct directory_token_t; + +MOCK_DECL(addr_policy_t *, router_parse_addr_policy_item_from_string, + (const char *s, int assume_action, int *malformed_list)); + +addr_policy_t *router_parse_addr_policy(struct directory_token_t *tok, + unsigned fmt_flags); + +#endif /* !defined(TOR_POLICY_PARSE_H) */ diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c index 0e9773564..54c0e8948 100644 --- a/src/feature/dirparse/routerparse.c +++ b/src/feature/dirparse/routerparse.c @@ -51,6 +51,7 @@ **/ #define ROUTERPARSE_PRIVATE +#define EXPOSE_ROUTERDESC_TOKEN_TABLE #include "core/or/or.h" #include "app/config/config.h" @@ -61,6 +62,7 @@ #include "feature/dirauth/shared_random.h" #include "feature/dircommon/voting_schedule.h" #include "feature/dirparse/parsecommon.h" +#include "feature/dirparse/policy_parse.h" #include "feature/dirparse/routerparse.h" #include "feature/hs_common/shared_random_client.h" #include "feature/nodelist/authcert.h" @@ -111,7 +113,7 @@ /****************************************************************************/ /** List of tokens recognized in router descriptors */ -static token_rule_t routerdesc_token_table[] = { +const token_rule_t routerdesc_token_table[] = { T0N("reject", K_REJECT, ARGS, NO_OBJ ), T0N("accept", K_ACCEPT, ARGS, NO_OBJ ), T0N("reject6", K_REJECT6, ARGS, NO_OBJ ), @@ -197,10 +199,6 @@ static token_rule_t extrainfo_token_table[] = { /* static function prototypes */ static int router_add_exit_policy(routerinfo_t *router,directory_token_t *tok); -static addr_policy_t *router_parse_addr_policy(directory_token_t *tok, - unsigned fmt_flags); -static addr_policy_t *router_parse_addr_policy_private(directory_token_t *tok); - static smartlist_t *find_all_exitpolicy(smartlist_t *s); /** Set digest to the SHA-1 digest of the hash of the first router in @@ -1201,109 +1199,6 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, return extrainfo; } -/** Parse the addr policy in the string s and return it. If - * assume_action is nonnegative, then insert its action (ADDR_POLICY_ACCEPT or - * ADDR_POLICY_REJECT) for items that specify no action. - * - * Returns NULL on policy errors. - * - * Set *malformed_list to true if the entire policy list should be - * discarded. Otherwise, set it to false, and only this item should be ignored - * on error - the rest of the policy list can continue to be processed and - * used. - * - * The addr_policy_t returned by this function can have its address set to - * AF_UNSPEC for '*'. Use policy_expand_unspec() to turn this into a pair - * of AF_INET and AF_INET6 items. - */ -MOCK_IMPL(addr_policy_t *, -router_parse_addr_policy_item_from_string,(const char *s, int assume_action, - int *malformed_list)) -{ - directory_token_t *tok = NULL; - const char *cp, *eos; - /* Longest possible policy is - * "accept6 [ffff:ffff:..255]/128:10000-65535", - * which contains a max-length IPv6 address, plus 26 characters. - * But note that there can be an arbitrary amount of space between the - * accept and the address:mask/port element. - * We don't need to multiply TOR_ADDR_BUF_LEN by 2, as there is only one - * IPv6 address. But making the buffer shorter might cause valid long lines, - * which parsed in previous versions, to fail to parse in new versions. - * (These lines would have to have excessive amounts of whitespace.) */ - char line[TOR_ADDR_BUF_LEN*2 + 32]; - addr_policy_t *r; - memarea_t *area = NULL; - - tor_assert(malformed_list); - *malformed_list = 0; - - s = eat_whitespace(s); - /* We can only do assume_action on []-quoted IPv6, as "a" (accept) - * and ":" (port separator) are ambiguous */ - if ((*s == '*' || *s == '[' || TOR_ISDIGIT(*s)) && assume_action >= 0) { - if (tor_snprintf(line, sizeof(line), "%s %s", - assume_action == ADDR_POLICY_ACCEPT?"accept":"reject", s)<0) { - log_warn(LD_DIR, "Policy %s is too long.", escaped(s)); - return NULL; - } - cp = line; - tor_strlower(line); - } else { /* assume an already well-formed address policy line */ - cp = s; - } - - eos = cp + strlen(cp); - area = memarea_new(); - tok = get_next_token(area, &cp, eos, routerdesc_token_table); - if (tok->tp == ERR_) { - log_warn(LD_DIR, "Error reading address policy: %s", tok->error); - goto err; - } - if (tok->tp != K_ACCEPT && tok->tp != K_ACCEPT6 && - tok->tp != K_REJECT && tok->tp != K_REJECT6) { - log_warn(LD_DIR, "Expected 'accept' or 'reject'."); - goto err; - } - - /* Use the extended interpretation of accept/reject *, - * expanding it into an IPv4 wildcard and an IPv6 wildcard. - * Also permit *4 and *6 for IPv4 and IPv6 only wildcards. */ - r = router_parse_addr_policy(tok, TAPMP_EXTENDED_STAR); - if (!r) { - goto err; - } - - /* Ensure that accept6/reject6 fields are followed by IPv6 addresses. - * AF_UNSPEC addresses are only permitted on the accept/reject field type. - * Unlike descriptors, torrcs exit policy accept/reject can be followed by - * either an IPv4 or IPv6 address. */ - if ((tok->tp == K_ACCEPT6 || tok->tp == K_REJECT6) && - tor_addr_family(&r->addr) != AF_INET6) { - /* This is a non-fatal error, just ignore this one entry. */ - *malformed_list = 0; - log_warn(LD_DIR, "IPv4 address '%s' with accept6/reject6 field type in " - "exit policy. Ignoring, but continuing to parse rules. (Use " - "accept/reject with IPv4 addresses.)", - tok->n_args == 1 ? tok->args[0] : ""); - addr_policy_free(r); - r = NULL; - goto done; - } - - goto done; - err: - *malformed_list = 1; - r = NULL; - done: - token_clear(tok); - if (area) { - DUMP_AREA(area, "policy item"); - memarea_drop_all(area); - } - return r; -} - /** Add an exit policy stored in the token tok to the router info in * router. Return 0 on success, -1 on failure. */ static int @@ -1340,95 +1235,6 @@ router_add_exit_policy(routerinfo_t *router, directory_token_t *tok) return 0; } -/** Given a K_ACCEPT[6] or K_REJECT[6] token and a router, create and return - * a new exit_policy_t corresponding to the token. If TAPMP_EXTENDED_STAR - * is set in fmt_flags, K_ACCEPT6 and K_REJECT6 tokens followed by * - * expand to IPv6-only policies, otherwise they expand to IPv4 and IPv6 - * policies */ -static addr_policy_t * -router_parse_addr_policy(directory_token_t *tok, unsigned fmt_flags) -{ - addr_policy_t newe; - char *arg; - - tor_assert(tok->tp == K_REJECT || tok->tp == K_REJECT6 || - tok->tp == K_ACCEPT || tok->tp == K_ACCEPT6); - - if (tok->n_args != 1) - return NULL; - arg = tok->args[0]; - - if (!strcmpstart(arg,"private")) - return router_parse_addr_policy_private(tok); - - memset(&newe, 0, sizeof(newe)); - - if (tok->tp == K_REJECT || tok->tp == K_REJECT6) - newe.policy_type = ADDR_POLICY_REJECT; - else - newe.policy_type = ADDR_POLICY_ACCEPT; - - /* accept6/reject6 * produces an IPv6 wildcard address only. - * (accept/reject * produces rules for IPv4 and IPv6 wildcard addresses.) */ - if ((fmt_flags & TAPMP_EXTENDED_STAR) - && (tok->tp == K_ACCEPT6 || tok->tp == K_REJECT6)) { - fmt_flags |= TAPMP_STAR_IPV6_ONLY; - } - - if (tor_addr_parse_mask_ports(arg, fmt_flags, &newe.addr, &newe.maskbits, - &newe.prt_min, &newe.prt_max) < 0) { - log_warn(LD_DIR,"Couldn't parse line %s. Dropping", escaped(arg)); - return NULL; - } - - return addr_policy_get_canonical_entry(&newe); -} - -/** Parse an exit policy line of the format "accept[6]/reject[6] private:...". - * This didn't exist until Tor 0.1.1.15, so nobody should generate it in - * router descriptors until earlier versions are obsolete. - * - * accept/reject and accept6/reject6 private all produce rules for both - * IPv4 and IPv6 addresses. - */ -static addr_policy_t * -router_parse_addr_policy_private(directory_token_t *tok) -{ - const char *arg; - uint16_t port_min, port_max; - addr_policy_t result; - - arg = tok->args[0]; - if (strcmpstart(arg, "private")) - return NULL; - - arg += strlen("private"); - arg = (char*) eat_whitespace(arg); - if (!arg || *arg != ':') - return NULL; - - if (parse_port_range(arg+1, &port_min, &port_max)<0) - return NULL; - - memset(&result, 0, sizeof(result)); - if (tok->tp == K_REJECT || tok->tp == K_REJECT6) - result.policy_type = ADDR_POLICY_REJECT; - else - result.policy_type = ADDR_POLICY_ACCEPT; - result.is_private = 1; - result.prt_min = port_min; - result.prt_max = port_max; - - if (tok->tp == K_ACCEPT6 || tok->tp == K_REJECT6) { - log_warn(LD_GENERAL, - "'%s' expands into rules which apply to all private IPv4 and " - "IPv6 addresses. (Use accept/reject private:* for IPv4 and " - "IPv6.)", tok->n_args == 1 ? tok->args[0] : ""); - } - - return addr_policy_get_canonical_entry(&result); -} - /** Return a newly allocated smartlist of all accept or reject tokens in * s. */ diff --git a/src/feature/dirparse/routerparse.h b/src/feature/dirparse/routerparse.h index 72f812ee4..3022d60d3 100644 --- a/src/feature/dirparse/routerparse.h +++ b/src/feature/dirparse/routerparse.h @@ -34,8 +34,6 @@ struct digest_ri_map_t; extrainfo_t *extrainfo_parse_entry_from_string(const char *s, const char *end, int cache_copy, struct digest_ri_map_t *routermap, int *can_dl_again_out); -MOCK_DECL(addr_policy_t *, router_parse_addr_policy_item_from_string, - (const char *s, int assume_action, int *malformed_list)); int find_single_ipv6_orport(const smartlist_t *list, tor_addr_t *addr_out, @@ -44,6 +42,10 @@ int find_single_ipv6_orport(const smartlist_t *list, void routerparse_init(void); void routerparse_free_all(void); +#ifdef EXPOSE_ROUTERDESC_TOKEN_TABLE +extern const struct token_rule_t routerdesc_token_table[]; +#endif + #define ED_DESC_SIGNATURE_PREFIX "Tor router descriptor signature v1" #endif /* !defined(TOR_ROUTERPARSE_H) */ diff --git a/src/feature/nodelist/routerset.c b/src/feature/nodelist/routerset.c index 59d6da97b..45863de6e 100644 --- a/src/feature/nodelist/routerset.c +++ b/src/feature/nodelist/routerset.c @@ -30,7 +30,7 @@ n * Copyright (c) 2001-2004, Roger Dingledine. #include "core/or/or.h" #include "core/or/policies.h" #include "feature/client/bridges.h" -#include "feature/dirparse/routerparse.h" +#include "feature/dirparse/policy_parse.h" #include "feature/nodelist/nickname.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerset.h" diff --git a/src/test/test_policy.c b/src/test/test_policy.c index 5101b57ab..afe608f5f 100644 --- a/src/test/test_policy.c +++ b/src/test/test_policy.c @@ -1,19 +1,20 @@ /* Copyright (c) 2013-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#include "core/or/or.h" #define CONFIG_PRIVATE -#include "app/config/config.h" -#include "feature/relay/router.h" -#include "feature/dirparse/routerparse.h" #define POLICIES_PRIVATE + +#include "core/or/or.h" +#include "app/config/config.h" #include "core/or/policies.h" +#include "feature/dirparse/policy_parse.h" +#include "feature/relay/router.h" #include "lib/encoding/confline.h" #include "test/test.h" #include "core/or/addr_policy_st.h" -#include "feature/nodelist/node_st.h" #include "core/or/port_cfg_st.h" +#include "feature/nodelist/node_st.h" #include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/routerstatus_st.h" diff --git a/src/test/test_routerset.c b/src/test/test_routerset.c index 56abce162..a08adff46 100644 --- a/src/test/test_routerset.c +++ b/src/test/test_routerset.c @@ -4,11 +4,11 @@ #define ROUTERSET_PRIVATE #include "core/or/or.h" -#include "lib/geoip/geoip.h" -#include "feature/nodelist/routerset.h" -#include "feature/dirparse/routerparse.h" #include "core/or/policies.h" +#include "feature/dirparse/policy_parse.h" #include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerset.h" +#include "lib/geoip/geoip.h" #include "core/or/addr_policy_st.h" #include "core/or/extend_info_st.h"

1 0

[tor/master] Remove versions.h include from routerparse.h
by nickm＠torproject.org 12 Oct '18

12 Oct '18

commit d19934866417aa9106fb17c39cfec606d33eacdb Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 1 11:22:47 2018 -0500 Remove versions.h include from routerparse.h --- src/core/or/protover.c | 2 +- src/feature/control/control.c | 2 +- src/feature/dirauth/process_descs.c | 1 + src/feature/dirparse/ns_parse.c | 1 + src/feature/dirparse/routerparse.c | 1 + src/feature/dirparse/routerparse.h | 2 -- src/test/fuzz/fuzz_hsdescv3.c | 1 - src/test/test_dir.c | 2 +- src/test/test_hs_service.c | 31 +++++++++++++++---------------- 9 files changed, 21 insertions(+), 22 deletions(-) diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 4458316c9..e80fbfae8 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -25,7 +25,7 @@ #include "core/or/or.h" #include "core/or/protover.h" -#include "feature/dirparse/routerparse.h" +#include "core/or/versions.h" #include "lib/tls/tortls.h" #ifndef HAVE_RUST diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 7f0032c0b..f0db97dc8 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -52,6 +52,7 @@ #include "core/or/connection_or.h" #include "core/or/policies.h" #include "core/or/reasons.h" +#include "core/or/versions.h" #include "core/proto/proto_control0.h" #include "core/proto/proto_http.h" #include "feature/client/addressmap.h" @@ -65,7 +66,6 @@ #include "feature/dirclient/dirclient.h" #include "feature/dirclient/dlstatus.h" #include "feature/dircommon/directory.h" -#include "feature/dirparse/routerparse.h" #include "feature/hibernate/hibernate.h" #include "feature/hs/hs_cache.h" #include "feature/hs/hs_common.h" diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 94c456a77..c379f25bd 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -17,6 +17,7 @@ #include "app/config/config.h" #include "core/or/policies.h" +#include "core/or/versions.h" #include "feature/dirauth/keypin.h" #include "feature/dirauth/reachability.h" #include "feature/dirclient/dlstatus.h" diff --git a/src/feature/dirparse/ns_parse.c b/src/feature/dirparse/ns_parse.c index e356c0c11..72299e807 100644 --- a/src/feature/dirparse/ns_parse.c +++ b/src/feature/dirparse/ns_parse.c @@ -13,6 +13,7 @@ #include "core/or/or.h" #include "app/config/config.h" +#include "core/or/versions.h" #include "feature/client/entrynodes.h" #include "feature/dirauth/dirvote.h" #include "feature/dirparse/authcert_parse.h" diff --git a/src/feature/dirparse/routerparse.c b/src/feature/dirparse/routerparse.c index 2aa6bef80..2249ab7cb 100644 --- a/src/feature/dirparse/routerparse.c +++ b/src/feature/dirparse/routerparse.c @@ -55,6 +55,7 @@ #include "core/or/or.h" #include "app/config/config.h" #include "core/or/policies.h" +#include "core/or/versions.h" #include "feature/dirparse/parsecommon.h" #include "feature/dirparse/policy_parse.h" #include "feature/dirparse/routerparse.h" diff --git a/src/feature/dirparse/routerparse.h b/src/feature/dirparse/routerparse.h index 3022d60d3..6568dce0a 100644 --- a/src/feature/dirparse/routerparse.h +++ b/src/feature/dirparse/routerparse.h @@ -12,8 +12,6 @@ #ifndef TOR_ROUTERPARSE_H #define TOR_ROUTERPARSE_H -#include "core/or/versions.h" - int router_get_router_hash(const char *s, size_t s_len, char *digest); int router_get_extrainfo_hash(const char *s, size_t s_len, char *digest); diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index ce6dfb177..871fbefa4 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -1,7 +1,6 @@ /* Copyright (c) 2017-2018, The Tor Project, Inc. */ /* See LICENSE for licensing information */ -#define ROUTERPARSE_PRIVATE #define HS_DESCRIPTOR_PRIVATE #include "core/or/or.h" diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 3b5d6dc3d..c18aa99fe 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -20,7 +20,6 @@ #define NODE_SELECT_PRIVATE #define RELAY_PRIVATE #define ROUTERLIST_PRIVATE -#define ROUTERPARSE_PRIVATE #define ROUTER_PRIVATE #define UNPARSEABLE_PRIVATE #define VOTEFLAGS_PRIVATE @@ -30,6 +29,7 @@ #include "app/config/confparse.h" #include "core/mainloop/connection.h" #include "core/or/relay.h" +#include "core/or/versions.h" #include "feature/client/bridges.h" #include "feature/client/entrynodes.h" #include "feature/control/control.h" diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c index 67686bbee..957bf6e10 100644 --- a/src/test/test_hs_service.c +++ b/src/test/test_hs_service.c @@ -21,7 +21,6 @@ #define STATEFILE_PRIVATE #define TOR_CHANNEL_INTERNAL_ #define HS_CLIENT_PRIVATE -#define ROUTERPARSE_PRIVATE #include "test/test.h" #include "test/test_helpers.h" @@ -31,33 +30,33 @@ #include "core/or/or.h" #include "app/config/config.h" +#include "app/config/statefile.h" +#include "core/crypto/hs_ntor.h" +#include "core/mainloop/connection.h" +#include "core/mainloop/mainloop.h" #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" #include "core/or/circuituse.h" -#include "core/mainloop/connection.h" #include "core/or/connection_edge.h" #include "core/or/edge_connection_st.h" -#include "lib/crypt_ops/crypto_rand.h" -#include "lib/fs/dir.h" -#include "feature/dirauth/dirvote.h" -#include "feature/nodelist/networkstatus.h" -#include "feature/nodelist/nodelist.h" #include "core/or/relay.h" -#include "feature/dirparse/routerparse.h" +#include "core/or/versions.h" +#include "feature/dirauth/dirvote.h" +#include "feature/dirauth/shared_random_state.h" +#include "feature/dircommon/voting_schedule.h" +#include "feature/hs/hs_circuit.h" +#include "feature/hs/hs_circuitmap.h" +#include "feature/hs/hs_client.h" #include "feature/hs/hs_common.h" #include "feature/hs/hs_config.h" #include "feature/hs/hs_ident.h" #include "feature/hs/hs_intropoint.h" -#include "core/crypto/hs_ntor.h" -#include "feature/hs/hs_circuit.h" -#include "feature/hs/hs_circuitmap.h" #include "feature/hs/hs_service.h" -#include "feature/hs/hs_client.h" -#include "core/mainloop/mainloop.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" #include "feature/rend/rendservice.h" -#include "app/config/statefile.h" -#include "feature/dirauth/shared_random_state.h" -#include "feature/dircommon/voting_schedule.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/fs/dir.h" #include "core/or/cpath_build_state_st.h" #include "core/or/crypt_path_st.h"

1 0

[tor/master] changes file for splitting routerparse.c (#27924)
by nickm＠torproject.org 12 Oct '18

12 Oct '18

commit a1504f138d978d73b2c6129957dd0ee344a97efa Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 1 11:45:11 2018 -0500 changes file for splitting routerparse.c (#27924) --- changes/ticket27924 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/changes/ticket27924 b/changes/ticket27924 new file mode 100644 index 000000000..7348727b3 --- /dev/null +++ b/changes/ticket27924 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Divide the "routerparse.c" module into separate modules for each + group of parsed objects. Closes ticket 27924.

1 0

[tor/master] Merge remote-tracking branch 'tor-github/pr/380'
by nickm＠torproject.org 12 Oct '18

12 Oct '18

commit 67351f672450d5f13754294405243a59ddd86de9 Merge: 391756f26 a1504f138 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 12 11:39:37 2018 -0400 Merge remote-tracking branch 'tor-github/pr/380' changes/ticket27924 | 3 + src/app/main/main.c | 6 +- src/core/include.am | 29 +- src/core/mainloop/connection.c | 3 +- src/core/or/circuitbuild.c | 1 - src/core/or/policies.c | 4 +- src/core/or/protover.c | 2 +- src/core/or/relay.c | 1 - src/core/or/versions.c | 422 ++ src/core/or/versions.h | 44 + src/feature/client/entrynodes.c | 3 +- src/feature/control/control.c | 3 +- src/feature/dirauth/bwauth.c | 2 +- src/feature/dirauth/dirvote.c | 32 +- src/feature/dirauth/dsigs_parse.c | 282 ++ src/feature/dirauth/dsigs_parse.h | 22 + src/feature/dirauth/guardfraction.c | 2 +- src/feature/dirauth/process_descs.c | 3 +- src/feature/dircache/consdiffmgr.c | 2 +- src/feature/dircommon/consdiff.c | 2 +- src/feature/dirparse/authcert_members.i | 13 + src/feature/dirparse/authcert_parse.c | 207 + src/feature/dirparse/authcert_parse.h | 18 + src/feature/dirparse/microdesc_parse.c | 267 + src/feature/dirparse/microdesc_parse.h | 20 + src/feature/dirparse/ns_parse.c | 1685 +++++++ src/feature/dirparse/ns_parse.h | 45 + src/feature/{nodelist => dirparse}/parsecommon.c | 6 +- src/feature/{nodelist => dirparse}/parsecommon.h | 4 +- src/feature/dirparse/policy_parse.c | 218 + src/feature/dirparse/policy_parse.h | 25 + src/feature/dirparse/routerparse.c | 1242 +++++ src/feature/dirparse/routerparse.h | 49 + src/feature/dirparse/sigcommon.c | 185 + src/feature/dirparse/sigcommon.h | 48 + src/feature/dirparse/signing.c | 98 + src/feature/dirparse/signing.h | 23 + src/feature/dirparse/unparseable.c | 591 +++ src/feature/dirparse/unparseable.h | 56 + src/feature/hs/hs_descriptor.c | 2 +- src/feature/nodelist/authcert.c | 4 +- src/feature/nodelist/microdesc.c | 14 +- src/feature/nodelist/networkstatus.c | 22 +- src/feature/nodelist/networkstatus.h | 3 - src/feature/nodelist/nodelist.c | 1 - src/feature/nodelist/routerlist.c | 2 +- src/feature/nodelist/routerparse.c | 5701 ---------------------- src/feature/nodelist/routerparse.h | 161 - src/feature/nodelist/routerset.c | 2 +- src/feature/relay/router.c | 4 +- src/feature/rend/rendcache.c | 2 +- src/feature/rend/rendcommon.c | 3 +- src/feature/rend/rendparse.c | 600 +++ src/feature/rend/rendparse.h | 32 + src/feature/rend/rendservice.c | 2 +- src/test/fuzz/fuzz_consensus.c | 6 +- src/test/fuzz/fuzz_descriptor.c | 6 +- src/test/fuzz/fuzz_extrainfo.c | 6 +- src/test/fuzz/fuzz_hsdescv2.c | 4 +- src/test/fuzz/fuzz_hsdescv3.c | 3 +- src/test/fuzz/fuzz_iptsv2.c | 5 +- src/test/fuzz/fuzz_microdesc.c | 5 +- src/test/fuzz/fuzz_vrs.c | 5 +- src/test/test.c | 2 +- src/test/test_consdiffmgr.c | 2 +- src/test/test_dir.c | 10 +- src/test/test_dir_common.c | 2 + src/test/test_dir_common.h | 1 - src/test/test_dir_handle_get.c | 2 +- src/test/test_entrynodes.c | 1 - src/test/test_guardfraction.c | 4 +- src/test/test_hs_service.c | 31 +- src/test/test_microdesc.c | 5 +- src/test/test_policy.c | 11 +- src/test/test_routerlist.c | 3 +- src/test/test_routerset.c | 6 +- src/test/test_shared_random.c | 2 +- 77 files changed, 6349 insertions(+), 5996 deletions(-)

1 0

[tor/master] Remove routerparse include from files that dont use it
by nickm＠torproject.org 12 Oct '18

12 Oct '18

commit 886dc8b0a5ed1ee6c7eaf9f50fb00f2001e2ee20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 1 11:35:11 2018 -0500 Remove routerparse include from files that dont use it --- src/core/mainloop/connection.c | 1 - src/core/or/circuitbuild.c | 1 - src/core/or/policies.c | 1 - src/core/or/relay.c | 1 - src/feature/client/entrynodes.c | 1 - src/feature/nodelist/microdesc.c | 1 - src/feature/nodelist/nodelist.c | 1 - src/feature/rend/rendcache.c | 1 - src/feature/rend/rendcommon.c | 1 - src/feature/rend/rendservice.c | 1 - src/test/fuzz/fuzz_hsdescv3.c | 1 - src/test/test.c | 1 - src/test/test_dir_common.h | 1 - src/test/test_dir_handle_get.c | 1 - src/test/test_entrynodes.c | 1 - src/test/test_routerlist.c | 1 - src/test/test_shared_random.c | 1 - 17 files changed, 17 deletions(-) diff --git a/src/core/mainloop/connection.c b/src/core/mainloop/connection.c index c5f474e03..766d5d6b6 100644 --- a/src/core/mainloop/connection.c +++ b/src/core/mainloop/connection.c @@ -91,7 +91,6 @@ #include "feature/dirauth/authmode.h" #include "feature/dircache/dirserv.h" #include "feature/dircommon/directory.h" -#include "feature/dirparse/routerparse.h" #include "feature/hibernate/hibernate.h" #include "feature/hs/hs_common.h" #include "feature/hs/hs_ident.h" diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 2943b7e80..a69457571 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -61,7 +61,6 @@ #include "feature/nodelist/node_select.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerlist.h" -#include "feature/dirparse/routerparse.h" #include "feature/nodelist/routerset.h" #include "feature/relay/router.h" #include "feature/relay/routermode.h" diff --git a/src/core/or/policies.c b/src/core/or/policies.c index a23661851..0eda93c5f 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -22,7 +22,6 @@ #include "app/config/config.h" #include "core/or/policies.h" #include "feature/dirparse/policy_parse.h" -#include "feature/dirparse/routerparse.h" #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" diff --git a/src/core/or/relay.c b/src/core/or/relay.c index dafc6effd..510d96c64 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -79,7 +79,6 @@ #include "feature/rend/rendcommon.h" #include "feature/nodelist/describe.h" #include "feature/nodelist/routerlist.h" -#include "feature/dirparse/routerparse.h" #include "core/or/scheduler.h" #include "feature/stats/rephist.h" diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 230b51715..20208ef61 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -130,7 +130,6 @@ #include "feature/client/transports.h" #include "feature/control/control.h" #include "feature/dircommon/directory.h" -#include "feature/dirparse/routerparse.h" #include "feature/nodelist/describe.h" #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" diff --git a/src/feature/nodelist/microdesc.c b/src/feature/nodelist/microdesc.c index 3716513f0..146c772da 100644 --- a/src/feature/nodelist/microdesc.c +++ b/src/feature/nodelist/microdesc.c @@ -20,7 +20,6 @@ #include "feature/dirclient/dlstatus.h" #include "feature/dircommon/directory.h" #include "feature/dirparse/microdesc_parse.h" -#include "feature/dirparse/routerparse.h" #include "feature/nodelist/dirlist.h" #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" diff --git a/src/feature/nodelist/nodelist.c b/src/feature/nodelist/nodelist.c index 29150d931..600dfcf56 100644 --- a/src/feature/nodelist/nodelist.c +++ b/src/feature/nodelist/nodelist.c @@ -61,7 +61,6 @@ #include "feature/nodelist/node_select.h" #include "feature/nodelist/nodelist.h" #include "feature/nodelist/routerlist.h" -#include "feature/dirparse/routerparse.h" #include "feature/nodelist/routerset.h" #include "feature/nodelist/torcert.h" #include "feature/rend/rendservice.h" diff --git a/src/feature/rend/rendcache.c b/src/feature/rend/rendcache.c index 4c8afbfca..848386b97 100644 --- a/src/feature/rend/rendcache.c +++ b/src/feature/rend/rendcache.c @@ -12,7 +12,6 @@ #include "app/config/config.h" #include "feature/stats/rephist.h" #include "feature/nodelist/routerlist.h" -#include "feature/dirparse/routerparse.h" #include "feature/rend/rendcommon.h" #include "feature/rend/rendparse.h" diff --git a/src/feature/rend/rendcommon.c b/src/feature/rend/rendcommon.c index 458b92f51..15e4534fc 100644 --- a/src/feature/rend/rendcommon.c +++ b/src/feature/rend/rendcommon.c @@ -31,7 +31,6 @@ #include "feature/hs_common/replaycache.h" #include "feature/relay/router.h" #include "feature/nodelist/routerlist.h" -#include "feature/dirparse/routerparse.h" #include "feature/dirparse/signing.h" #include "core/or/cpath_build_state_st.h" diff --git a/src/feature/rend/rendservice.c b/src/feature/rend/rendservice.c index e70694b78..bae9da3fe 100644 --- a/src/feature/rend/rendservice.c +++ b/src/feature/rend/rendservice.c @@ -22,7 +22,6 @@ #include "feature/control/control.h" #include "feature/dirclient/dirclient.h" #include "feature/dircommon/directory.h" -#include "feature/dirparse/routerparse.h" #include "feature/hs/hs_common.h" #include "feature/hs/hs_config.h" #include "feature/hs_common/replaycache.h" diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index 871fbefa4..d5ddcc2e2 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -7,7 +7,6 @@ #include "trunnel/ed25519_cert.h" /* Trunnel interface. */ #include "lib/crypt_ops/crypto_ed25519.h" #include "feature/hs/hs_descriptor.h" -#include "feature/dirparse/routerparse.h" #include "feature/dirparse/unparseable.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/test.c b/src/test/test.c index 2198de797..70d91e396 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -55,7 +55,6 @@ #include "core/crypto/onion_tap.h" #include "core/or/policies.h" #include "feature/stats/rephist.h" -#include "feature/dirparse/routerparse.h" #include "app/config/statefile.h" #include "lib/crypt_ops/crypto_curve25519.h" diff --git a/src/test/test_dir_common.h b/src/test/test_dir_common.h index 9bcabc7bd..1e958a21f 100644 --- a/src/test/test_dir_common.h +++ b/src/test/test_dir_common.h @@ -5,7 +5,6 @@ #include "core/or/or.h" #include "feature/nodelist/networkstatus.h" -#include "feature/dirparse/routerparse.h" #define TEST_DIR_ROUTER_ID_1 3 #define TEST_DIR_ROUTER_ID_2 5 diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index 7cae45f13..1d4a36d7f 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -30,7 +30,6 @@ #include "feature/nodelist/nodelist.h" #include "feature/client/entrynodes.h" #include "feature/dirparse/authcert_parse.h" -#include "feature/dirparse/routerparse.h" #include "feature/nodelist/networkstatus.h" #include "core/proto/proto_http.h" #include "lib/geoip/geoip.h" diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 295586c69..b67c9fae5 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -26,7 +26,6 @@ #include "feature/nodelist/networkstatus.h" #include "core/or/policies.h" #include "feature/nodelist/routerlist.h" -#include "feature/dirparse/routerparse.h" #include "feature/nodelist/routerset.h" #include "app/config/statefile.h" diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index b386ad529..67af2fd48 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -34,7 +34,6 @@ #include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerset.h" #include "feature/dirparse/authcert_parse.h" -#include "feature/dirparse/routerparse.h" #include "feature/dirparse/ns_parse.h" #include "feature/dirauth/shared_random.h" #include "app/config/statefile.h" diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c index 397a4ceb5..8a7fb95cc 100644 --- a/src/test/test_shared_random.c +++ b/src/test/test_shared_random.c @@ -20,7 +20,6 @@ #include "feature/nodelist/authcert.h" #include "feature/nodelist/dirlist.h" #include "feature/dirparse/authcert_parse.h" -#include "feature/dirparse/routerparse.h" #include "feature/hs_common/shared_random_client.h" #include "feature/dircommon/voting_schedule.h"

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 12 Oct '18

12 Oct '18

commit 2a646c3c8dff2bb6eec3e01f21e7371eb45760a5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 13:18:26 2018 +0000 Update translations for torcheck_completed --- it/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/it/torcheck.po b/it/torcheck.po index 40f837124..bdfc2dbe1 100644 --- a/it/torcheck.po +++ b/it/torcheck.po @@ -15,13 +15,14 @@ # Mett <okovita(a)autistici.org>, 2015 # Nicholaus <nicholas.carluccio(a)hotmail.it>, 2014 # Ruggero Tonelli <>, 2012 +# Sebastiano Pistore <SebastianoPistore.info(a)protonmail.ch>, 2018 # Spartaco Pragnesco <chap(a)anche.no>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-10-04 00:49+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2018-10-12 12:55+0000\n" +"Last-Translator: Sebastiano Pistore <SebastianoPistore.info(a)protonmail.ch>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -113,4 +114,4 @@ msgid "Run a Relay" msgstr "Gestisci un Relay" msgid "Stay Anonymous" -msgstr "Rimani Anonimo" +msgstr "Rimani anonimo"

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 12 Oct '18

12 Oct '18

commit d8b1050dd14e1a102e4dd671518b5b2cf9dfb6e5 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 13:18:21 2018 +0000 Update translations for torcheck --- it/torcheck.po | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/it/torcheck.po b/it/torcheck.po index 40f837124..bdfc2dbe1 100644 --- a/it/torcheck.po +++ b/it/torcheck.po @@ -15,13 +15,14 @@ # Mett <okovita(a)autistici.org>, 2015 # Nicholaus <nicholas.carluccio(a)hotmail.it>, 2014 # Ruggero Tonelli <>, 2012 +# Sebastiano Pistore <SebastianoPistore.info(a)protonmail.ch>, 2018 # Spartaco Pragnesco <chap(a)anche.no>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2018-10-04 00:49+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2018-10-12 12:55+0000\n" +"Last-Translator: Sebastiano Pistore <SebastianoPistore.info(a)protonmail.ch>\n" "Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -113,4 +114,4 @@ msgid "Run a Relay" msgstr "Gestisci un Relay" msgid "Stay Anonymous" -msgstr "Rimani Anonimo" +msgstr "Rimani anonimo"

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 12 Oct '18

12 Oct '18

commit fac285a5c0feb3949567ee419114fe0a42672373 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 12:48:51 2018 +0000 Update translations for support-portal --- contents+el.po | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/contents+el.po b/contents+el.po index e73c83f7d..5a2467877 100644 --- a/contents+el.po +++ b/contents+el.po @@ -2969,6 +2969,9 @@ msgid "" "authentication, which is a much better security option than IP-based " "reputations." msgstr "" +"Ενδέχεται να μπορείτε να αποφύγετε αυτό το σενάριο αν ο πάροχος σας " +"προσφέρει έλεγχο ταυτότητας 2 παραγόντων, η οποία είναι πολύ καλύτερη " +"επιλογή ασφάλειας από την \"IP-based reputations\"." #: http//localhost/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.title) @@ -2991,6 +2994,8 @@ msgid "" "If you don't see this message, it means that your relay is not reachable " "from the outside." msgstr "" +"Αν δεν βλέπετε αυτό το μήνυμα, σημαίνει ότι ο κόμβος σας δεν είναι " +"προσβάσιμος εξωτερικά." #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -3013,6 +3018,9 @@ msgid "" "browser, because you may accidentally use the other browser for something " "you intended to do using Tor." msgstr "" +"Να είστε προσεκτικοί κατά την εναλλαγή μεταξύ του Tor και ενός λιγότερο " +"ασφαλούς περιηγητή, επειδή μπορεί να χρησιμοποιήσετε κατά λάθος τον άλλο " +"περιηγητή για κάτι που είχατε σκοπό να κάνετε χρησιμοποιώντας τον Tor." #: http//localhost/https/https-1/ #: (content/https/https-1/contents+en.lrquestion.description) @@ -3050,6 +3058,8 @@ msgid "" "Please see the <a href=\"https://noscript.net/faq\">NoScript " "FAQ</a>." msgstr "" +"Παρακαλώ ανατρέξτε στο <a href=\"https://noscript.net/faq\">NoScript " +"FAQ</a>." #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -3063,6 +3073,8 @@ msgid "" "You should re-check your firewalls, check that the IP and ports you " "specified in your torrc are correct, etc." msgstr "" +"Θα πρέπει να ελέγξετε ξανά τα firewalls σας, να ελέγξετε ότι η IP και οι " +"θύρες που έχετε καθορίσει στο torrc σας είναι σωστές, κτλ." #: http//localhost/onionservices/onionservices-2/ #: (content/onionservices/onionservices-2/contents+en.lrquestion.description)

1 0

[tor-browser-spec/master] Fix typo in onion location proposal
by gk＠torproject.org 12 Oct '18

12 Oct '18

commit 1582a35eb10c20c24bcfd008edea75d2803bbe0e Author: Georg Koppen <gk(a)torproject.org> Date: Fri Oct 12 11:04:47 2018 +0000 Fix typo in onion location proposal Found by Rusty Bird, thanks. --- proposals/100-onion-location-header.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/100-onion-location-header.txt b/proposals/100-onion-location-header.txt index 23a4450..0820968 100644 --- a/proposals/100-onion-location-header.txt +++ b/proposals/100-onion-location-header.txt @@ -89,7 +89,7 @@ Ticket: #21952 bandwidth needlessly if it's also served to non-Tor clients. Hence websites with lots of client traffic are encouraged to use tools that detect Tor users and only serve the header to them (e.g. tordnsel). Website operators - should be aware that tools like tordnsel have false positive potential (they + should be aware that tools like tordnsel have false negative potential (they might treat Tor users as non-Tor users) which will result in not sending them the Onion-Location header.

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 12 Oct '18

12 Oct '18

commit c506e9fbf0ae434beb88e07c483f7118267b780a Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 12 09:18:52 2018 +0000 Update translations for support-portal --- contents+el.po | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/contents+el.po b/contents+el.po index 592a15f97..e73c83f7d 100644 --- a/contents+el.po +++ b/contents+el.po @@ -2809,6 +2809,10 @@ msgid "" "correctly: even a small mistake will stop Tor Browser from being able to " "reach the site." msgstr "" +"Αν δεν μπορείτε να συνδεθείτε στην υπηρεσία onion που χρειάζεστε, " +"βεβαιωθείτε ότι έχετε εισάγει σωστά τη διεύθυνση onion 16 χαρακτήρων ή τη " +"νεότερη μορφή 56 χαρακτήρων: ακόμα και ένα μικρό λάθος θα εμποδίσει τον Tor " +"Browser να βρει την ιστοσελίδα. " #: http//localhost/censorship/ #: (content/censorship/contents+en.lrtopic.seo_slug) @@ -2819,6 +2823,8 @@ msgstr "λογοκρισία" #: (content/misc/misc-2/contents+en.lrquestion.title) msgid "Why don't you prevent bad people from doing bad things when using Tor?" msgstr "" +"Γιατί δεν εμποδίζετε τους κακούς ανθρώπους να κάνουν κακά πράγματα όταν " +"χρησιμοποιούν το Tor;" #: http//localhost/misc/misc-5/ #: (content/misc/misc-5/contents+en.lrquestion.description) @@ -2872,6 +2878,8 @@ msgid "" "* Note that your operating system’s standard \"Uninstall\" utility is not " "used." msgstr "" +"* Σημειώστε ότι η συνηθισμένη λειτουργία \"Απεγκατάσταση\" του λειτουργικού " +"σας συστήματος δεν χρησιμοποιείται." #: http//localhost/operators/operators-1/ #: (content/operators/operators-1/contents+en.lrquestion.description) @@ -2895,7 +2903,7 @@ msgstr "ContactInfo 0xFFFFFFFF Random Person <nobody AT example dot com>" #: http//localhost/misc/misc-9/ #: (content/misc/misc-9/contents+en.lrquestion.title) msgid "I'm having a problem updating or using Vidalia." -msgstr "" +msgstr "Έχω πρόβλημα με την ενημέρωση ή τη χρήση του Vidalia." #: http//localhost/tbb/tbb-20/ #: (content/tbb/tbb-20/contents+en.lrquestion.description) @@ -2905,6 +2913,8 @@ msgid "" "One of the most common issues that causes connection errors in Tor Browser " "is an incorrect system clock." msgstr "" +"Ένα από τα πιο συνηθισμένα ζητήματα που προκαλεί σφάλματα σύνδεσης στον Tor " +"Browser είναι ένα λανθασμένο ρολόι συστήματος." #: http//localhost/tbb/tbb-2/ (content/tbb/tbb-2/contents+en.lrquestion.title) msgid "Why is the first IP address in my relay circuit always the same?" @@ -2937,6 +2947,9 @@ msgid "" "procedure for account recovery, or contacting the operators and explaining " "the situation." msgstr "" +"Ο μόνος τρόπος για να επιλυθεί αυτό είναι να ακολουθήσετε τη διαδικασία που " +"προτείνεται στην ιστοσελίδα για την επαναφορά λογαριασμού, ή να " +"επικοινωνήσετε με τους διαχειριστές της και να εξηγήσετε την κατάσταση." #: http//localhost/connecting/connecting-1/ #: (content/connecting/connecting-1/contents+en.lrquestion.description) @@ -2945,6 +2958,9 @@ msgid "" "<a href=\"https://tb-manual.torproject.org/en-" "US/troubleshooting.html\">Tor Browser manual</a>." msgstr "" +"Αν αυτό δεν διορθώσει το πρόβλημα, ανατρέξτε στη σελίδα αντιμετώπισης " +"προβλημάτων στο <a href=\"https://tb-manual.torproject.org/en-" +"US/troubleshooting.html\">εγχειρίδιο του Tor Browser</a>." #: http//localhost/tbb/tbb-30/ #: (content/tbb/tbb-30/contents+en.lrquestion.description)

1 0