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

[translation/tails-greeter] Update translations for tails-greeter
by translation＠torproject.org 13 Oct '14

13 Oct '14

commit 96377ddb9b9739c40739a5c58fdbae87817c12c2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 13 20:15:33 2014 +0000 Update translations for tails-greeter --- lt/lt.po | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lt/lt.po b/lt/lt.po index ea49a05..116fdf6 100644 --- a/lt/lt.po +++ b/lt/lt.po @@ -3,14 +3,15 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# rb <hello(a)rolandas.me>, 2013 +# Rasa Sakarviene <gerarasa(a)gmail.com>, 2014 +# Rolandas Barysas <hello(a)rolandas.me>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-05-28 22:33+0200\n" -"PO-Revision-Date: 2014-05-29 08:53+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"POT-Creation-Date: 2014-10-08 21:10+0200\n" +"PO-Revision-Date: 2014-10-13 20:11+0000\n" +"Last-Translator: Rasa Sakarviene <gerarasa(a)gmail.com>\n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/torproject/language/lt/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -138,7 +139,7 @@ msgstr "" #: ../glade/optionswindow.glade.h:19 msgid "Network configuration" -msgstr "" +msgstr "Tinklo konfigūravimas" #: ../glade/optionswindow.glade.h:20 msgid "" @@ -197,7 +198,7 @@ msgid "" "%(stderr)s" msgstr "" -#: ../tailsgreeter/langpanel.py:125 ../tailsgreeter/langpanel.py:152 -#: ../tailsgreeter/langpanel.py:185 +#: ../tailsgreeter/langpanel.py:123 ../tailsgreeter/langpanel.py:150 +#: ../tailsgreeter/langpanel.py:183 msgid "Other..." msgstr "Kita..."

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 13 Oct '14

13 Oct '14

commit e22ecdd932638038c4b0d899bceb32b631b2bc74 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 13 20:15:19 2014 +0000 Update translations for https_everywhere --- lt/https-everywhere.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lt/https-everywhere.dtd b/lt/https-everywhere.dtd index 67e5389..35e9f0b 100644 --- a/lt/https-everywhere.dtd +++ b/lt/https-everywhere.dtd @@ -38,7 +38,7 @@ <!ENTITY https-everywhere.popup.title "HTTPS Everywhere 4.0development.11 notification"> <!ENTITY https-everywhere.popup.paragraph1 "Oj. Jus naudojotės stabilia HTTPS Everywhere versija, bet mes galėjome, paskutiniame leidime, atsitiktinai atnaujinti ją į vystomąją versiją ."> <!ENTITY https-everywhere.popup.paragraph2 "Ar norėtumėte gryžti prie stabilios versijos?"> -<!ENTITY https-everywhere.popup.paragraph3 "We'd love it if you continued using our development release and helped us make HTTPS Everywhere better! You might find there are a few more bugs here and there, which you can report to https-everywhere(a)eff.org. Sorry about the inconvenience, and thank you for using HTTPS Everywhere."> +<!ENTITY https-everywhere.popup.paragraph3 "Mes džiaugtumės, jei jūs ir toliau naudotumėtės mūsų plėtros leidiniais ir padėtumėt mums pagerinti HTTPS Everywhere. Jūs galite rasti šen bei ten klaidų, apie kurias prašome pranešti adresu https-everywhere(a)eff.org. Atsiprašome už nepatogumus ir dėkojame, kad naudojatės HTTPS Everywhere."> <!ENTITY https-everywhere.popup.keep "Pasilikti vystomąją versiją"> <!ENTITY https-everywhere.popup.revert "Parsisiųsti naujaujią stabilią versiją">

1 0

[tor-browser-bundle/master] Add stable release channel to updater config.
by mikeperry＠torproject.org 13 Oct '14

13 Oct '14

commit 9e94ab8ddf44d51e5c30250f4308159114ad0c53 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Oct 13 12:27:57 2014 -0700 Add stable release channel to updater config. --- tools/update-responses/config.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/update-responses/config.yml b/tools/update-responses/config.yml index 8b5475a..15843b6 100644 --- a/tools/update-responses/config.yml +++ b/tools/update-responses/config.yml @@ -5,8 +5,13 @@ build_targets: win32: WINNT_x86-gcc3 osx32: Darwin_x86-gcc3 channels: + release: 4.0 alpha: 4.0-alpha-3 versions: + 4.0: + platformVersion: 31.2.0 + detailsURL: https://www.torproject.org/projects/torbrowser.html.en + download_url: https://www.torproject.org/dist/torbrowser/4.0 4.0-alpha-3: platformVersion: 24.8.1 detailsURL: https://www.torproject.org/projects/torbrowser.html.en

1 0

[tor-browser-spec/master] Add instructions for the update responses script for the updater
by mikeperry＠torproject.org 13 Oct '14

13 Oct '14

commit 9dd8f679981f8bade2049c01a8379a773071a86c Author: Nicolas Vigier <boklm(a)torproject.org> Date: Mon Oct 13 21:22:24 2014 +0200 Add instructions for the update responses script for the updater --- processes/ReleaseProcess | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/processes/ReleaseProcess b/processes/ReleaseProcess index d04a08b..ee30773 100644 --- a/processes/ReleaseProcess +++ b/processes/ReleaseProcess @@ -77,3 +77,11 @@ # See https://blog.torproject.org/blog/tor-browser-352-released for now # Don't forget to link to Mozilla's security advisories if this is a security # update, or Nadim will yell at you. + +#. Generate and upload new update responses for the updater + cd tor-browser-bundle/tools/update-responses + vim config.yml + # add the new version in 'versions' and to one of the channels + # detailsURL can be a link to the blog post + ./update_responses + torsocks rsync -av htdocs/ www-master.torproject.org:/srv/www-master.torproject.org/htdocs/dist/torbro…

1 0

[tor/master] Define a strnlen replacement on platforms (win32) that lack it
by nickm＠torproject.org 13 Oct '14

13 Oct '14

commit 21fe945ebd7183685bf5bbcd80bf6b1b946eb841 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 13 14:59:17 2014 -0400 Define a strnlen replacement on platforms (win32) that lack it Right now this is only needed for test_util_format_time_interval, so define it as a static function. We can move it into compat later if we need to. --- configure.ac | 1 + src/test/test_util.c | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/configure.ac b/configure.ac index c0523e1..4c7da5d 100644 --- a/configure.ac +++ b/configure.ac @@ -365,6 +365,7 @@ AC_CHECK_FUNCS( socketpair \ strlcat \ strlcpy \ + strnlen \ strptime \ strtok_r \ strtoull \ diff --git a/src/test/test_util.c b/src/test/test_util.c index 8855caf..eb169f4 100644 --- a/src/test/test_util.c +++ b/src/test/test_util.c @@ -2072,6 +2072,17 @@ test_util_sscanf(void *arg) #define tt_char_op(a,op,b) tt_assert_op_type(a,op,b,char,"%c") #define tt_ci_char_op(a,op,b) tt_char_op(tolower(a),op,tolower(b)) +#ifndef HAVE_STRNLEN +static size_t +strnlen(const char *s, size_t len) +{ + const char *p = memchr(s, 0, len); + if (!p) + return len; + return p - s; +} +#endif + static void test_util_format_time_interval(void *arg) {

1 0

[tor/master] Commit the script I used to generate signed ri and ei documents
by nickm＠torproject.org 13 Oct '14

13 Oct '14

commit b42d811718ec9661cf930ee64ce353624faf2be0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Oct 7 12:36:45 2014 -0400 Commit the script I used to generate signed ri and ei documents --- scripts/codegen/makedesc.py | 218 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 218 insertions(+) diff --git a/scripts/codegen/makedesc.py b/scripts/codegen/makedesc.py new file mode 100644 index 0000000..e0b2aed --- /dev/null +++ b/scripts/codegen/makedesc.py @@ -0,0 +1,218 @@ +#!/usr/bin/python +# Copyright 2014, The Tor Project, Inc. +# See LICENSE for license information + +# This is a kludgey python script that uses ctypes and openssl to sign +# router descriptors and extrainfo documents and put all the keys in +# the right places. There are examples at the end of the file. + +# I've used this to make inputs for unit tests. I wouldn't suggest +# using it for anything else. + +import base64 +import binascii +import ctypes +import ctypes.util +import hashlib + +crypt = ctypes.CDLL(ctypes.util.find_library('crypto')) +BIO_s_mem = crypt.BIO_s_mem +BIO_s_mem.argtypes = [] +BIO_s_mem.restype = ctypes.c_void_p + +BIO_new = crypt.BIO_new +BIO_new.argtypes = [ctypes.c_void_p] +BIO_new.restype = ctypes.c_void_p + +RSA_generate_key = crypt.RSA_generate_key +RSA_generate_key.argtypes = [ctypes.c_int, ctypes.c_ulong, ctypes.c_void_p, ctypes.c_void_p] +RSA_generate_key.restype = ctypes.c_void_p + +RSA_private_encrypt = crypt.RSA_private_encrypt +RSA_private_encrypt.argtypes = [ + ctypes.c_int, ctypes.c_char_p, ctypes.c_void_p, ctypes.c_void_p, ctypes.c_int ] +RSA_private_encrypt.restype = ctypes.c_int + +i2d_RSAPublicKey = crypt.i2d_RSAPublicKey +i2d_RSAPublicKey.argtypes = [ + ctypes.c_void_p, ctypes.POINTER(ctypes.c_char_p) +] +i2d_RSAPublicKey.restype = ctypes.c_int + +def b64(x): + x = base64.b64encode(x) + res = [] + for i in xrange(0, len(x), 64): + res.append(x[i:i+64]+"\n") + return "".join(res) + +def bio_extract(bio): + buf = ctypes.c_char_p() + length = crypt.BIO_ctrl(bio, 3, 0, ctypes.byref(buf)) + return ctypes.string_at(buf, length) + +def make_key(e=65537): + rsa = crypt.RSA_generate_key(1024, e, None, None) + bio = BIO_new(BIO_s_mem()) + crypt.PEM_write_bio_RSAPublicKey(bio, rsa) + pem = bio_extract(bio).rstrip() + crypt.BIO_free(bio) + + buf = ctypes.create_string_buffer(1024) + pBuf = ctypes.c_char_p(ctypes.addressof(buf)) + n = crypt.i2d_RSAPublicKey(rsa, ctypes.byref(pBuf)) + s = buf.raw[:n] + digest = hashlib.sha1(s).digest() + + return (rsa,pem,digest) + +def signdesc(body, args_out=None): + rsa, ident_pem, id_digest = make_key() + _, onion_pem, _ = make_key() + + hexdigest = binascii.b2a_hex(id_digest).upper() + fingerprint = " ".join(hexdigest[i:i+4] for i in range(0,len(hexdigest),4)) + + MAGIC = "<<<<<<MAGIC>>>>>>" + args = { + "RSA-IDENTITY" : ident_pem, + "ONION-KEY" : onion_pem, + "FINGERPRINT" : fingerprint, + "FINGERPRINT-NOSPACE" : hexdigest, + "RSA-SIGNATURE" : MAGIC + } + if args_out: + args_out.update(args) + body = body.format(**args) + + idx = body.rindex("\nrouter-signature") + end_of_sig = body.index("\n", idx+1) + + signed_part = body[:end_of_sig+1] + + digest = hashlib.sha1(signed_part).digest() + assert len(digest) == 20 + + buf = ctypes.create_string_buffer(1024) + n = RSA_private_encrypt(20, digest, buf, rsa, 1) + sig = buf.raw[:n] + + sig = """-----BEGIN SIGNATURE----- +%s +-----END SIGNATURE-----""" % b64(sig).rstrip() + body = body.replace(MAGIC, sig) + + return body.rstrip() + +def emit_ri(name, body, args_out=None): + print "const char %s[] ="%name + body = "\n".join(line.rstrip() for line in body.split("\n"))+"\n" + b = signdesc(body, args_out) + for line in b.split("\n"): + print ' "%s\\n"'%line + print " ;" + +def emit_ei(name, body): + args = { 'NAME' : name } + emit_ri(name, body, args) + args['key'] = "\n".join( + ' "%s\\n"'%line for line in args['RSA-IDENTITY'].split("\n")) + print """ +const char {NAME}_fp[] = "{FINGERPRINT-NOSPACE}"; +const char {NAME}_key[] = +{key};""".format(**args) + +if 0: + emit_ri("minimal", + """\ +router fred 127.0.0.1 9001 0 9002 +signing-key +{RSA-IDENTITY} +onion-key +{ONION-KEY} +published 2014-10-05 12:00:00 +bandwidth 1000 1000 1000 +reject *:* +router-signature +{RSA-SIGNATURE} +""") + +if 0: + emit_ri("maximal", + """\ +router fred 127.0.0.1 9001 0 9002 +signing-key +{RSA-IDENTITY} +onion-key +{ONION-KEY} +published 2014-10-05 12:00:00 +bandwidth 1000 1000 1000 +reject 127.0.0.1:* +accept *:80 +reject *:* +ipv6-policy accept 80,100,101 +ntor-onion-key s7rSohmz9SXn8WWh1EefTHIsWePthsEntQi0WL+ScVw +uptime 1000 +hibernating 0 +unrecognized-keywords are just dandy in this format +platform Tor 0.2.4.23 on a Banana PC Jr 6000 Series +contact O.W.Jones +fingerprint {FINGERPRINT} +read-history 900 1,2,3,4 +write-history 900 1,2,3,4 +extra-info-digest AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA +hidden-service-dir +allow-single-hop-exits +family $AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA $BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB +caches-extra-info +or-address [::1:2:3:4]:9999 +or-address 127.0.0.99:10000 +opt fred is a fine router +router-signature +{RSA-SIGNATURE} +""") + +if 0: + emit_ei("maximal", +"""\ +extra-info bob {FINGERPRINT-NOSPACE} +published 2014-10-05 20:07:00 +opt foobarbaz +read-history 900 1,2,3 +write-history 900 1,2,3 +dirreq-v2-ips 1 +dirreq-v3-ips 100 +dirreq-v3-reqs blahblah +dirreq-v2-share blahblah +dirreq-v3-share blahblah +dirreq-v2-resp djfkdj +dirreq-v3-resp djfkdj +dirreq-v2-direct-dl djfkdj +dirreq-v3-direct-dl djfkdj +dirreq-v2-tunneled-dl djfkdj +dirreq-v3-tunneled-dl djfkdj +dirreq-stats-end foobar +entry-ips jfsdfds +entry-stats-end ksdflkjfdkf +cell-stats-end FOO +cell-processed-cells FOO +cell-queued-cells FOO +cell-time-in-queue FOO +cell-circuits-per-decile FOO +exit-stats-end FOO +exit-kibibytes-written FOO +exit-kibibytes-read FOO +exit-streams-opened FOO +router-signature +{RSA-SIGNATURE} +""") + +if 0: + emit_ei("minimal", +"""\ +extra-info bob {FINGERPRINT-NOSPACE} +published 2014-10-05 20:07:00 +router-signature +{RSA-SIGNATURE} +""") +

1 0

[tor/master] Bugfixes on bug11243 fix for the not-added cases and tests
by nickm＠torproject.org 13 Oct '14

13 Oct '14

commit 223d354e344ad3d07766b7c19e1841342c270ad2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 13 14:11:27 2014 -0400 Bugfixes on bug11243 fix for the not-added cases and tests 1. The test that adds things to the cache needs to set the clock back so that the descriptors it adds are valid. 2. We split ROUTER_NOT_NEW into ROUTER_TOO_OLD, so that we can distinguish "already had it" from "rejected because of old published date". 3. We make extrainfo_insert() return a was_router_added_t, and we make its caller use it correctly. This is probably redundant with the extrainfo_is_bogus flag. --- src/or/or.h | 3 ++- src/or/routerlist.c | 39 ++++++++++++++++++++++++--------------- src/or/routerlist.h | 15 +++++++++++++-- src/test/test_dir.c | 6 ++++-- 4 files changed, 43 insertions(+), 20 deletions(-) diff --git a/src/or/or.h b/src/or/or.h index 2f1307d..a33ad80 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4994,7 +4994,8 @@ typedef enum was_router_added_t { ROUTER_NOT_IN_CONSENSUS = -3, ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS = -4, ROUTER_AUTHDIR_REJECTS = -5, - ROUTER_WAS_NOT_WANTED = -6 + ROUTER_WAS_NOT_WANTED = -6, + ROUTER_WAS_TOO_OLD = -7, } was_router_added_t; /********************************* routerparse.c ************************/ diff --git a/src/or/routerlist.c b/src/or/routerlist.c index e851845..b3b1979 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2937,12 +2937,12 @@ routerlist_insert(routerlist_t *rl, routerinfo_t *ri) } /** Adds the extrainfo_t ei to the routerlist rl, if there is a - * corresponding router in rl-\>routers or rl-\>old_routers. Return true iff - * we actually inserted ei. Free ei if it isn't inserted. */ -MOCK_IMPL(STATIC int, + * corresponding router in rl-\>routers or rl-\>old_routers. Return the status + * of inserting ei. Free ei if it isn't inserted. */ +MOCK_IMPL(STATIC was_router_added_t, extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)) { - int r = 0; + was_router_added_t r; routerinfo_t *ri = rimap_get(rl->identity_map, ei->cache_info.identity_digest); signed_descriptor_t *sd = @@ -2956,9 +2956,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)) if (!ri) { /* This router is unknown; we can't even verify the signature. Give up.*/ + r = ROUTER_NOT_IN_CONSENSUS; goto done; } if (routerinfo_incompatible_with_extrainfo(ri, ei, sd, NULL)) { + r = (sd->extrainfo_is_bogus) ? ROUTER_BAD_EI : ROUTER_NOT_IN_CONSENSUS; goto done; } @@ -2968,7 +2970,7 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)) ei_tmp = eimap_set(rl->extra_info_map, ei->cache_info.signed_descriptor_digest, ei); - r = 1; + r = ROUTER_ADDED_SUCCESSFULLY; if (ei_tmp) { rl->extrainfo_store.bytes_dropped += ei_tmp->cache_info.signed_descriptor_len; @@ -2976,7 +2978,7 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)) } done: - if (r == 0) + if (r != ROUTER_ADDED_SUCCESSFULLY) extrainfo_free(ei); #ifdef DEBUG_ROUTERLIST @@ -3302,7 +3304,7 @@ routerlist_reset_warnings(void) MOCK_IMPL(int, router_descriptor_is_older_than,(const routerinfo_t *router, int seconds)) { - return router->cache_info.published_on < time(NULL) - seconds; + return router->cache_info.published_on < approx_time() - seconds; } /** Add router to the routerlist, if we don't already have it. Replace @@ -3477,7 +3479,7 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg, router_descriptor_is_older_than(router, OLD_ROUTER_DESC_MAX_AGE)) { *msg = "Router descriptor was really old."; routerinfo_free(router); - return ROUTER_WAS_NOT_NEW; + return ROUTER_WAS_TOO_OLD; } /* We haven't seen a router with this identity before. Add it to the end of @@ -3498,21 +3500,18 @@ was_router_added_t router_add_extrainfo_to_routerlist(extrainfo_t *ei, const char **msg, int from_cache, int from_fetch) { - int inserted; + was_router_added_t inserted; (void)from_fetch; if (msg) *msg = NULL; /*XXXX023 Do something with msg */ inserted = extrainfo_insert(router_get_routerlist(), ei); - if (inserted && !from_cache) + if (WRA_WAS_ADDED(inserted) && !from_cache) signed_desc_append_to_journal(&ei->cache_info, &routerlist->extrainfo_store); - if (inserted) - return ROUTER_ADDED_SUCCESSFULLY; - else - return ROUTER_BAD_EI; + return inserted; } /** Sorting helper: return <0, 0, or >0 depending on whether the @@ -3912,7 +3911,7 @@ router_load_routers_from_string(const char *s, const char *eos, smartlist_add(changed, ri); routerlist_descriptors_added(changed, from_cache); smartlist_clear(changed); - } else if (WRA_WAS_REJECTED(r)) { + } else if (WRA_NEVER_DOWNLOADABLE(r)) { download_status_t *dl_status; dl_status = router_get_dl_status_by_descriptor_digest(d); if (dl_status) { @@ -3977,6 +3976,8 @@ router_load_extrainfo_from_string(const char *s, const char *eos, SMARTLIST_FOREACH_BEGIN(extrainfo_list, extrainfo_t *, ei) { was_router_added_t added = router_add_extrainfo_to_routerlist(ei, &msg, from_cache, !from_cache); + uint8_t d[DIGEST_LEN]; + memcpy(d, ei->cache_info.signed_descriptor_digest, DIGEST_LEN); if (WRA_WAS_ADDED(added) && requested_fingerprints) { char fp[HEX_DIGEST_LEN+1]; base16_encode(fp, sizeof(fp), descriptor_digests ? @@ -3988,6 +3989,14 @@ router_load_extrainfo_from_string(const char *s, const char *eos, * so long as we would have wanted them anyway. Since we always fetch * all the extrainfos we want, and we never actually act on them * inside Tor, this should be harmless. */ + } else if (WRA_NEVER_DOWNLOADABLE(added)) { + signed_descriptor_t *sd = router_get_by_extrainfo_digest((char*)d); + if (sd) { + log_info(LD_GENERAL, "Marking extrainfo with descriptor %s as " + "unparseable, and therefore undownloadable", + hex_str((char*)d,DIGEST_LEN)); + download_status_mark_impossible(&sd->ei_dl_status); + } } } SMARTLIST_FOREACH_END(ei); diff --git a/src/or/routerlist.h b/src/or/routerlist.h index 950320a..a0f43d4 100644 --- a/src/or/routerlist.h +++ b/src/or/routerlist.h @@ -100,6 +100,7 @@ void routerlist_reset_warnings(void); static int WRA_WAS_ADDED(was_router_added_t s); static int WRA_WAS_OUTDATED(was_router_added_t s); static int WRA_WAS_REJECTED(was_router_added_t s); +static int WRA_NEVER_DOWNLOADABLE(was_router_added_t s); /** Return true iff the outcome code in s indicates that the descriptor * was added. It might still be necessary to check whether the descriptor * generator should be notified. @@ -116,7 +117,8 @@ WRA_WAS_ADDED(was_router_added_t s) { */ static INLINE int WRA_WAS_OUTDATED(was_router_added_t s) { - return (s == ROUTER_WAS_NOT_NEW || + return (s == ROUTER_WAS_TOO_OLD || + s == ROUTER_WAS_NOT_NEW || s == ROUTER_NOT_IN_CONSENSUS || s == ROUTER_NOT_IN_CONSENSUS_OR_NETWORKSTATUS); } @@ -126,6 +128,14 @@ static INLINE int WRA_WAS_REJECTED(was_router_added_t s) { return (s == ROUTER_AUTHDIR_REJECTS); } +/** Return true iff the outcome code in s indicates that the descriptor + * was flat-out rejected. */ +static INLINE int WRA_NEVER_DOWNLOADABLE(was_router_added_t s) +{ + return (s == ROUTER_AUTHDIR_REJECTS || + s == ROUTER_BAD_EI || + s == ROUTER_WAS_TOO_OLD); +} was_router_added_t router_add_to_routerlist(routerinfo_t *router, const char **msg, int from_cache, @@ -216,7 +226,8 @@ STATIC void scale_array_elements_to_u64(u64_dbl_t *entries, int n_entries, MOCK_DECL(int, router_descriptor_is_older_than, (const routerinfo_t *router, int seconds)); -MOCK_DECL(STATIC int, extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei)); +MOCK_DECL(STATIC was_router_added_t, extrainfo_insert, + (routerlist_t *rl, extrainfo_t *ei)); #endif diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 0499251..e03efbe 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -618,6 +618,8 @@ test_dir_load_routers(void *arg) MOCK(router_get_dl_status_by_descriptor_digest, mock_router_get_dl_status); + update_approx_time(1412510400); + smartlist_add(chunks, tor_strdup(EX_RI_MINIMAL)); smartlist_add(chunks, tor_strdup(EX_RI_BAD_FINGERPRINT)); smartlist_add(chunks, tor_strdup(EX_RI_BAD_SIG2)); @@ -708,12 +710,12 @@ mock_get_by_ei_desc_digest(const char *d) } static smartlist_t *mock_ei_insert_list = NULL; -static int +static was_router_added_t mock_ei_insert(routerlist_t *rl, extrainfo_t *ei) { (void) rl; smartlist_add(mock_ei_insert_list, ei); - return 1; + return ROUTER_ADDED_SUCCESSFULLY; } static void

1 0

[tor/master] Note that parse-list functions may add duplicate 'invalid' entries.
by nickm＠torproject.org 13 Oct '14

13 Oct '14

commit 500c4063643dd20e0197ad71ab1bebcf251850a1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 13 14:15:56 2014 -0400 Note that parse-list functions may add duplicate 'invalid' entries. --- src/or/routerparse.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index c7ebba2..2858c4c 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -912,7 +912,8 @@ find_start_of_next_router_or_extrainfo(const char **s_ptr, * isn't SAVED_NOWHERE, remember the offset of each descriptor. * * Returns 0 on success and -1 on failure. Adds a digest to - * invalid_digests_out for every entry that was unparseable or invalid. + * invalid_digests_out for every entry that was unparseable or + * invalid. (This may cause duplicate entries.) */ int router_parse_list_from_string(const char **s, const char *eos, @@ -4040,7 +4041,7 @@ find_start_of_next_microdesc(const char *s, const char *eos) * Return all newly parsed microdescriptors in a newly allocated * smartlist_t. If invalid_disgests_out is provided, add a SHA256 * microdesc digest to it for every microdesc that we found to be badly - * formed. */ + * formed. (This may cause duplicates) */ smartlist_t * microdescs_parse_from_string(const char *s, const char *eos, int allow_annotations,

1 0

[tor/master] Add comments to can_dl_again usage
by nickm＠torproject.org 13 Oct '14

13 Oct '14

commit 9df61d7028936257538b15d1d3f8e04a370edb09 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 13 14:22:52 2014 -0400 Add comments to can_dl_again usage --- src/or/routerparse.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 2858c4c..76eef78 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -1100,6 +1100,8 @@ router_parse_entry_from_string(const char *s, const char *end, size_t prepend_len = prepend_annotations ? strlen(prepend_annotations) : 0; int ok = 1; memarea_t *area = NULL; + /* Do not set this to '1' until we have parsed everything that we intend to + * parse that's covered by the hash. */ int can_dl_again = 0; tor_assert(!allow_annotations || !prepend_annotations); @@ -1413,6 +1415,7 @@ router_parse_entry_from_string(const char *s, const char *end, goto err; } + /* We've checked everything that's covered by the hash. */ can_dl_again = 1; if (check_signature_token(digest, DIGEST_LEN, tok, router->identity_pkey, 0, "router descriptor") < 0) @@ -1466,6 +1469,8 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, routerinfo_t *router = NULL; memarea_t *area = NULL; const char *s_dup = s; + /* Do not set this to '1' until we have parsed everything that we intend to + * parse that's covered by the hash. */ int can_dl_again = 0; if (!end) { @@ -1526,6 +1531,7 @@ extrainfo_parse_entry_from_string(const char *s, const char *end, goto err; } + /* We've checked everything that's covered by the hash. */ can_dl_again = 1; if (routermap &&

1 0

[tor/master] Use symbolic constants for statuses in microdescs_add_to_cache.
by nickm＠torproject.org 13 Oct '14

13 Oct '14

commit 39795e117f55fc951ea9ba0802ce5ce91e65ae33 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 13 13:43:07 2014 -0400 Use symbolic constants for statuses in microdescs_add_to_cache. Suggested by Andrea in her review of 11243. --- src/or/microdesc.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 8a2ece2..14faa2e 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -147,6 +147,10 @@ microdescs_add_to_cache(microdesc_cache_t *cache, int no_save, time_t listed_at, smartlist_t *requested_digests256) { + void * const DIGEST_REQUESTED = (void*)1; + void * const DIGEST_RECEIVED = (void*)2; + void * const DIGEST_INVALID = (void*)3; + smartlist_t *descriptors, *added; const int allow_annotations = (where != SAVED_NOWHERE); smartlist_t *invalid_digests = smartlist_new(); @@ -162,15 +166,16 @@ microdescs_add_to_cache(microdesc_cache_t *cache, digestmap_t *requested; /* XXXX actually we should just use a digest256map */ requested = digestmap_new(); - /* Set requested[d] to 1 for every md we requested. */ + /* Set requested[d] to DIGEST_REQUESTED for every md we requested. */ SMARTLIST_FOREACH(requested_digests256, const char *, cp, - digestmap_set(requested, cp, (void*)1)); - /* Set requested[d] to 3 for every md we requested which we will never be - * able to parse. Remove the ones we didn't request from invalid_digests. + digestmap_set(requested, cp, DIGEST_REQUESTED)); + /* Set requested[d] to DIGEST_INVALID for every md we requested which we + * will never be able to parse. Remove the ones we didn't request from + * invalid_digests. */ SMARTLIST_FOREACH_BEGIN(invalid_digests, char *, cp) { if (digestmap_get(requested, cp)) { - digestmap_set(requested, cp, (void*)3); + digestmap_set(requested, cp, DIGEST_INVALID); } else { tor_free(cp); SMARTLIST_DEL_CURRENT(invalid_digests, cp); @@ -181,7 +186,7 @@ microdescs_add_to_cache(microdesc_cache_t *cache, */ SMARTLIST_FOREACH_BEGIN(descriptors, microdesc_t *, md) { if (digestmap_get(requested, md->digest)) { - digestmap_set(requested, md->digest, (void*)2); + digestmap_set(requested, md->digest, DIGEST_RECEIVED); } else { log_fn(LOG_PROTOCOL_WARN, LD_DIR, "Received non-requested microdesc"); microdesc_free(md); @@ -192,7 +197,7 @@ microdescs_add_to_cache(microdesc_cache_t *cache, */ SMARTLIST_FOREACH_BEGIN(requested_digests256, char *, cp) { void *status = digestmap_get(requested, cp); - if (status == (void*)2 || status == (void*)3) { + if (status == DIGEST_RECEIVED || status == DIGEST_INVALID) { tor_free(cp); SMARTLIST_DEL_CURRENT(requested_digests256, cp); }

1 0