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

[ooni-probe/master] Implement unittests for InputFile
by art＠torproject.org 28 Feb '14

28 Feb '14

commit b3ce859ec0dab4d116fc810e3dc7884a036224a5 Author: Arturo Filastò <art(a)fuffa.org> Date: Tue Jan 28 23:16:01 2014 +0100 Implement unittests for InputFile --- ooni/deck.py | 12 +++++++---- ooni/tests/test_deck.py | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 60 insertions(+), 4 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index 260f8b4..ebf2a18 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -14,9 +14,9 @@ import json from hashlib import sha256 class InputFile(object): - def __init__(self, input_hash): + def __init__(self, input_hash, base_path=config.inputs_directory): self.id = input_hash - cache_path = os.path.join(config.inputs_directory, input_hash) + cache_path = os.path.join(base_path, input_hash) self.cached_file = cache_path self.cached_descriptor = cache_path + '.desc' @@ -81,20 +81,24 @@ def nettest_to_path(path): raise e.NetTestNotFound(path) class Deck(InputFile): - def __init__(self, deck_hash=None, deckFile=None): + def __init__(self, deck_hash=None, + deckFile=None, + decks_directory=config.decks_directory): self.id = deck_hash self.bouncer = None self.netTestLoaders = [] self.inputs = [] self.testHelpers = {} + self.decksDirectory = decks_directory + self.deckHash = deck_hash if deckFile: self.loadDeck(deckFile) @property def cached_file(self): - return os.path.join(config.decks_directory, self.deckHash) + return os.path.join(self.decksDirectory, self.deckHash) @property def cached_descriptor(self): diff --git a/ooni/tests/test_deck.py b/ooni/tests/test_deck.py new file mode 100644 index 0000000..627bad9 --- /dev/null +++ b/ooni/tests/test_deck.py @@ -0,0 +1,52 @@ +import os + +from twisted.trial import unittest + +from hashlib import sha256 +from ooni.deck import InputFile + +dummy_deck_content = """- options: + collector: null + help: 0 + logfile: null + no-default-reporter: 0 + parallelism: null + pcapfile: null + reportfile: null + resume: 0 + subargs: [] + test_file: some_dummy_test + testdeck: null +""" + +class TestInputFile(unittest.TestCase): + def test_file_cached(self): + file_hash = sha256(dummy_deck_content).hexdigest() + input_file = InputFile(file_hash, base_path='.') + with open(file_hash, 'w+') as f: + f.write(dummy_deck_content) + assert input_file.fileCached + + def test_file_invalid_hash(self): + invalid_hash = 'a'*64 + with open(invalid_hash, 'w+') as f: + f.write("b"*100) + input_file = InputFile(invalid_hash, base_path='.') + self.assertRaises(AssertionError, input_file.verify) + + def test_save_descriptor(self): + descriptor = { + 'name': 'spam', + 'id': 'spam', + 'version': 'spam', + 'author': 'spam', + 'date': 'spam', + 'description': 'spam' + } + file_id = 'a'*64 + input_file = InputFile(file_id, base_path='.') + input_file.load(descriptor) + input_file.save() + assert os.path.isfile(file_id) + + assert input_file.descriptorCached

1 0

[ooni-probe/master] Make the deck code easier to unittest.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit ea26c9544457a79076292c6810de44c48e83983e Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 17:14:27 2014 +0100 Make the deck code easier to unittest. Move the importing of input and deck inside to avoid circular dependencies --- ooni/deck.py | 21 +++++++++++---------- ooni/oonibclient.py | 5 ++++- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/ooni/deck.py b/ooni/deck.py index ebf2a18..8212c3d 100644 --- a/ooni/deck.py +++ b/ooni/deck.py @@ -1,5 +1,6 @@ #-*- coding: utf-8 -*- +from ooni.oonibclient import OONIBClient from ooni.nettest import NetTestLoader from ooni.settings import config from ooni.utils import log @@ -85,15 +86,16 @@ class Deck(InputFile): deckFile=None, decks_directory=config.decks_directory): self.id = deck_hash - self.bouncer = None + self.bouncer = '' self.netTestLoaders = [] self.inputs = [] self.testHelpers = {} - self.decksDirectory = decks_directory + self.oonibclient = OONIBClient(self.bouncer) + self.decksDirectory = decks_directory self.deckHash = deck_hash - + if deckFile: self.loadDeck(deckFile) @property @@ -106,7 +108,7 @@ class Deck(InputFile): def loadDeck(self, deckFile): with open(deckFile) as f: - self.deckHash = sha256(f.read()) + self.deckHash = sha256(f.read()).hexdigest() f.seek(0) test_deck = yaml.safe_load(f) @@ -151,8 +153,8 @@ class Deck(InputFile): @defer.inlineCallbacks def lookupTestHelpers(self): - from ooni.oonibclient import OONIBClient - oonibclient = OONIBClient(self.bouncer) + self.oonibclient.address = self.bouncer + required_test_helpers = [] requires_collector = [] for net_test_loader in self.netTestLoaders: @@ -168,7 +170,7 @@ class Deck(InputFile): if not required_test_helpers and not requires_collector: defer.returnValue(None) - response = yield oonibclient.lookupTestHelpers(required_test_helpers) + response = yield self.oonibclient.lookupTestHelpers(required_test_helpers) for net_test_loader in self.netTestLoaders: log.msg("Setting collector and test helpers for %s" % net_test_loader.testDetails['test_name']) @@ -193,15 +195,14 @@ class Deck(InputFile): @defer.inlineCallbacks def fetchAndVerifyNetTestInput(self, net_test_loader): """ fetch and verify a single NetTest's inputs """ - from ooni.oonibclient import OONIBClient log.debug("Fetching and verifying inputs") for i in net_test_loader.inputFiles: if 'url' in i: log.debug("Downloading %s" % i['url']) - oonibclient = OONIBClient(i['address']) + self.oonibclient.address = i['address'] try: - input_file = yield oonibclient.downloadInput(i['hash']) + input_file = yield self.oonibclient.downloadInput(i['hash']) except: raise e.UnableToLoadDeckInput diff --git a/ooni/oonibclient.py b/ooni/oonibclient.py index 1fa2e5b..af4328b 100644 --- a/ooni/oonibclient.py +++ b/ooni/oonibclient.py @@ -6,7 +6,6 @@ from hashlib import sha256 from twisted.internet import defer, reactor from twisted.internet.endpoints import TCP4ClientEndpoint -from ooni.deck import Deck, InputFile from ooni import errors as e from ooni.settings import config from ooni.utils import log @@ -117,6 +116,7 @@ class OONIBClient(object): pass def getInput(self, input_hash): + from ooni.deck import InputFile input_file = InputFile(input_hash) if input_file.descriptorCached: return defer.succeed(input_file) @@ -140,6 +140,7 @@ class OONIBClient(object): return self.queryBackend('GET', '/input') def downloadInput(self, input_hash): + from ooni.deck import InputFile input_file = InputFile(input_hash) if input_file.fileCached: @@ -169,6 +170,7 @@ class OONIBClient(object): return self.queryBackend('GET', '/deck') def getDeck(self, deck_hash): + from ooni.deck import Deck deck = Deck(deck_hash) if deck.descriptorCached: return defer.succeed(deck) @@ -190,6 +192,7 @@ class OONIBClient(object): return d def downloadDeck(self, deck_hash): + from ooni.deck import Deck deck = Deck(deck_hash) if deck.fileCached: return defer.succeed(deck)

1 0

[ooni-probe/master] Check if config.probe_ip is set.
by art＠torproject.org 28 Feb '14

28 Feb '14

commit c79f159e82aae1630765a1e198c6cf27971a018b Author: Arturo Filastò <art(a)fuffa.org> Date: Thu Jan 30 17:14:41 2014 +0100 Check if config.probe_ip is set. --- ooni/nettest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ooni/nettest.py b/ooni/nettest.py index 526de5d..ca831eb 100644 --- a/ooni/nettest.py +++ b/ooni/nettest.py @@ -239,7 +239,7 @@ class NetTestLoader(object): from ooni import __version__ as software_version client_geodata = {} - if config.probe_ip.address and (config.privacy.includeip or \ + if config.probe_ip and config.probe_ip.address and (config.privacy.includeip or \ config.privacy.includeasn or \ config.privacy.includecountry or \ config.privacy.includecity):

1 0

[tor/master] whitespace fix
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 0b7a66fac76445087651a1dd2d171bf043c9f345 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 28 08:57:29 2014 -0500 whitespace fix --- src/or/routerlist.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 2db7272..d636a1e 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -2280,7 +2280,6 @@ smartlist_choose_node_by_bandwidth(const smartlist_t *sl, bandwidths[i].dbl *= guard_weight; else if (is_exit) bandwidths[i].dbl *= exit_weight; - } }

1 0

[tor/master] Tighten router_write_fingerprint impl
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 25c0435aa577400a024c1514d545037b73f5a0ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 26 10:52:20 2014 -0500 Tighten router_write_fingerprint impl --- src/or/router.c | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index b7d96ea..2b58de8 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -691,13 +691,14 @@ router_initialize_tls_context(void) static int router_write_fingerprint(int hashed) { - char *keydir, *cp; + char *keydir = NULL, *cp = NULL; const char *fname = hashed ? "hashed-fingerprint" : "fingerprint"; char fingerprint[FINGERPRINT_LEN+1]; const or_options_t *options = get_options(); - /*nickname<space>fp\n\0 */ - char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3]; + char *fingerprint_line = NULL; + int result = -1; + keydir = get_datadir_fname(fname); log_info(LD_GENERAL,"Dumping %sfingerprint to \"%s\"...", hashed ? "hashed " : "", keydir); @@ -705,45 +706,39 @@ router_write_fingerprint(int hashed) if (crypto_pk_get_fingerprint(get_server_identity_key(), fingerprint, 0) < 0) { log_err(LD_GENERAL,"Error computing fingerprint"); - tor_free(keydir); - return -1; + goto done; } } else { if (crypto_pk_get_hashed_fingerprint(get_server_identity_key(), fingerprint) < 0) { log_err(LD_GENERAL,"Error computing hashed fingerprint"); - tor_free(keydir); - return -1; + goto done; } } - tor_assert(strlen(options->Nickname) <= MAX_NICKNAME_LEN); - if (tor_snprintf(fingerprint_line, sizeof(fingerprint_line), - "%s %s\n",options->Nickname, fingerprint) < 0) { - log_err(LD_GENERAL,"Error writing %sfingerprint line", - hashed ? "hashed " : ""); - tor_free(keydir); - return -1; - } + + tor_asprintf(&fingerprint_line, "%s %s\n", options->Nickname, fingerprint); + /* Check whether we need to write the (hashed-)fingerprint file. */ - cp = NULL; - if (file_status(keydir) == FN_FILE) - cp = read_file_to_str(keydir, 0, NULL); + + cp = read_file_to_str(keydir, RFTS_IGNORE_MISSING, NULL); if (!cp || strcmp(cp, fingerprint_line)) { if (write_str_to_file(keydir, fingerprint_line, 0)) { log_err(LD_FS, "Error writing %sfingerprint line to file", hashed ? "hashed " : ""); - tor_free(keydir); - tor_free(cp); - return -1; + goto done; } } - tor_free(cp); - tor_free(keydir); log_notice(LD_GENERAL, "Your Tor %s identity key fingerprint is '%s %s'", hashed ? "bridge's hashed" : "server's", options->Nickname, fingerprint); - return 0; + + result = 0; + done: + tor_free(cp); + tor_free(keydir); + tor_free(fingerprint_line); + return result; } /** Initialize all OR private keys, and the TLS context, as necessary.

1 0

[tor/master] Unit tests for pk fingerprint functions
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 0be9e6099b4ca5597459ce1a9561812a8e7343e0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 26 11:15:43 2014 -0500 Unit tests for pk fingerprint functions --- src/test/test_crypto.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 00b8693..1fda334 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -509,6 +509,56 @@ test_crypto_pk(void) tor_free(encoded); } +static void +test_crypto_pk_fingerprints(void *arg) +{ + crypto_pk_t *pk = NULL; + char encoded[512]; + char d[DIGEST_LEN], d2[DIGEST_LEN]; + char fingerprint[FINGERPRINT_LEN+1]; + int n; + unsigned i; + char *mem_op_hex_tmp=NULL; + + (void)arg; + + pk = pk_generate(1); + tt_assert(pk); + n = crypto_pk_asn1_encode(pk, encoded, sizeof(encoded)); + tt_int_op(n, >, 0); + tt_int_op(n, >, 128); + tt_int_op(n, <, 256); + + /* Is digest as expected? */ + crypto_digest(d, encoded, n); + tt_int_op(0, ==, crypto_pk_get_digest(pk, d2)); + test_memeq(d, d2, DIGEST_LEN); + + /* Is fingerprint right? */ + tt_int_op(0, ==, crypto_pk_get_fingerprint(pk, fingerprint, 0)); + tt_int_op(strlen(fingerprint), ==, DIGEST_LEN * 2); + test_memeq_hex(d, fingerprint); + + /* Are spaces right? */ + tt_int_op(0, ==, crypto_pk_get_fingerprint(pk, fingerprint, 1)); + for (i = 4; i < strlen(fingerprint); i += 5) { + tt_int_op(fingerprint[i], ==, ' '); + } + tor_strstrip(fingerprint, " "); + tt_int_op(strlen(fingerprint), ==, DIGEST_LEN * 2); + test_memeq_hex(d, fingerprint); + + /* Now hash again and check crypto_pk_get_hashed_fingerprint. */ + crypto_digest(d2, d, sizeof(d)); + tt_int_op(0, ==, crypto_pk_get_hashed_fingerprint(pk, fingerprint)); + tt_int_op(strlen(fingerprint), ==, DIGEST_LEN * 2); + test_memeq_hex(d2, fingerprint); + + done: + crypto_pk_free(pk); + tor_free(mem_op_hex_tmp); +} + /** Sanity check for crypto pk digests */ static void test_crypto_digests(void) @@ -1234,6 +1284,7 @@ struct testcase_t crypto_tests[] = { { "aes_EVP", test_crypto_aes, TT_FORK, &pass_data, (void*)"evp" }, CRYPTO_LEGACY(sha), CRYPTO_LEGACY(pk), + { "pk_fingerprints", test_crypto_pk_fingerprints, TT_FORK, NULL, NULL }, CRYPTO_LEGACY(digests), CRYPTO_LEGACY(dh), CRYPTO_LEGACY(s2k),

1 0

[tor/master] Unit tests for test_routerkeys_write_fingerprint
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 886d4be14977f6033442161901a6cdd2ad0a5076 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Feb 26 13:42:21 2014 -0500 Unit tests for test_routerkeys_write_fingerprint --- src/or/router.c | 2 +- src/or/router.h | 1 + src/test/include.am | 1 + src/test/test.c | 2 ++ src/test/test_routerkeys.c | 84 ++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 89 insertions(+), 1 deletion(-) diff --git a/src/or/router.c b/src/or/router.c index 2b58de8..6fa9f65 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -688,7 +688,7 @@ router_initialize_tls_context(void) * it to 'fingerprint' (or 'hashed-fingerprint'). Return 0 on success, or * -1 if Tor should die, */ -static int +STATIC int router_write_fingerprint(int hashed) { char *keydir = NULL, *cp = NULL; diff --git a/src/or/router.h b/src/or/router.h index 74b673f..6307246 100644 --- a/src/or/router.h +++ b/src/or/router.h @@ -147,6 +147,7 @@ smartlist_t *router_get_all_orports(const routerinfo_t *ri); #ifdef ROUTER_PRIVATE /* Used only by router.c and test.c */ STATIC void get_platform_str(char *platform, size_t len); +STATIC int router_write_fingerprint(int hashed); #endif #endif diff --git a/src/test/include.am b/src/test/include.am index 5f978b5..e7aebac 100644 --- a/src/test/include.am +++ b/src/test/include.am @@ -35,6 +35,7 @@ src_test_test_SOURCES = \ src/test/test_options.c \ src/test/test_pt.c \ src/test/test_replay.c \ + src/test/test_routerkeys.c \ src/test/test_socks.c \ src/test/test_util.c \ src/test/test_config.c \ diff --git a/src/test/test.c b/src/test/test.c index 45f7c09..2529e29 100644 --- a/src/test/test.c +++ b/src/test/test.c @@ -1629,6 +1629,7 @@ extern struct testcase_t logging_tests[]; extern struct testcase_t backtrace_tests[]; extern struct testcase_t hs_tests[]; extern struct testcase_t nodelist_tests[]; +extern struct testcase_t routerkeys_tests[]; static struct testgroup_t testgroups[] = { { "", test_array }, @@ -1654,6 +1655,7 @@ static struct testgroup_t testgroups[] = { { "control/", controller_event_tests }, { "hs/", hs_tests }, { "nodelist/", nodelist_tests }, + { "routerkeys/", routerkeys_tests }, END_OF_GROUPS }; diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c new file mode 100644 index 0000000..ff52a7e --- /dev/null +++ b/src/test/test_routerkeys.c @@ -0,0 +1,84 @@ +/* Copyright (c) 2001-2004, Roger Dingledine. + * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. + * Copyright (c) 2007-2013, The Tor Project, Inc. */ +/* See LICENSE for licensing information */ + +#include "orconfig.h" +#define ROUTER_PRIVATE +#include "or.h" +#include "config.h" +#include "router.h" +#include "util.h" +#include "crypto.h" + +#include "test.h" + +static void +test_routerkeys_write_fingerprint(void *arg) +{ + crypto_pk_t *key = pk_generate(2); + or_options_t *options = get_options_mutable(); + const char *ddir = get_fname("write_fingerprint"); + char *cp = NULL, *cp2 = NULL; + char fp[FINGERPRINT_LEN+1]; + + (void)arg; + + tt_assert(key); + + options->ORPort_set = 1; /* So that we can get the server ID key */ + options->DataDirectory = tor_strdup(ddir); + options->Nickname = tor_strdup("haflinger"); + set_server_identity_key(key); + set_client_identity_key(crypto_pk_dup_key(key)); + + check_private_dir(ddir, CPD_CREATE, NULL); + tt_int_op(crypto_pk_cmp_keys(get_server_identity_key(),key),==,0); + + /* Write fingerprint file */ + tt_int_op(0, ==, router_write_fingerprint(0)); + cp = read_file_to_str(get_fname("write_fingerprint/fingerprint"), + 0, NULL); + crypto_pk_get_fingerprint(key, fp, 0); + tor_asprintf(&cp2, "haflinger %s\n", fp); + tt_str_op(cp, ==, cp2); + tor_free(cp); + tor_free(cp2); + + /* Write hashed-fingerprint file */ + tt_int_op(0, ==, router_write_fingerprint(1)); + cp = read_file_to_str(get_fname("write_fingerprint/hashed-fingerprint"), + 0, NULL); + crypto_pk_get_hashed_fingerprint(key, fp); + tor_asprintf(&cp2, "haflinger %s\n", fp); + tt_str_op(cp, ==, cp2); + tor_free(cp); + tor_free(cp2); + + /* Replace outdated file */ + write_str_to_file(get_fname("write_fingerprint/hashed-fingerprint"), + "junk goes here", 0); + tt_int_op(0, ==, router_write_fingerprint(1)); + cp = read_file_to_str(get_fname("write_fingerprint/hashed-fingerprint"), + 0, NULL); + crypto_pk_get_hashed_fingerprint(key, fp); + tor_asprintf(&cp2, "haflinger %s\n", fp); + tt_str_op(cp, ==, cp2); + tor_free(cp); + tor_free(cp2); + + done: + crypto_pk_free(key); + set_client_identity_key(NULL); + tor_free(cp); + tor_free(cp2); +} + +#define TEST(name, flags) \ + { #name , test_routerkeys_ ## name, (flags), NULL, NULL } + +struct testcase_t routerkeys_tests[] = { + TEST(write_fingerprint, TT_FORK), + END_OF_TESTCASES +}; +

1 0

[tor/master] Merge branch 'bug10884_squashed'
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 273f536d7217df4faf38f937af9395748a5f513a Merge: 043329e 886d4be Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 28 08:54:50 2014 -0500 Merge branch 'bug10884_squashed' changes/bug10884 | 5 +++ doc/tor.1.txt | 4 ++ src/common/crypto.c | 22 ++++++++++ src/common/crypto.h | 1 + src/or/main.c | 2 + src/or/router.c | 95 +++++++++++++++++++++++++++++--------------- src/or/router.h | 1 + src/test/include.am | 1 + src/test/test.c | 2 + src/test/test_crypto.c | 51 ++++++++++++++++++++++++ src/test/test_routerkeys.c | 84 +++++++++++++++++++++++++++++++++++++++ 11 files changed, 235 insertions(+), 33 deletions(-)

1 0

[tor/master] Write hashed bridge fingerprint to logs and to disk.
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 3ca5fe81e33ab7848c848b683bffe12e743398f3 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Feb 26 10:44:55 2014 +0100 Write hashed bridge fingerprint to logs and to disk. Implements #10884. --- changes/bug10884 | 5 +++ doc/tor.1.txt | 4 +++ src/common/crypto.c | 22 ++++++++++++ src/common/crypto.h | 1 + src/or/main.c | 2 ++ src/or/router.c | 100 ++++++++++++++++++++++++++++++++++----------------- 6 files changed, 101 insertions(+), 33 deletions(-) diff --git a/changes/bug10884 b/changes/bug10884 new file mode 100644 index 0000000..815d893 --- /dev/null +++ b/changes/bug10884 @@ -0,0 +1,5 @@ + o Minor features: + - Bridges write the SHA1 digest of their identity key fingerprint to + notice-level logs and to hashed-fingerprint, so that bridge + operators can look up their bridge in Globe and similar tools. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f2960af..dc67889 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2305,6 +2305,10 @@ __DataDirectory__**/keys/***:: __DataDirectory__**/fingerprint**:: Only used by servers. Holds the fingerprint of the server's identity key. +__DataDirectory__**/hashed-fingerprint**:: + Only used by bridges. Holds the hashed fingerprint of the bridge's + identity key. (That is, the hash of the hash of the identity key.) + __DataDirectory__**/approved-routers**:: Only for naming authoritative directory servers (see **NamingAuthoritativeDirectory**). This file lists nickname to identity diff --git a/src/common/crypto.c b/src/common/crypto.c index 49dc55a..80d8351 100644 --- a/src/common/crypto.c +++ b/src/common/crypto.c @@ -1374,6 +1374,28 @@ crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out, int add_space) return 0; } +/** Given a private or public key pk, put a hashed fingerprint of + * the public key into fp_out (must have at least FINGERPRINT_LEN+1 + * bytes of space). Return 0 on success, -1 on failure. + * + * Hashed fingerprints are computed as the SHA1 digest of the SHA1 digest + * of the ASN.1 encoding of the public key, converted to hexadecimal, in + * upper case. + */ +int +crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out) +{ + char digest[DIGEST_LEN], hashed_digest[DIGEST_LEN]; + if (crypto_pk_get_digest(pk, digest)) { + return -1; + } + if (crypto_digest(hashed_digest, digest, DIGEST_LEN)) { + return -1; + } + base16_encode(fp_out, FINGERPRINT_LEN + 1, hashed_digest, DIGEST_LEN); + return 0; +} + /* symmetric crypto */ /** Return a pointer to the key set for the cipher in env. diff --git a/src/common/crypto.h b/src/common/crypto.h index 3666d5f..4f0f1c1 100644 --- a/src/common/crypto.h +++ b/src/common/crypto.h @@ -182,6 +182,7 @@ crypto_pk_t *crypto_pk_asn1_decode(const char *str, size_t len); int crypto_pk_get_digest(crypto_pk_t *pk, char *digest_out); int crypto_pk_get_all_digests(crypto_pk_t *pk, digests_t *digests_out); int crypto_pk_get_fingerprint(crypto_pk_t *pk, char *fp_out,int add_space); +int crypto_pk_get_hashed_fingerprint(crypto_pk_t *pk, char *fp_out); /* symmetric crypto */ const char *crypto_cipher_get_key(crypto_cipher_t *env); diff --git a/src/or/main.c b/src/or/main.c index 5404e96..b0529cd 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2764,6 +2764,8 @@ sandbox_init_filter(void) get_datadir_fname2("keys", "secret_id_key.tmp"), 1, get_datadir_fname("fingerprint"), 1, get_datadir_fname("fingerprint.tmp"), 1, + get_datadir_fname("hashed-fingerprint"), 1, + get_datadir_fname("hashed-fingerprint.tmp"), 1, get_datadir_fname("cached-consensus"), 1, get_datadir_fname("cached-consensus.tmp"), 1, "/etc/resolv.conf", 0, diff --git a/src/or/router.c b/src/or/router.c index c22f4c3..b7d96ea 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -684,6 +684,68 @@ router_initialize_tls_context(void) (unsigned int)lifetime); } +/** Compute fingerprint (or hashed fingerprint if hashed is 1) and write + * it to 'fingerprint' (or 'hashed-fingerprint'). Return 0 on success, or + * -1 if Tor should die, + */ +static int +router_write_fingerprint(int hashed) +{ + char *keydir, *cp; + const char *fname = hashed ? "hashed-fingerprint" : + "fingerprint"; + char fingerprint[FINGERPRINT_LEN+1]; + const or_options_t *options = get_options(); + /*nickname<space>fp\n\0 */ + char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3]; + keydir = get_datadir_fname(fname); + log_info(LD_GENERAL,"Dumping %sfingerprint to \"%s\"...", + hashed ? "hashed " : "", keydir); + if (!hashed) { + if (crypto_pk_get_fingerprint(get_server_identity_key(), + fingerprint, 0) < 0) { + log_err(LD_GENERAL,"Error computing fingerprint"); + tor_free(keydir); + return -1; + } + } else { + if (crypto_pk_get_hashed_fingerprint(get_server_identity_key(), + fingerprint) < 0) { + log_err(LD_GENERAL,"Error computing hashed fingerprint"); + tor_free(keydir); + return -1; + } + } + tor_assert(strlen(options->Nickname) <= MAX_NICKNAME_LEN); + if (tor_snprintf(fingerprint_line, sizeof(fingerprint_line), + "%s %s\n",options->Nickname, fingerprint) < 0) { + log_err(LD_GENERAL,"Error writing %sfingerprint line", + hashed ? "hashed " : ""); + tor_free(keydir); + return -1; + } + /* Check whether we need to write the (hashed-)fingerprint file. */ + cp = NULL; + if (file_status(keydir) == FN_FILE) + cp = read_file_to_str(keydir, 0, NULL); + if (!cp || strcmp(cp, fingerprint_line)) { + if (write_str_to_file(keydir, fingerprint_line, 0)) { + log_err(LD_FS, "Error writing %sfingerprint line to file", + hashed ? "hashed " : ""); + tor_free(keydir); + tor_free(cp); + return -1; + } + } + tor_free(cp); + tor_free(keydir); + + log_notice(LD_GENERAL, "Your Tor %s identity key fingerprint is '%s %s'", + hashed ? "bridge's hashed" : "server's", options->Nickname, + fingerprint); + return 0; +} + /** Initialize all OR private keys, and the TLS context, as necessary. * On OPs, this only initializes the tls context. Return 0 on success, * or -1 if Tor should die. @@ -692,14 +754,10 @@ int init_keys(void) { char *keydir; - char fingerprint[FINGERPRINT_LEN+1]; - /*nickname<space>fp\n\0 */ - char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3]; const char *mydesc; crypto_pk_t *prkey; char digest[DIGEST_LEN]; char v3_digest[DIGEST_LEN]; - char *cp; const or_options_t *options = get_options(); dirinfo_type_t type; time_t now = time(NULL); @@ -889,40 +947,16 @@ init_keys(void) } } - /* 5. Dump fingerprint to 'fingerprint' */ - keydir = get_datadir_fname("fingerprint"); - log_info(LD_GENERAL,"Dumping fingerprint to \"%s\"...",keydir); - if (crypto_pk_get_fingerprint(get_server_identity_key(), - fingerprint, 0) < 0) { - log_err(LD_GENERAL,"Error computing fingerprint"); - tor_free(keydir); + /* 5. Dump fingerprint and possibly hashed fingerprint to files. */ + if (router_write_fingerprint(0)) { + log_err(LD_FS, "Error writing fingerprint to file"); return -1; } - tor_assert(strlen(options->Nickname) <= MAX_NICKNAME_LEN); - if (tor_snprintf(fingerprint_line, sizeof(fingerprint_line), - "%s %s\n",options->Nickname, fingerprint) < 0) { - log_err(LD_GENERAL,"Error writing fingerprint line"); - tor_free(keydir); + if (!public_server_mode(options) && router_write_fingerprint(1)) { + log_err(LD_FS, "Error writing hashed fingerprint to file"); return -1; } - /* Check whether we need to write the fingerprint file. */ - cp = NULL; - if (file_status(keydir) == FN_FILE) - cp = read_file_to_str(keydir, 0, NULL); - if (!cp || strcmp(cp, fingerprint_line)) { - if (write_str_to_file(keydir, fingerprint_line, 0)) { - log_err(LD_FS, "Error writing fingerprint line to file"); - tor_free(keydir); - tor_free(cp); - return -1; - } - } - tor_free(cp); - tor_free(keydir); - log_notice(LD_GENERAL, - "Your Tor server's identity key fingerprint is '%s %s'", - options->Nickname, fingerprint); if (!authdir_mode(options)) return 0; /* 6. [authdirserver only] load approved-routers file */

1 0

[chutney/master] support setting tor and tor-gencert path by environment variables
by nickm＠torproject.org 28 Feb '14

28 Feb '14

commit 735cb2dd6740bc7ecb5b3c5810fc6bf2e2be7597 Author: Qingping Hou <dave2008713(a)gmail.com> Date: Mon Feb 17 23:25:24 2014 -0500 support setting tor and tor-gencert path by environment variables --- lib/chutney/TorNet.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index 74ec087..fed80c4 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -485,7 +485,8 @@ DEFAULTS = { 'bridge' : False, 'connlimit' : 60, 'net_base_dir' : 'net', - 'tor' : 'tor', + 'tor' : os.environ.get('CHUTNEY_TOR', 'tor'), + 'tor-gencert' : os.environ.get('CHUTNEY_TOR_GENCERT', None), 'auth_cert_lifetime' : 12, 'ip' : '127.0.0.1', 'ipv6_addr' : None, @@ -547,7 +548,10 @@ class TorEnviron(chutney.Templating.Environ): return "test%03d%s"%(my['nodenum'], my['tag']) def _get_tor_gencert(self, my): - return my['tor']+"-gencert" + if my['tor-gencert']: + return my['tor-gencert'] + else: + return '{0}-gencert'.format(my['tor']) def _get_auth_passphrase(self, my): return self['nick'] # OMG TEH SECURE!

1 0