2006-02-09 06:46:49 +01:00
|
|
|
/* Copyright (c) 2001 Matej Pfajfar.
|
|
|
|
* Copyright (c) 2001-2004, Roger Dingledine.
|
2007-12-12 22:09:01 +01:00
|
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
2011-01-03 17:50:39 +01:00
|
|
|
* Copyright (c) 2007-2011, The Tor Project, Inc. */
|
2003-12-06 06:54:04 +01:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
|
2007-04-11 15:18:25 +02:00
|
|
|
#define ROUTER_PRIVATE
|
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
#include "or.h"
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
#include "circuitbuild.h"
|
2010-07-22 09:46:23 +02:00
|
|
|
#include "circuitlist.h"
|
2010-07-22 10:03:40 +02:00
|
|
|
#include "circuituse.h"
|
2010-07-22 10:22:51 +02:00
|
|
|
#include "config.h"
|
2010-07-22 10:32:52 +02:00
|
|
|
#include "connection.h"
|
2010-07-22 11:35:09 +02:00
|
|
|
#include "control.h"
|
2010-07-22 11:54:50 +02:00
|
|
|
#include "directory.h"
|
2010-07-22 12:09:49 +02:00
|
|
|
#include "dirserv.h"
|
2010-07-22 12:24:25 +02:00
|
|
|
#include "dns.h"
|
2010-07-21 14:38:52 +02:00
|
|
|
#include "geoip.h"
|
2010-07-22 12:30:46 +02:00
|
|
|
#include "hibernate.h"
|
2010-07-23 19:58:06 +02:00
|
|
|
#include "main.h"
|
2010-09-21 07:03:29 +02:00
|
|
|
#include "networkstatus.h"
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
#include "nodelist.h"
|
2010-07-23 20:51:25 +02:00
|
|
|
#include "policies.h"
|
2010-07-23 21:53:11 +02:00
|
|
|
#include "relay.h"
|
2010-07-23 22:57:20 +02:00
|
|
|
#include "rephist.h"
|
2010-07-21 16:17:10 +02:00
|
|
|
#include "router.h"
|
2010-07-21 17:08:11 +02:00
|
|
|
#include "routerlist.h"
|
2010-07-23 23:23:43 +02:00
|
|
|
#include "routerparse.h"
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/**
|
|
|
|
* \file router.c
|
|
|
|
* \brief OR functionality, including key maintenance, generating
|
2004-05-05 02:30:43 +02:00
|
|
|
* and uploading server descriptors, retrying OR connections.
|
2004-05-09 18:47:25 +02:00
|
|
|
**/
|
2004-05-05 02:30:43 +02:00
|
|
|
|
2005-01-10 06:10:22 +01:00
|
|
|
extern long stats_n_seconds_working;
|
2003-12-06 06:54:04 +01:00
|
|
|
|
|
|
|
/************************************************************/
|
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/*****
|
|
|
|
* Key management: ORs only.
|
|
|
|
*****/
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Private keys for this OR. There is also an SSL key managed by tortls.c.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2004-06-05 03:50:35 +02:00
|
|
|
static tor_mutex_t *key_lock=NULL;
|
2007-02-02 21:06:43 +01:00
|
|
|
static time_t onionkey_set_at=0; /**< When was onionkey last changed? */
|
2007-02-16 21:39:37 +01:00
|
|
|
/** Current private onionskin decryption key: used to decode CREATE cells. */
|
2003-12-06 06:54:04 +01:00
|
|
|
static crypto_pk_env_t *onionkey=NULL;
|
2009-05-27 23:55:51 +02:00
|
|
|
/** Previous private onionskin decryption key: used to decode CREATE cells
|
2007-02-24 08:50:38 +01:00
|
|
|
* generated by clients that have an older version of our descriptor. */
|
2004-04-25 00:17:50 +02:00
|
|
|
static crypto_pk_env_t *lastonionkey=NULL;
|
2010-10-04 07:38:53 +02:00
|
|
|
/** Private server "identity key": used to sign directory info and TLS
|
2007-02-16 21:39:37 +01:00
|
|
|
* certificates. Never changes. */
|
2010-10-04 07:38:53 +02:00
|
|
|
static crypto_pk_env_t *server_identitykey=NULL;
|
|
|
|
/** Digest of server_identitykey. */
|
|
|
|
static char server_identitykey_digest[DIGEST_LEN];
|
|
|
|
/** Private client "identity key": used to sign bridges' and clients'
|
|
|
|
* outbound TLS certificates. Regenerated on startup and on IP address
|
|
|
|
* change. */
|
|
|
|
static crypto_pk_env_t *client_identitykey=NULL;
|
2007-05-22 19:58:25 +02:00
|
|
|
/** Signing key used for v3 directory material; only set for authorities. */
|
|
|
|
static crypto_pk_env_t *authority_signing_key = NULL;
|
|
|
|
/** Key certificate to authenticate v3 directory material; only set for
|
|
|
|
* authorities. */
|
|
|
|
static authority_cert_t *authority_key_certificate = NULL;
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2008-12-23 18:56:31 +01:00
|
|
|
/** For emergency V3 authority key migration: An extra signing key that we use
|
|
|
|
* with our old (obsolete) identity key for a while. */
|
2008-05-12 04:14:01 +02:00
|
|
|
static crypto_pk_env_t *legacy_signing_key = NULL;
|
2008-12-23 18:56:31 +01:00
|
|
|
/** For emergency V3 authority key migration: An extra certificate to
|
|
|
|
* authenticate legacy_signing_key with our obsolete identity key.*/
|
2008-05-12 04:14:01 +02:00
|
|
|
static authority_cert_t *legacy_key_certificate = NULL;
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/* (Note that v3 authorities also have a separate "authority identity key",
|
|
|
|
* but this key is never actually loaded by the Tor process. Instead, it's
|
|
|
|
* used by tor-gencert to sign new signing keys and make new key
|
|
|
|
* certificates. */
|
|
|
|
|
2008-12-18 06:40:57 +01:00
|
|
|
/** Replace the current onion key with <b>k</b>. Does not affect
|
|
|
|
* lastonionkey; to update lastonionkey correctly, call rotate_onion_key().
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2006-12-15 08:04:37 +01:00
|
|
|
static void
|
2005-06-11 20:52:12 +02:00
|
|
|
set_onion_key(crypto_pk_env_t *k)
|
|
|
|
{
|
2004-06-05 03:50:35 +02:00
|
|
|
tor_mutex_acquire(key_lock);
|
2009-12-12 08:07:59 +01:00
|
|
|
crypto_free_pk_env(onionkey);
|
2003-12-06 06:54:04 +01:00
|
|
|
onionkey = k;
|
2004-04-25 00:17:50 +02:00
|
|
|
onionkey_set_at = time(NULL);
|
2004-06-05 03:50:35 +02:00
|
|
|
tor_mutex_release(key_lock);
|
2004-11-13 17:53:48 +01:00
|
|
|
mark_my_descriptor_dirty();
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Return the current onion key. Requires that the onion key has been
|
2004-05-04 20:17:45 +02:00
|
|
|
* loaded or generated. */
|
2005-06-11 20:52:12 +02:00
|
|
|
crypto_pk_env_t *
|
|
|
|
get_onion_key(void)
|
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(onionkey);
|
2003-12-06 06:54:04 +01:00
|
|
|
return onionkey;
|
|
|
|
}
|
|
|
|
|
2008-12-18 06:28:27 +01:00
|
|
|
/** Store a full copy of the current onion key into *<b>key</b>, and a full
|
|
|
|
* copy of the most recent onion key into *<b>last</b>.
|
2005-03-17 13:38:37 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
dup_onion_keys(crypto_pk_env_t **key, crypto_pk_env_t **last)
|
2004-06-05 03:50:35 +02:00
|
|
|
{
|
2004-10-17 00:14:52 +02:00
|
|
|
tor_assert(key);
|
|
|
|
tor_assert(last);
|
2004-06-05 03:50:35 +02:00
|
|
|
tor_mutex_acquire(key_lock);
|
2006-01-17 03:31:04 +01:00
|
|
|
tor_assert(onionkey);
|
2008-12-18 06:28:27 +01:00
|
|
|
*key = crypto_pk_copy_full(onionkey);
|
2004-06-05 03:50:35 +02:00
|
|
|
if (lastonionkey)
|
2008-12-18 06:28:27 +01:00
|
|
|
*last = crypto_pk_copy_full(lastonionkey);
|
2004-06-05 03:50:35 +02:00
|
|
|
else
|
|
|
|
*last = NULL;
|
|
|
|
tor_mutex_release(key_lock);
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Return the time when the onion key was last set. This is either the time
|
2004-05-04 20:17:45 +02:00
|
|
|
* when the process launched, or the time of the most recent key rotation since
|
|
|
|
* the process launched.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
time_t
|
|
|
|
get_onion_key_set_at(void)
|
|
|
|
{
|
2004-04-25 00:17:50 +02:00
|
|
|
return onionkey_set_at;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2010-10-04 07:38:53 +02:00
|
|
|
/** Set the current server identity key to <b>k</b>.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2010-10-04 07:38:53 +02:00
|
|
|
set_server_identity_key(crypto_pk_env_t *k)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2010-10-04 07:38:53 +02:00
|
|
|
crypto_free_pk_env(server_identitykey);
|
|
|
|
server_identitykey = k;
|
|
|
|
crypto_pk_get_digest(server_identitykey, server_identitykey_digest);
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2010-10-21 19:54:12 +02:00
|
|
|
/** Make sure that we have set up our identity keys to match or not match as
|
|
|
|
* appropriate, and die with an assertion if we have not. */
|
|
|
|
static void
|
|
|
|
assert_identity_keys_ok(void)
|
|
|
|
{
|
|
|
|
tor_assert(client_identitykey);
|
|
|
|
if (public_server_mode(get_options())) {
|
|
|
|
/* assert that we have set the client and server keys to be equal */
|
|
|
|
tor_assert(server_identitykey);
|
|
|
|
tor_assert(0==crypto_pk_cmp_keys(client_identitykey, server_identitykey));
|
|
|
|
} else {
|
|
|
|
/* assert that we have set the client and server keys to be unequal */
|
|
|
|
if (server_identitykey)
|
2010-11-21 21:57:22 +01:00
|
|
|
tor_assert(0!=crypto_pk_cmp_keys(client_identitykey,
|
|
|
|
server_identitykey));
|
2010-10-21 19:54:12 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-10-04 07:38:53 +02:00
|
|
|
/** Returns the current server identity key; requires that the key has
|
2010-10-21 19:54:12 +02:00
|
|
|
* been set, and that we are running as a Tor server.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
crypto_pk_env_t *
|
2010-10-04 07:38:53 +02:00
|
|
|
get_server_identity_key(void)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2010-10-04 07:38:53 +02:00
|
|
|
tor_assert(server_identitykey);
|
2010-10-21 19:54:12 +02:00
|
|
|
tor_assert(server_mode(get_options()));
|
|
|
|
assert_identity_keys_ok();
|
2010-10-04 07:38:53 +02:00
|
|
|
return server_identitykey;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2010-10-04 07:38:53 +02:00
|
|
|
/** Return true iff the server identity key has been set. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2010-10-04 07:38:53 +02:00
|
|
|
server_identity_key_is_set(void)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2010-10-04 07:38:53 +02:00
|
|
|
return server_identitykey != NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Set the current client identity key to <b>k</b>.
|
|
|
|
*/
|
|
|
|
void
|
|
|
|
set_client_identity_key(crypto_pk_env_t *k)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2010-10-04 07:38:53 +02:00
|
|
|
crypto_free_pk_env(client_identitykey);
|
|
|
|
client_identitykey = k;
|
|
|
|
}
|
|
|
|
|
2010-10-21 19:53:31 +02:00
|
|
|
/** Returns the current client identity key for use on outgoing TLS
|
|
|
|
* connections; requires that the key has been set.
|
2010-10-04 07:38:53 +02:00
|
|
|
*/
|
|
|
|
crypto_pk_env_t *
|
2010-10-21 19:53:31 +02:00
|
|
|
get_tlsclient_identity_key(void)
|
2010-10-04 07:38:53 +02:00
|
|
|
{
|
|
|
|
tor_assert(client_identitykey);
|
2010-10-21 19:54:12 +02:00
|
|
|
assert_identity_keys_ok();
|
2010-10-04 07:38:53 +02:00
|
|
|
return client_identitykey;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return true iff the client identity key has been set. */
|
|
|
|
int
|
|
|
|
client_identity_key_is_set(void)
|
|
|
|
{
|
|
|
|
return client_identitykey != NULL;
|
2004-11-21 05:19:04 +01:00
|
|
|
}
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/** Return the key certificate for this v3 (voting) authority, or NULL
|
|
|
|
* if we have no such certificate. */
|
2007-05-22 20:52:32 +02:00
|
|
|
authority_cert_t *
|
|
|
|
get_my_v3_authority_cert(void)
|
|
|
|
{
|
|
|
|
return authority_key_certificate;
|
|
|
|
}
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/** Return the v3 signing key for this v3 (voting) authority, or NULL
|
|
|
|
* if we have no such key. */
|
2007-05-22 20:52:32 +02:00
|
|
|
crypto_pk_env_t *
|
|
|
|
get_my_v3_authority_signing_key(void)
|
|
|
|
{
|
|
|
|
return authority_signing_key;
|
|
|
|
}
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** If we're an authority, and we're using a legacy authority identity key for
|
|
|
|
* emergency migration purposes, return the certificate associated with that
|
|
|
|
* key. */
|
2008-05-12 04:14:01 +02:00
|
|
|
authority_cert_t *
|
|
|
|
get_my_v3_legacy_cert(void)
|
|
|
|
{
|
|
|
|
return legacy_key_certificate;
|
|
|
|
}
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** If we're an authority, and we're using a legacy authority identity key for
|
|
|
|
* emergency migration purposes, return that key. */
|
2008-05-12 04:14:01 +02:00
|
|
|
crypto_pk_env_t *
|
|
|
|
get_my_v3_legacy_signing_key(void)
|
|
|
|
{
|
|
|
|
return legacy_signing_key;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Replace the previous onion key with the current onion key, and generate
|
2004-04-25 00:17:50 +02:00
|
|
|
* a new previous onion key. Immediately after calling this function,
|
|
|
|
* the OR should:
|
2004-05-09 18:47:25 +02:00
|
|
|
* - schedule all previous cpuworkers to shut down _after_ processing
|
|
|
|
* pending work. (This will cause fresh cpuworkers to be generated.)
|
|
|
|
* - generate and upload a fresh routerinfo.
|
2004-04-25 00:17:50 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
rotate_onion_key(void)
|
2004-04-25 00:17:50 +02:00
|
|
|
{
|
2007-10-17 18:55:44 +02:00
|
|
|
char *fname, *fname_prev;
|
2004-04-25 00:17:50 +02:00
|
|
|
crypto_pk_env_t *prkey;
|
2006-12-15 08:04:37 +01:00
|
|
|
or_state_t *state = get_or_state();
|
|
|
|
time_t now;
|
2007-10-17 18:55:44 +02:00
|
|
|
fname = get_datadir_fname2("keys", "secret_onion_key");
|
|
|
|
fname_prev = get_datadir_fname2("keys", "secret_onion_key.old");
|
2004-04-25 00:17:50 +02:00
|
|
|
if (!(prkey = crypto_new_pk_env())) {
|
2006-09-30 00:51:47 +02:00
|
|
|
log_err(LD_GENERAL,"Error constructing rotated onion key");
|
2004-04-25 00:17:50 +02:00
|
|
|
goto error;
|
|
|
|
}
|
2004-04-25 05:38:19 +02:00
|
|
|
if (crypto_pk_generate_key(prkey)) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_err(LD_BUG,"Error generating onion key");
|
2004-04-25 00:17:50 +02:00
|
|
|
goto error;
|
|
|
|
}
|
2004-08-09 06:27:13 +02:00
|
|
|
if (file_status(fname) == FN_FILE) {
|
|
|
|
if (replace_file(fname, fname_prev))
|
|
|
|
goto error;
|
|
|
|
}
|
2004-04-25 00:17:50 +02:00
|
|
|
if (crypto_pk_write_private_key_to_filename(prkey, fname)) {
|
2006-09-30 00:33:40 +02:00
|
|
|
log_err(LD_FS,"Couldn't write generated onion key to \"%s\".", fname);
|
2004-04-25 00:17:50 +02:00
|
|
|
goto error;
|
|
|
|
}
|
2006-02-13 11:33:00 +01:00
|
|
|
log_info(LD_GENERAL, "Rotating onion key");
|
2004-06-05 03:50:35 +02:00
|
|
|
tor_mutex_acquire(key_lock);
|
2009-12-12 08:07:59 +01:00
|
|
|
crypto_free_pk_env(lastonionkey);
|
2004-04-25 00:17:50 +02:00
|
|
|
lastonionkey = onionkey;
|
2005-02-11 08:56:10 +01:00
|
|
|
onionkey = prkey;
|
2006-12-15 08:04:37 +01:00
|
|
|
now = time(NULL);
|
|
|
|
state->LastRotatedOnionKey = onionkey_set_at = now;
|
2004-06-05 03:50:35 +02:00
|
|
|
tor_mutex_release(key_lock);
|
2005-02-11 08:56:10 +01:00
|
|
|
mark_my_descriptor_dirty();
|
2006-12-24 03:45:46 +01:00
|
|
|
or_state_mark_dirty(state, get_options()->AvoidDiskWrites ? now+3600 : 0);
|
2007-10-17 18:55:44 +02:00
|
|
|
goto done;
|
2004-04-25 00:17:50 +02:00
|
|
|
error:
|
2006-02-13 11:33:00 +01:00
|
|
|
log_warn(LD_GENERAL, "Couldn't rotate onion key.");
|
2007-12-01 05:40:12 +01:00
|
|
|
if (prkey)
|
|
|
|
crypto_free_pk_env(prkey);
|
2007-10-17 18:55:44 +02:00
|
|
|
done:
|
|
|
|
tor_free(fname);
|
|
|
|
tor_free(fname_prev);
|
2004-04-25 00:17:50 +02:00
|
|
|
}
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/** Try to read an RSA key from <b>fname</b>. If <b>fname</b> doesn't exist
|
|
|
|
* and <b>generate</b> is true, create a new RSA key and save it in
|
|
|
|
* <b>fname</b>. Return the read/created key, or NULL on error. Log all
|
|
|
|
* errors at level <b>severity</b>.
|
|
|
|
*/
|
|
|
|
crypto_pk_env_t *
|
|
|
|
init_key_from_file(const char *fname, int generate, int severity)
|
2003-12-06 06:54:04 +01:00
|
|
|
{
|
|
|
|
crypto_pk_env_t *prkey = NULL;
|
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
if (!(prkey = crypto_new_pk_env())) {
|
2007-05-22 19:58:25 +02:00
|
|
|
log(severity, LD_GENERAL,"Error constructing key");
|
2003-12-06 06:54:04 +01:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2004-11-28 10:05:49 +01:00
|
|
|
switch (file_status(fname)) {
|
2004-11-28 12:39:53 +01:00
|
|
|
case FN_DIR:
|
|
|
|
case FN_ERROR:
|
2007-05-22 19:58:25 +02:00
|
|
|
log(severity, LD_FS,"Can't read key from \"%s\"", fname);
|
2003-12-06 06:54:04 +01:00
|
|
|
goto error;
|
2004-11-28 12:39:53 +01:00
|
|
|
case FN_NOENT:
|
2007-05-22 19:58:25 +02:00
|
|
|
if (generate) {
|
2008-09-01 22:06:26 +02:00
|
|
|
if (!have_lockfile()) {
|
|
|
|
if (try_locking(get_options(), 0)<0) {
|
|
|
|
/* Make sure that --list-fingerprint only creates new keys
|
|
|
|
* if there is no possibility for a deadlock. */
|
|
|
|
log(severity, LD_FS, "Another Tor process has locked \"%s\". Not "
|
|
|
|
"writing any new keys.", fname);
|
|
|
|
/*XXXX The 'other process' might make a key in a second or two;
|
|
|
|
* maybe we should wait for it. */
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
2007-05-22 19:58:25 +02:00
|
|
|
log_info(LD_GENERAL, "No key found in \"%s\"; generating fresh key.",
|
|
|
|
fname);
|
|
|
|
if (crypto_pk_generate_key(prkey)) {
|
|
|
|
log(severity, LD_GENERAL,"Error generating onion key");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (crypto_pk_check_key(prkey) <= 0) {
|
|
|
|
log(severity, LD_GENERAL,"Generated key seems invalid");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
log_info(LD_GENERAL, "Generated key seems valid");
|
|
|
|
if (crypto_pk_write_private_key_to_filename(prkey, fname)) {
|
|
|
|
log(severity, LD_FS,
|
|
|
|
"Couldn't write generated key to \"%s\".", fname);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
log_info(LD_GENERAL, "No key found in \"%s\"", fname);
|
2004-11-28 12:39:53 +01:00
|
|
|
}
|
|
|
|
return prkey;
|
|
|
|
case FN_FILE:
|
|
|
|
if (crypto_pk_read_private_key_from_filename(prkey, fname)) {
|
2007-05-22 19:58:25 +02:00
|
|
|
log(severity, LD_GENERAL,"Error loading private key.");
|
2004-11-28 12:39:53 +01:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
return prkey;
|
|
|
|
default:
|
|
|
|
tor_assert(0);
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (prkey)
|
|
|
|
crypto_free_pk_env(prkey);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** Try to load the vote-signing private key and certificate for being a v3
|
|
|
|
* directory authority, and make sure they match. If <b>legacy</b>, load a
|
|
|
|
* legacy key/cert set for emergency key migration; otherwise load the regular
|
|
|
|
* key/cert set. On success, store them into *<b>key_out</b> and
|
2009-05-27 23:55:51 +02:00
|
|
|
* *<b>cert_out</b> respectively, and return 0. On failure, return -1. */
|
2007-10-17 23:26:19 +02:00
|
|
|
static int
|
2008-05-12 04:14:01 +02:00
|
|
|
load_authority_keyset(int legacy, crypto_pk_env_t **key_out,
|
2008-12-22 18:53:04 +01:00
|
|
|
authority_cert_t **cert_out)
|
2007-05-22 19:58:25 +02:00
|
|
|
{
|
2008-05-12 04:14:01 +02:00
|
|
|
int r = -1;
|
2007-05-22 19:58:25 +02:00
|
|
|
char *fname = NULL, *cert = NULL;
|
|
|
|
const char *eos = NULL;
|
|
|
|
crypto_pk_env_t *signing_key = NULL;
|
|
|
|
authority_cert_t *parsed = NULL;
|
|
|
|
|
2008-05-12 04:14:01 +02:00
|
|
|
fname = get_datadir_fname2("keys",
|
|
|
|
legacy ? "legacy_signing_key" : "authority_signing_key");
|
2007-05-29 19:31:13 +02:00
|
|
|
signing_key = init_key_from_file(fname, 0, LOG_INFO);
|
2007-05-22 19:58:25 +02:00
|
|
|
if (!signing_key) {
|
|
|
|
log_warn(LD_DIR, "No version 3 directory key found in %s", fname);
|
|
|
|
goto done;
|
|
|
|
}
|
2007-10-17 23:26:19 +02:00
|
|
|
tor_free(fname);
|
2008-05-12 04:14:01 +02:00
|
|
|
fname = get_datadir_fname2("keys",
|
|
|
|
legacy ? "legacy_certificate" : "authority_certificate");
|
2007-05-22 19:58:25 +02:00
|
|
|
cert = read_file_to_str(fname, 0, NULL);
|
|
|
|
if (!cert) {
|
|
|
|
log_warn(LD_DIR, "Signing key found, but no certificate found in %s",
|
|
|
|
fname);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
parsed = authority_cert_parse_from_string(cert, &eos);
|
|
|
|
if (!parsed) {
|
|
|
|
log_warn(LD_DIR, "Unable to parse certificate in %s", fname);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
if (crypto_pk_cmp_keys(signing_key, parsed->signing_key) != 0) {
|
|
|
|
log_warn(LD_DIR, "Stored signing key does not match signing key in "
|
|
|
|
"certificate");
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
2009-12-12 08:07:59 +01:00
|
|
|
crypto_free_pk_env(*key_out);
|
|
|
|
authority_cert_free(*cert_out);
|
|
|
|
|
2008-05-12 04:14:01 +02:00
|
|
|
*key_out = signing_key;
|
|
|
|
*cert_out = parsed;
|
|
|
|
r = 0;
|
2007-05-22 19:58:25 +02:00
|
|
|
signing_key = NULL;
|
2008-05-12 04:14:01 +02:00
|
|
|
parsed = NULL;
|
2007-05-22 19:58:25 +02:00
|
|
|
|
|
|
|
done:
|
|
|
|
tor_free(fname);
|
|
|
|
tor_free(cert);
|
2009-12-12 08:07:59 +01:00
|
|
|
crypto_free_pk_env(signing_key);
|
|
|
|
authority_cert_free(parsed);
|
2007-10-17 23:26:19 +02:00
|
|
|
return r;
|
2007-05-22 19:58:25 +02:00
|
|
|
}
|
|
|
|
|
2008-05-12 04:14:01 +02:00
|
|
|
/** Load the v3 (voting) authority signing key and certificate, if they are
|
|
|
|
* present. Return -1 if anything is missing, mismatched, or unloadable;
|
|
|
|
* return 0 on success. */
|
|
|
|
static int
|
|
|
|
init_v3_authority_keys(void)
|
|
|
|
{
|
|
|
|
if (load_authority_keyset(0, &authority_signing_key,
|
|
|
|
&authority_key_certificate)<0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (get_options()->V3AuthUseLegacyKey &&
|
2008-05-12 17:40:36 +02:00
|
|
|
load_authority_keyset(1, &legacy_signing_key,
|
2008-05-12 04:14:01 +02:00
|
|
|
&legacy_key_certificate)<0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2008-01-18 05:50:15 +01:00
|
|
|
/** If we're a v3 authority, check whether we have a certificate that's
|
2007-10-04 18:21:58 +02:00
|
|
|
* likely to expire soon. Warn if we do, but not too often. */
|
2007-09-11 22:17:22 +02:00
|
|
|
void
|
|
|
|
v3_authority_check_key_expiry(void)
|
|
|
|
{
|
|
|
|
time_t now, expires;
|
|
|
|
static time_t last_warned = 0;
|
|
|
|
int badness, time_left, warn_interval;
|
|
|
|
if (!authdir_mode_v3(get_options()) || !authority_key_certificate)
|
|
|
|
return;
|
|
|
|
|
|
|
|
now = time(NULL);
|
|
|
|
expires = authority_key_certificate->expires;
|
2008-02-22 20:09:45 +01:00
|
|
|
time_left = (int)( expires - now );
|
2007-09-11 22:17:22 +02:00
|
|
|
if (time_left <= 0) {
|
|
|
|
badness = LOG_ERR;
|
|
|
|
warn_interval = 60*60;
|
|
|
|
} else if (time_left <= 24*60*60) {
|
|
|
|
badness = LOG_WARN;
|
|
|
|
warn_interval = 60*60;
|
|
|
|
} else if (time_left <= 24*60*60*7) {
|
|
|
|
badness = LOG_WARN;
|
|
|
|
warn_interval = 24*60*60;
|
|
|
|
} else if (time_left <= 24*60*60*30) {
|
|
|
|
badness = LOG_WARN;
|
|
|
|
warn_interval = 24*60*60*5;
|
|
|
|
} else {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (last_warned + warn_interval > now)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (time_left <= 0) {
|
|
|
|
log(badness, LD_DIR, "Your v3 authority certificate has expired."
|
|
|
|
" Generate a new one NOW.");
|
|
|
|
} else if (time_left <= 24*60*60) {
|
|
|
|
log(badness, LD_DIR, "Your v3 authority certificate expires in %d hours;"
|
|
|
|
" Generate a new one NOW.", time_left/(60*60));
|
|
|
|
} else {
|
|
|
|
log(badness, LD_DIR, "Your v3 authority certificate expires in %d days;"
|
|
|
|
" Generate a new one soon.", time_left/(24*60*60));
|
|
|
|
}
|
|
|
|
last_warned = now;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Initialize all OR private keys, and the TLS context, as necessary.
|
2006-07-17 08:54:28 +02:00
|
|
|
* On OPs, this only initializes the tls context. Return 0 on success,
|
|
|
|
* or -1 if Tor should die.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
init_keys(void)
|
|
|
|
{
|
2007-10-17 18:55:44 +02:00
|
|
|
char *keydir;
|
2005-01-03 18:53:20 +01:00
|
|
|
char fingerprint[FINGERPRINT_LEN+1];
|
2006-03-17 05:43:37 +01:00
|
|
|
/*nickname<space>fp\n\0 */
|
|
|
|
char fingerprint_line[MAX_NICKNAME_LEN+FINGERPRINT_LEN+3];
|
2007-10-17 18:55:44 +02:00
|
|
|
const char *mydesc;
|
2003-12-06 06:54:04 +01:00
|
|
|
crypto_pk_env_t *prkey;
|
2004-10-14 03:44:32 +02:00
|
|
|
char digest[20];
|
2007-08-13 22:31:08 +02:00
|
|
|
char v3_digest[20];
|
2006-12-24 04:06:03 +01:00
|
|
|
char *cp;
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2007-05-09 06:15:46 +02:00
|
|
|
authority_type_t type;
|
2007-08-18 20:20:42 +02:00
|
|
|
time_t now = time(NULL);
|
2007-10-16 19:22:37 +02:00
|
|
|
trusted_dir_server_t *ds;
|
|
|
|
int v3_digest_set = 0;
|
2008-02-06 13:39:25 +01:00
|
|
|
authority_cert_t *cert = NULL;
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-06-05 03:50:35 +02:00
|
|
|
if (!key_lock)
|
2004-06-05 03:56:54 +02:00
|
|
|
key_lock = tor_mutex_new();
|
2004-06-05 03:50:35 +02:00
|
|
|
|
2009-01-21 16:38:39 +01:00
|
|
|
/* There are a couple of paths that put us here before */
|
2009-05-24 01:42:44 +02:00
|
|
|
if (crypto_global_init(get_options()->HardwareAccel,
|
|
|
|
get_options()->AccelName,
|
|
|
|
get_options()->AccelDir)) {
|
2009-01-21 16:38:39 +01:00
|
|
|
log_err(LD_BUG, "Unable to initialize OpenSSL. Exiting.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-11-09 08:29:05 +01:00
|
|
|
/* OP's don't need persistent keys; just make up an identity and
|
2004-07-18 23:47:04 +02:00
|
|
|
* initialize the TLS context. */
|
2004-11-06 06:18:11 +01:00
|
|
|
if (!server_mode(options)) {
|
2004-07-18 23:47:04 +02:00
|
|
|
if (!(prkey = crypto_new_pk_env()))
|
|
|
|
return -1;
|
2008-01-16 06:27:19 +01:00
|
|
|
if (crypto_pk_generate_key(prkey)) {
|
|
|
|
crypto_free_pk_env(prkey);
|
2004-07-18 23:47:04 +02:00
|
|
|
return -1;
|
2008-01-16 06:27:19 +01:00
|
|
|
}
|
2010-10-04 07:38:53 +02:00
|
|
|
set_client_identity_key(prkey);
|
2010-10-04 03:14:08 +02:00
|
|
|
/* Create a TLS context. */
|
|
|
|
if (tor_tls_context_init(0,
|
2010-10-21 19:53:31 +02:00
|
|
|
get_tlsclient_identity_key(),
|
2010-10-04 03:14:08 +02:00
|
|
|
NULL,
|
|
|
|
MAX_SSL_KEY_LIFETIME) < 0) {
|
2006-09-07 03:00:37 +02:00
|
|
|
log_err(LD_GENERAL,"Error creating TLS context for Tor client.");
|
2004-07-18 23:47:04 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
return 0;
|
|
|
|
}
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Make sure DataDirectory exists, and is private. */
|
2007-10-17 18:55:44 +02:00
|
|
|
if (check_private_dir(options->DataDirectory, CPD_CREATE)) {
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Check the key directory. */
|
2007-10-17 18:55:44 +02:00
|
|
|
keydir = get_datadir_fname("keys");
|
2004-11-09 08:12:31 +01:00
|
|
|
if (check_private_dir(keydir, CPD_CREATE)) {
|
2007-10-17 18:55:44 +02:00
|
|
|
tor_free(keydir);
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2007-10-17 18:55:44 +02:00
|
|
|
tor_free(keydir);
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2007-08-13 21:16:44 +02:00
|
|
|
/* 1a. Read v3 directory authority key/cert information. */
|
2007-08-13 22:31:08 +02:00
|
|
|
memset(v3_digest, 0, sizeof(v3_digest));
|
2007-08-20 18:03:19 +02:00
|
|
|
if (authdir_mode_v3(options)) {
|
2007-10-17 23:26:19 +02:00
|
|
|
if (init_v3_authority_keys()<0) {
|
|
|
|
log_err(LD_GENERAL, "We're configured as a V3 authority, but we "
|
|
|
|
"were unable to load our v3 authority keys and certificate! "
|
|
|
|
"Use tor-gencert to generate them. Dying.");
|
|
|
|
return -1;
|
|
|
|
}
|
2008-02-06 13:39:25 +01:00
|
|
|
cert = get_my_v3_authority_cert();
|
|
|
|
if (cert) {
|
2007-08-13 22:31:08 +02:00
|
|
|
crypto_pk_get_digest(get_my_v3_authority_cert()->identity_key,
|
|
|
|
v3_digest);
|
2007-10-16 19:22:37 +02:00
|
|
|
v3_digest_set = 1;
|
2007-08-13 22:31:08 +02:00
|
|
|
}
|
|
|
|
}
|
2007-08-13 21:16:44 +02:00
|
|
|
|
2010-10-04 07:38:53 +02:00
|
|
|
/* 1b. Read identity key. Make it if none is found. */
|
2007-10-17 18:55:44 +02:00
|
|
|
keydir = get_datadir_fname2("keys", "secret_id_key");
|
2006-12-24 03:45:53 +01:00
|
|
|
log_info(LD_GENERAL,"Reading/making identity key \"%s\"...",keydir);
|
2007-05-29 19:31:13 +02:00
|
|
|
prkey = init_key_from_file(keydir, 1, LOG_ERR);
|
2007-10-17 18:55:44 +02:00
|
|
|
tor_free(keydir);
|
2003-12-06 06:54:04 +01:00
|
|
|
if (!prkey) return -1;
|
2010-10-04 07:38:53 +02:00
|
|
|
set_server_identity_key(prkey);
|
|
|
|
|
|
|
|
/* 1c. If we are configured as a bridge, generate a client key;
|
|
|
|
* otherwise, set the server identity key as our client identity
|
|
|
|
* key. */
|
|
|
|
if (public_server_mode(options)) {
|
2010-10-26 18:22:04 +02:00
|
|
|
set_client_identity_key(crypto_pk_dup_key(prkey)); /* set above */
|
2010-10-04 07:38:53 +02:00
|
|
|
} else {
|
|
|
|
if (!(prkey = crypto_new_pk_env()))
|
|
|
|
return -1;
|
|
|
|
if (crypto_pk_generate_key(prkey)) {
|
|
|
|
crypto_free_pk_env(prkey);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
set_client_identity_key(prkey);
|
|
|
|
}
|
2007-05-22 19:58:25 +02:00
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
/* 2. Read onion key. Make it if none is found. */
|
2007-10-17 18:55:44 +02:00
|
|
|
keydir = get_datadir_fname2("keys", "secret_onion_key");
|
2006-12-24 03:45:53 +01:00
|
|
|
log_info(LD_GENERAL,"Reading/making onion key \"%s\"...",keydir);
|
2007-05-29 19:31:13 +02:00
|
|
|
prkey = init_key_from_file(keydir, 1, LOG_ERR);
|
2007-10-17 18:55:44 +02:00
|
|
|
tor_free(keydir);
|
2003-12-06 06:54:04 +01:00
|
|
|
if (!prkey) return -1;
|
|
|
|
set_onion_key(prkey);
|
2007-09-21 23:52:31 +02:00
|
|
|
if (options->command == CMD_RUN_TOR) {
|
|
|
|
/* only mess with the state file if we're actually running Tor */
|
|
|
|
or_state_t *state = get_or_state();
|
|
|
|
if (state->LastRotatedOnionKey > 100 && state->LastRotatedOnionKey < now) {
|
|
|
|
/* We allow for some parsing slop, but we don't want to risk accepting
|
|
|
|
* values in the distant future. If we did, we might never rotate the
|
|
|
|
* onion key. */
|
|
|
|
onionkey_set_at = state->LastRotatedOnionKey;
|
|
|
|
} else {
|
|
|
|
/* We have no LastRotatedOnionKey set; either we just created the key
|
|
|
|
* or it's a holdover from 0.1.2.4-alpha-dev or earlier. In either case,
|
|
|
|
* start the clock ticking now so that we will eventually rotate it even
|
|
|
|
* if we don't stay up for a full MIN_ONION_KEY_LIFETIME. */
|
|
|
|
state->LastRotatedOnionKey = onionkey_set_at = now;
|
|
|
|
or_state_mark_dirty(state, options->AvoidDiskWrites ?
|
|
|
|
time(NULL)+3600 : 0);
|
|
|
|
}
|
2006-12-15 08:04:37 +01:00
|
|
|
}
|
|
|
|
|
2007-10-17 18:55:44 +02:00
|
|
|
keydir = get_datadir_fname2("keys", "secret_onion_key.old");
|
2007-12-01 05:40:12 +01:00
|
|
|
if (!lastonionkey && file_status(keydir) == FN_FILE) {
|
2007-05-29 19:31:13 +02:00
|
|
|
prkey = init_key_from_file(keydir, 1, LOG_ERR);
|
2004-08-09 06:27:13 +02:00
|
|
|
if (prkey)
|
|
|
|
lastonionkey = prkey;
|
|
|
|
}
|
2007-10-17 18:55:44 +02:00
|
|
|
tor_free(keydir);
|
2003-12-06 06:54:04 +01:00
|
|
|
|
|
|
|
/* 3. Initialize link key and TLS context. */
|
2010-10-04 03:14:08 +02:00
|
|
|
if (tor_tls_context_init(public_server_mode(options),
|
2010-10-21 19:53:31 +02:00
|
|
|
get_tlsclient_identity_key(),
|
2010-10-04 07:38:53 +02:00
|
|
|
get_server_identity_key(),
|
2010-10-04 03:14:08 +02:00
|
|
|
MAX_SSL_KEY_LIFETIME) < 0) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_err(LD_GENERAL,"Error initializing TLS context");
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2006-03-22 04:45:17 +01:00
|
|
|
/* 4. Build our router descriptor. */
|
2003-12-06 06:54:04 +01:00
|
|
|
/* Must be called after keys are initialized. */
|
2005-09-08 07:37:22 +02:00
|
|
|
mydesc = router_get_my_descriptor();
|
2011-02-16 13:12:37 +01:00
|
|
|
if (authdir_mode_handles_descs(options, ROUTER_PURPOSE_GENERAL)) {
|
2009-08-11 17:33:58 +02:00
|
|
|
const char *m = NULL;
|
2007-05-19 02:45:17 +02:00
|
|
|
routerinfo_t *ri;
|
2004-07-20 12:17:43 +02:00
|
|
|
/* We need to add our own fingerprint so it gets recognized. */
|
2010-10-04 07:38:53 +02:00
|
|
|
if (dirserv_add_own_fingerprint(options->Nickname,
|
|
|
|
get_server_identity_key())) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_err(LD_GENERAL,"Error adding own fingerprint to approved set");
|
2004-07-20 12:17:43 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2007-08-20 20:29:17 +02:00
|
|
|
if (mydesc) {
|
2007-09-27 18:08:10 +02:00
|
|
|
ri = router_parse_entry_from_string(mydesc, NULL, 1, 0, NULL);
|
2007-08-20 20:29:17 +02:00
|
|
|
if (!ri) {
|
|
|
|
log_err(LD_GENERAL,"Generated a routerinfo we couldn't parse.");
|
|
|
|
return -1;
|
|
|
|
}
|
2009-04-01 15:02:04 +02:00
|
|
|
if (!WRA_WAS_ADDED(dirserv_add_descriptor(ri, &m, "self"))) {
|
2007-08-20 20:29:17 +02:00
|
|
|
log_err(LD_GENERAL,"Unable to add own descriptor to directory: %s",
|
|
|
|
m?m:"<unknown error>");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-07-20 12:17:43 +02:00
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
2004-07-20 12:17:43 +02:00
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
/* 5. Dump fingerprint to 'fingerprint' */
|
2007-10-17 18:55:44 +02:00
|
|
|
keydir = get_datadir_fname("fingerprint");
|
2006-02-13 11:33:00 +01:00
|
|
|
log_info(LD_GENERAL,"Dumping fingerprint to \"%s\"...",keydir);
|
2010-10-04 07:38:53 +02:00
|
|
|
if (crypto_pk_get_fingerprint(get_server_identity_key(),
|
|
|
|
fingerprint, 0) < 0) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_err(LD_GENERAL,"Error computing fingerprint");
|
2007-10-18 16:23:19 +02:00
|
|
|
tor_free(keydir);
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2005-01-03 18:53:20 +01:00
|
|
|
tor_assert(strlen(options->Nickname) <= MAX_NICKNAME_LEN);
|
|
|
|
if (tor_snprintf(fingerprint_line, sizeof(fingerprint_line),
|
|
|
|
"%s %s\n",options->Nickname, fingerprint) < 0) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_err(LD_GENERAL,"Error writing fingerprint line");
|
2007-10-18 16:23:19 +02:00
|
|
|
tor_free(keydir);
|
2005-01-03 18:53:20 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2006-12-24 04:06:03 +01:00
|
|
|
/* Check whether we need to write the fingerprint file. */
|
|
|
|
cp = NULL;
|
|
|
|
if (file_status(keydir) == FN_FILE)
|
2006-12-24 04:09:58 +01:00
|
|
|
cp = read_file_to_str(keydir, 0, NULL);
|
2007-01-04 06:41:24 +01:00
|
|
|
if (!cp || strcmp(cp, fingerprint_line)) {
|
2006-12-24 04:06:03 +01:00
|
|
|
if (write_str_to_file(keydir, fingerprint_line, 0)) {
|
|
|
|
log_err(LD_FS, "Error writing fingerprint line to file");
|
2007-10-18 16:23:19 +02:00
|
|
|
tor_free(keydir);
|
2009-10-27 03:12:40 +01:00
|
|
|
tor_free(cp);
|
2006-12-24 04:06:03 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2005-10-25 09:04:36 +02:00
|
|
|
}
|
2006-12-24 04:06:03 +01:00
|
|
|
tor_free(cp);
|
2007-10-18 16:23:19 +02:00
|
|
|
tor_free(keydir);
|
2006-03-22 04:40:59 +01:00
|
|
|
|
|
|
|
log(LOG_NOTICE, LD_GENERAL,
|
2006-03-27 07:30:16 +02:00
|
|
|
"Your Tor server's identity key fingerprint is '%s %s'",
|
2006-03-22 04:40:59 +01:00
|
|
|
options->Nickname, fingerprint);
|
2004-11-28 10:05:49 +01:00
|
|
|
if (!authdir_mode(options))
|
2003-12-06 06:54:04 +01:00
|
|
|
return 0;
|
2004-07-20 12:17:43 +02:00
|
|
|
/* 6. [authdirserver only] load approved-routers file */
|
2006-09-14 06:53:23 +02:00
|
|
|
if (dirserv_load_fingerprint_file() < 0) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_err(LD_GENERAL,"Error loading fingerprints");
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-10-14 03:44:32 +02:00
|
|
|
/* 6b. [authdirserver only] add own key to approved directories. */
|
2010-10-04 07:38:53 +02:00
|
|
|
crypto_pk_get_digest(get_server_identity_key(), digest);
|
2007-12-23 05:22:55 +01:00
|
|
|
type = ((options->V1AuthoritativeDir ? V1_AUTHORITY : NO_AUTHORITY) |
|
|
|
|
(options->V2AuthoritativeDir ? V2_AUTHORITY : NO_AUTHORITY) |
|
|
|
|
(options->V3AuthoritativeDir ? V3_AUTHORITY : NO_AUTHORITY) |
|
|
|
|
(options->BridgeAuthoritativeDir ? BRIDGE_AUTHORITY : NO_AUTHORITY) |
|
|
|
|
(options->HSAuthoritativeDir ? HIDSERV_AUTHORITY : NO_AUTHORITY));
|
2007-05-09 06:15:46 +02:00
|
|
|
|
2008-01-09 00:35:03 +01:00
|
|
|
ds = router_get_trusteddirserver_by_digest(digest);
|
2008-02-04 17:58:50 +01:00
|
|
|
if (!ds) {
|
|
|
|
ds = add_trusted_dir_server(options->Nickname, NULL,
|
|
|
|
(uint16_t)options->DirPort,
|
|
|
|
(uint16_t)options->ORPort,
|
|
|
|
digest,
|
|
|
|
v3_digest,
|
|
|
|
type);
|
|
|
|
if (!ds) {
|
|
|
|
log_err(LD_GENERAL,"We want to be a directory authority, but we "
|
|
|
|
"couldn't add ourselves to the authority list. Failing.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2008-01-09 00:35:03 +01:00
|
|
|
if (ds->type != type) {
|
|
|
|
log_warn(LD_DIR, "Configured authority type does not match authority "
|
|
|
|
"type in DirServer list. Adjusting. (%d v %d)",
|
|
|
|
type, ds->type);
|
|
|
|
ds->type = type;
|
|
|
|
}
|
|
|
|
if (v3_digest_set && (ds->type & V3_AUTHORITY) &&
|
|
|
|
memcmp(v3_digest, ds->v3_identity_digest, DIGEST_LEN)) {
|
|
|
|
log_warn(LD_DIR, "V3 identity key does not match identity declared in "
|
|
|
|
"DirServer line. Adjusting.");
|
|
|
|
memcpy(ds->v3_identity_digest, v3_digest, DIGEST_LEN);
|
2007-10-16 19:22:37 +02:00
|
|
|
}
|
|
|
|
|
2008-02-06 13:39:25 +01:00
|
|
|
if (cert) { /* add my own cert to the list of known certs */
|
|
|
|
log_info(LD_DIR, "adding my own v3 cert");
|
|
|
|
if (trusted_dirs_load_certs_from_string(
|
2008-02-21 00:20:36 +01:00
|
|
|
cert->cache_info.signed_descriptor_body, 0, 0)<0) {
|
2008-02-06 13:39:25 +01:00
|
|
|
log_warn(LD_DIR, "Unable to parse my own v3 cert! Failing.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2006-07-04 05:31:27 +02:00
|
|
|
return 0; /* success */
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2005-02-27 10:47:01 +01:00
|
|
|
/* Keep track of whether we should upload our server descriptor,
|
|
|
|
* and what type of server we are.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/** Whether we can reach our ORPort from the outside. */
|
2005-03-15 02:44:46 +01:00
|
|
|
static int can_reach_or_port = 0;
|
2005-02-27 10:47:01 +01:00
|
|
|
/** Whether we can reach our DirPort from the outside. */
|
2005-03-15 02:44:46 +01:00
|
|
|
static int can_reach_dir_port = 0;
|
2005-02-27 10:47:01 +01:00
|
|
|
|
2007-01-22 08:51:06 +01:00
|
|
|
/** Forget what we have learned about our reachability status. */
|
2006-12-28 22:29:20 +01:00
|
|
|
void
|
|
|
|
router_reset_reachability(void)
|
|
|
|
{
|
|
|
|
can_reach_or_port = can_reach_dir_port = 0;
|
|
|
|
}
|
|
|
|
|
2006-07-04 05:31:27 +02:00
|
|
|
/** Return 1 if ORPort is known reachable; else return 0. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
check_whether_orport_reachable(void)
|
|
|
|
{
|
2005-08-26 09:41:19 +02:00
|
|
|
or_options_t *options = get_options();
|
2006-07-04 05:31:27 +02:00
|
|
|
return options->AssumeReachable ||
|
2005-08-26 09:41:19 +02:00
|
|
|
can_reach_or_port;
|
2005-03-31 21:26:33 +02:00
|
|
|
}
|
2005-06-11 20:52:12 +02:00
|
|
|
|
2005-03-31 21:26:33 +02:00
|
|
|
/** Return 1 if we don't have a dirport configured, or if it's reachable. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
check_whether_dirport_reachable(void)
|
|
|
|
{
|
2005-08-26 09:41:19 +02:00
|
|
|
or_options_t *options = get_options();
|
|
|
|
return !options->DirPort ||
|
|
|
|
options->AssumeReachable ||
|
2005-10-24 05:04:05 +02:00
|
|
|
we_are_hibernating() ||
|
2005-08-26 09:41:19 +02:00
|
|
|
can_reach_dir_port;
|
2005-03-26 02:43:39 +01:00
|
|
|
}
|
|
|
|
|
2005-09-29 08:45:03 +02:00
|
|
|
/** Look at a variety of factors, and return 0 if we don't want to
|
|
|
|
* advertise the fact that we have a DirPort open. Else return the
|
2007-01-25 20:41:15 +01:00
|
|
|
* DirPort we want to advertise.
|
|
|
|
*
|
|
|
|
* Log a helpful message if we change our mind about whether to publish
|
|
|
|
* a DirPort.
|
|
|
|
*/
|
2005-09-29 08:45:03 +02:00
|
|
|
static int
|
2007-10-14 00:31:35 +02:00
|
|
|
decide_to_advertise_dirport(or_options_t *options, uint16_t dir_port)
|
2005-09-29 08:45:03 +02:00
|
|
|
{
|
2007-01-25 20:41:15 +01:00
|
|
|
static int advertising=1; /* start out assuming we will advertise */
|
|
|
|
int new_choice=1;
|
|
|
|
const char *reason = NULL;
|
|
|
|
|
|
|
|
/* Section one: reasons to publish or not publish that aren't
|
|
|
|
* worth mentioning to the user, either because they're obvious
|
|
|
|
* or because they're normal behavior. */
|
|
|
|
|
2007-10-14 00:31:35 +02:00
|
|
|
if (!dir_port) /* short circuit the rest of the function */
|
2005-09-29 08:45:03 +02:00
|
|
|
return 0;
|
|
|
|
if (authdir_mode(options)) /* always publish */
|
2007-10-14 00:31:35 +02:00
|
|
|
return dir_port;
|
2005-09-29 08:45:03 +02:00
|
|
|
if (we_are_hibernating())
|
|
|
|
return 0;
|
|
|
|
if (!check_whether_dirport_reachable())
|
|
|
|
return 0;
|
|
|
|
|
2007-01-25 20:41:15 +01:00
|
|
|
/* Section two: reasons to publish or not publish that the user
|
|
|
|
* might find surprising. These are generally config options that
|
|
|
|
* make us choose not to publish. */
|
|
|
|
|
|
|
|
if (accounting_is_enabled(options)) {
|
|
|
|
/* if we might potentially hibernate */
|
|
|
|
new_choice = 0;
|
|
|
|
reason = "AccountingMax enabled";
|
2007-09-18 00:22:05 +02:00
|
|
|
#define MIN_BW_TO_ADVERTISE_DIRPORT 51200
|
|
|
|
} else if (options->BandwidthRate < MIN_BW_TO_ADVERTISE_DIRPORT ||
|
|
|
|
(options->RelayBandwidthRate > 0 &&
|
|
|
|
options->RelayBandwidthRate < MIN_BW_TO_ADVERTISE_DIRPORT)) {
|
2007-01-25 20:41:15 +01:00
|
|
|
/* if we're advertising a small amount */
|
|
|
|
new_choice = 0;
|
|
|
|
reason = "BandwidthRate under 50KB";
|
|
|
|
}
|
|
|
|
|
|
|
|
if (advertising != new_choice) {
|
|
|
|
if (new_choice == 1) {
|
2007-10-14 00:31:35 +02:00
|
|
|
log(LOG_NOTICE, LD_DIR, "Advertising DirPort as %d", dir_port);
|
2007-01-25 20:41:15 +01:00
|
|
|
} else {
|
|
|
|
tor_assert(reason);
|
|
|
|
log(LOG_NOTICE, LD_DIR, "Not advertising DirPort (Reason: %s)", reason);
|
|
|
|
}
|
|
|
|
advertising = new_choice;
|
|
|
|
}
|
|
|
|
|
2007-10-14 00:31:35 +02:00
|
|
|
return advertising ? dir_port : 0;
|
2005-09-29 08:45:03 +02:00
|
|
|
}
|
|
|
|
|
2005-09-30 02:43:40 +02:00
|
|
|
/** Some time has passed, or we just got new directory information.
|
|
|
|
* See if we currently believe our ORPort or DirPort to be
|
|
|
|
* unreachable. If so, launch a new test for it.
|
|
|
|
*
|
|
|
|
* For ORPort, we simply try making a circuit that ends at ourselves.
|
|
|
|
* Success is noticed in onionskin_answer().
|
|
|
|
*
|
|
|
|
* For DirPort, we make a connection via Tor to our DirPort and ask
|
|
|
|
* for our own server descriptor.
|
|
|
|
* Success is noticed in connection_dir_client_reached_eof().
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2006-09-15 07:53:00 +02:00
|
|
|
consider_testing_reachability(int test_or, int test_dir)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2010-09-29 06:38:32 +02:00
|
|
|
const routerinfo_t *me = router_get_my_routerinfo();
|
2006-09-15 07:53:00 +02:00
|
|
|
int orport_reachable = check_whether_orport_reachable();
|
2008-08-05 22:08:19 +02:00
|
|
|
tor_addr_t addr;
|
2011-03-28 20:14:45 +02:00
|
|
|
or_options_t *options = get_options();
|
2006-07-17 08:54:28 +02:00
|
|
|
if (!me)
|
2005-03-27 13:52:15 +02:00
|
|
|
return;
|
2005-02-27 10:47:01 +01:00
|
|
|
|
2011-04-27 20:36:30 +02:00
|
|
|
if (routerset_contains_router(options->ExcludeNodes, me, -1) &&
|
2011-03-28 20:14:45 +02:00
|
|
|
options->StrictNodes) {
|
|
|
|
/* If we've excluded ourself, and StrictNodes is set, we can't test
|
|
|
|
* ourself. */
|
|
|
|
if (test_or || test_dir) {
|
|
|
|
#define SELF_EXCLUDED_WARN_INTERVAL 3600
|
|
|
|
static ratelim_t warning_limit=RATELIM_INIT(SELF_EXCLUDED_WARN_INTERVAL);
|
|
|
|
char *msg;
|
|
|
|
if ((msg = rate_limit_log(&warning_limit, approx_time()))) {
|
|
|
|
log_warn(LD_CIRC, "Can't peform self-tests for this relay: we have "
|
|
|
|
"listed ourself in ExcludeNodes, and StrictNodes is set. "
|
2011-04-08 04:03:50 +02:00
|
|
|
"We cannot learn whether we are usable, and will not "
|
2011-03-28 20:14:45 +02:00
|
|
|
"be able to advertise ourself.%s", msg);
|
|
|
|
tor_free(msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-09-15 07:53:00 +02:00
|
|
|
if (test_or && (!orport_reachable || !circuit_enough_testing_circs())) {
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
extend_info_t *ei;
|
2006-09-15 07:30:25 +02:00
|
|
|
log_info(LD_CIRC, "Testing %s of my ORPort: %s:%d.",
|
|
|
|
!orport_reachable ? "reachability" : "bandwidth",
|
2006-05-26 18:29:33 +02:00
|
|
|
me->address, me->or_port);
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
ei = extend_info_from_router(me);
|
|
|
|
circuit_launch_by_extend_info(CIRCUIT_PURPOSE_TESTING, ei,
|
|
|
|
CIRCLAUNCH_NEED_CAPACITY|CIRCLAUNCH_IS_INTERNAL);
|
|
|
|
extend_info_free(ei);
|
2005-02-27 10:47:01 +01:00
|
|
|
}
|
|
|
|
|
2008-08-05 22:08:19 +02:00
|
|
|
tor_addr_from_ipv4h(&addr, me->addr);
|
2006-10-06 06:02:27 +02:00
|
|
|
if (test_dir && !check_whether_dirport_reachable() &&
|
|
|
|
!connection_get_by_type_addr_port_purpose(
|
2008-08-05 22:08:19 +02:00
|
|
|
CONN_TYPE_DIR, &addr, me->dir_port,
|
2006-10-06 06:02:27 +02:00
|
|
|
DIR_PURPOSE_FETCH_SERVERDESC)) {
|
2005-09-30 01:04:01 +02:00
|
|
|
/* ask myself, via tor, for my server descriptor. */
|
2008-08-05 22:08:19 +02:00
|
|
|
directory_initiate_command(me->address, &addr,
|
2007-04-27 12:26:09 +02:00
|
|
|
me->or_port, me->dir_port,
|
2008-04-24 17:43:25 +02:00
|
|
|
0, /* does not matter */
|
2007-01-28 09:06:00 +01:00
|
|
|
0, me->cache_info.identity_digest,
|
|
|
|
DIR_PURPOSE_FETCH_SERVERDESC,
|
2007-06-10 09:34:21 +02:00
|
|
|
ROUTER_PURPOSE_GENERAL,
|
2007-10-28 21:30:21 +01:00
|
|
|
1, "authority.z", NULL, 0, 0);
|
2005-02-27 10:47:01 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Annotate that we found our ORPort reachable. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
router_orport_found_reachable(void)
|
|
|
|
{
|
2011-03-14 22:22:38 +01:00
|
|
|
const routerinfo_t *me = router_get_my_routerinfo();
|
2011-03-13 20:47:59 +01:00
|
|
|
if (!can_reach_or_port && me) {
|
2006-07-04 05:31:27 +02:00
|
|
|
log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from "
|
|
|
|
"the outside. Excellent.%s",
|
2007-05-08 11:09:26 +02:00
|
|
|
get_options()->_PublishServerDescriptor != NO_AUTHORITY ?
|
2006-07-04 05:31:27 +02:00
|
|
|
" Publishing server descriptor." : "");
|
2005-03-20 00:04:15 +01:00
|
|
|
can_reach_or_port = 1;
|
2005-08-22 05:10:53 +02:00
|
|
|
mark_my_descriptor_dirty();
|
2007-01-06 06:42:31 +01:00
|
|
|
control_event_server_status(LOG_NOTICE,
|
|
|
|
"REACHABILITY_SUCCEEDED ORADDRESS=%s:%d",
|
2007-09-24 17:41:20 +02:00
|
|
|
me->address, me->or_port);
|
2005-03-20 00:04:15 +01:00
|
|
|
}
|
2005-02-27 10:47:01 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Annotate that we found our DirPort reachable. */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
router_dirport_found_reachable(void)
|
|
|
|
{
|
2011-03-14 22:22:38 +01:00
|
|
|
const routerinfo_t *me = router_get_my_routerinfo();
|
2011-03-13 20:47:59 +01:00
|
|
|
if (!can_reach_dir_port && me) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable "
|
|
|
|
"from the outside. Excellent.");
|
2005-03-20 00:04:15 +01:00
|
|
|
can_reach_dir_port = 1;
|
2011-03-13 20:47:59 +01:00
|
|
|
if (decide_to_advertise_dirport(get_options(), me->dir_port))
|
2007-10-14 00:31:35 +02:00
|
|
|
mark_my_descriptor_dirty();
|
2007-01-06 06:42:31 +01:00
|
|
|
control_event_server_status(LOG_NOTICE,
|
|
|
|
"REACHABILITY_SUCCEEDED DIRADDRESS=%s:%d",
|
|
|
|
me->address, me->dir_port);
|
2005-03-20 00:04:15 +01:00
|
|
|
}
|
2005-02-27 10:47:01 +01:00
|
|
|
}
|
|
|
|
|
2006-10-09 17:46:21 +02:00
|
|
|
/** We have enough testing circuits open. Send a bunch of "drop"
|
2006-09-15 07:30:25 +02:00
|
|
|
* cells down each of them, to exercise our bandwidth. */
|
|
|
|
void
|
|
|
|
router_perform_bandwidth_test(int num_circs, time_t now)
|
|
|
|
{
|
2006-10-09 17:46:21 +02:00
|
|
|
int num_cells = (int)(get_options()->BandwidthRate * 10 / CELL_NETWORK_SIZE);
|
2006-09-15 07:30:25 +02:00
|
|
|
int max_cells = num_cells < CIRCWINDOW_START ?
|
|
|
|
num_cells : CIRCWINDOW_START;
|
|
|
|
int cells_per_circuit = max_cells / num_circs;
|
|
|
|
origin_circuit_t *circ = NULL;
|
|
|
|
|
2007-02-26 06:36:02 +01:00
|
|
|
log_notice(LD_OR,"Performing bandwidth self-test...done.");
|
2006-09-15 07:30:25 +02:00
|
|
|
while ((circ = circuit_get_next_by_pk_and_purpose(circ, NULL,
|
|
|
|
CIRCUIT_PURPOSE_TESTING))) {
|
|
|
|
/* dump cells_per_circuit drop cells onto this circ */
|
|
|
|
int i = cells_per_circuit;
|
|
|
|
if (circ->_base.state != CIRCUIT_STATE_OPEN)
|
|
|
|
continue;
|
|
|
|
circ->_base.timestamp_dirty = now;
|
|
|
|
while (i-- > 0) {
|
2007-03-24 16:57:51 +01:00
|
|
|
if (relay_send_command_from_edge(0, TO_CIRCUIT(circ),
|
2006-09-15 07:30:25 +02:00
|
|
|
RELAY_COMMAND_DROP,
|
|
|
|
NULL, 0, circ->cpath->prev)<0) {
|
|
|
|
return; /* stop if error */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-27 10:47:01 +01:00
|
|
|
/** Return true iff we believe ourselves to be an authoritative
|
|
|
|
* directory server.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
authdir_mode(or_options_t *options)
|
|
|
|
{
|
2005-02-27 10:47:01 +01:00
|
|
|
return options->AuthoritativeDir != 0;
|
|
|
|
}
|
2007-05-02 11:12:04 +02:00
|
|
|
/** Return true iff we believe ourselves to be a v1 authoritative
|
|
|
|
* directory server.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
authdir_mode_v1(or_options_t *options)
|
|
|
|
{
|
|
|
|
return authdir_mode(options) && options->V1AuthoritativeDir != 0;
|
|
|
|
}
|
|
|
|
/** Return true iff we believe ourselves to be a v2 authoritative
|
|
|
|
* directory server.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
authdir_mode_v2(or_options_t *options)
|
|
|
|
{
|
|
|
|
return authdir_mode(options) && options->V2AuthoritativeDir != 0;
|
|
|
|
}
|
2007-07-26 00:56:44 +02:00
|
|
|
/** Return true iff we believe ourselves to be a v3 authoritative
|
|
|
|
* directory server.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
authdir_mode_v3(or_options_t *options)
|
|
|
|
{
|
|
|
|
return authdir_mode(options) && options->V3AuthoritativeDir != 0;
|
|
|
|
}
|
2007-12-21 07:33:02 +01:00
|
|
|
/** Return true iff we are a v1, v2, or v3 directory authority. */
|
|
|
|
int
|
2007-12-21 07:28:59 +01:00
|
|
|
authdir_mode_any_main(or_options_t *options)
|
|
|
|
{
|
|
|
|
return options->V1AuthoritativeDir ||
|
|
|
|
options->V2AuthoritativeDir ||
|
|
|
|
options->V3AuthoritativeDir;
|
|
|
|
}
|
2007-12-18 22:37:58 +01:00
|
|
|
/** Return true if we believe ourselves to be any kind of
|
|
|
|
* authoritative directory beyond just a hidserv authority. */
|
2007-08-20 18:03:19 +02:00
|
|
|
int
|
2007-12-18 22:37:58 +01:00
|
|
|
authdir_mode_any_nonhidserv(or_options_t *options)
|
2007-08-20 18:03:19 +02:00
|
|
|
{
|
2007-12-21 07:28:59 +01:00
|
|
|
return options->BridgeAuthoritativeDir ||
|
|
|
|
authdir_mode_any_main(options);
|
2007-08-20 18:03:19 +02:00
|
|
|
}
|
2007-12-19 00:45:24 +01:00
|
|
|
/** Return true iff we are an authoritative directory server that is
|
|
|
|
* authoritative about receiving and serving descriptors of type
|
|
|
|
* <b>purpose</b> its dirport. Use -1 for "any purpose". */
|
2007-05-02 11:12:04 +02:00
|
|
|
int
|
2007-12-19 00:45:24 +01:00
|
|
|
authdir_mode_handles_descs(or_options_t *options, int purpose)
|
2007-06-09 09:05:19 +02:00
|
|
|
{
|
2007-12-19 00:45:24 +01:00
|
|
|
if (purpose < 0)
|
|
|
|
return authdir_mode_any_nonhidserv(options);
|
|
|
|
else if (purpose == ROUTER_PURPOSE_GENERAL)
|
2007-12-21 07:28:59 +01:00
|
|
|
return authdir_mode_any_main(options);
|
2007-12-19 00:45:24 +01:00
|
|
|
else if (purpose == ROUTER_PURPOSE_BRIDGE)
|
|
|
|
return (options->BridgeAuthoritativeDir);
|
|
|
|
else
|
|
|
|
return 0;
|
2007-06-09 09:05:19 +02:00
|
|
|
}
|
|
|
|
/** Return true iff we are an authoritative directory server that
|
|
|
|
* publishes its own network statuses.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
authdir_mode_publishes_statuses(or_options_t *options)
|
|
|
|
{
|
|
|
|
if (authdir_mode_bridge(options))
|
|
|
|
return 0;
|
2007-12-18 22:37:58 +01:00
|
|
|
return authdir_mode_any_nonhidserv(options);
|
2007-06-09 09:05:19 +02:00
|
|
|
}
|
|
|
|
/** Return true iff we are an authoritative directory server that
|
|
|
|
* tests reachability of the descriptors it learns about.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
authdir_mode_tests_reachability(or_options_t *options)
|
2007-05-02 11:12:04 +02:00
|
|
|
{
|
2007-12-19 00:45:24 +01:00
|
|
|
return authdir_mode_handles_descs(options, -1);
|
2007-05-02 11:12:04 +02:00
|
|
|
}
|
2007-05-04 10:04:27 +02:00
|
|
|
/** Return true iff we believe ourselves to be a bridge authoritative
|
|
|
|
* directory server.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
authdir_mode_bridge(or_options_t *options)
|
|
|
|
{
|
|
|
|
return authdir_mode(options) && options->BridgeAuthoritativeDir != 0;
|
|
|
|
}
|
2005-02-27 10:47:01 +01:00
|
|
|
|
|
|
|
/** Return true iff we are trying to be a server.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
server_mode(or_options_t *options)
|
|
|
|
{
|
2005-06-09 10:54:42 +02:00
|
|
|
if (options->ClientOnly) return 0;
|
2005-10-17 05:17:29 +02:00
|
|
|
return (options->ORPort != 0 || options->ORListenAddress);
|
2005-02-27 10:47:01 +01:00
|
|
|
}
|
|
|
|
|
2010-10-01 09:07:10 +02:00
|
|
|
/** Return true iff we are trying to be a non-bridge server.
|
|
|
|
*/
|
|
|
|
int
|
|
|
|
public_server_mode(or_options_t *options)
|
|
|
|
{
|
|
|
|
if (!server_mode(options)) return 0;
|
|
|
|
return (!options->BridgeRelay);
|
|
|
|
}
|
|
|
|
|
2010-09-21 07:03:29 +02:00
|
|
|
/** Return true iff the combination of options in <b>options</b> and parameters
|
2010-09-27 23:44:00 +02:00
|
|
|
* in the consensus mean that we don't want to allow exits from circuits
|
2010-09-21 07:03:29 +02:00
|
|
|
* we got from addresses not known to be servers. */
|
|
|
|
int
|
|
|
|
should_refuse_unknown_exits(or_options_t *options)
|
|
|
|
{
|
2010-11-08 19:34:40 +01:00
|
|
|
if (options->RefuseUnknownExits != -1) {
|
|
|
|
return options->RefuseUnknownExits;
|
2010-09-21 07:03:29 +02:00
|
|
|
} else {
|
2010-12-30 19:54:13 +01:00
|
|
|
return networkstatus_get_param(NULL, "refuseunknownexits", 1, 0, 1);
|
2010-09-21 07:03:29 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-02-27 10:47:01 +01:00
|
|
|
/** Remember if we've advertised ourselves to the dirservers. */
|
|
|
|
static int server_is_advertised=0;
|
|
|
|
|
|
|
|
/** Return true iff we have published our descriptor lately.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
advertised_server_mode(void)
|
|
|
|
{
|
2005-02-27 10:47:01 +01:00
|
|
|
return server_is_advertised;
|
|
|
|
}
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/**
|
2005-12-14 21:40:40 +01:00
|
|
|
* Called with a boolean: set whether we have recently published our
|
|
|
|
* descriptor.
|
2005-06-11 20:52:12 +02:00
|
|
|
*/
|
|
|
|
static void
|
|
|
|
set_server_advertised(int s)
|
|
|
|
{
|
2005-02-27 10:47:01 +01:00
|
|
|
server_is_advertised = s;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return true iff we are trying to be a socks proxy. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
proxy_mode(or_options_t *options)
|
|
|
|
{
|
2011-04-28 23:45:41 +02:00
|
|
|
return (options->SocksPort != 0 ||
|
|
|
|
options->TransPort != 0 ||
|
|
|
|
options->NATDPort != 0 ||
|
|
|
|
options->DNSPort != 0);
|
2005-02-27 10:47:01 +01:00
|
|
|
}
|
|
|
|
|
2005-04-21 12:40:48 +02:00
|
|
|
/** Decide if we're a publishable server. We are a publishable server if:
|
|
|
|
* - We don't have the ClientOnly option set
|
|
|
|
* and
|
2007-05-08 11:09:26 +02:00
|
|
|
* - We have the PublishServerDescriptor option set to non-empty
|
2005-04-21 12:40:48 +02:00
|
|
|
* and
|
|
|
|
* - We have ORPort set
|
|
|
|
* and
|
|
|
|
* - We believe we are reachable from the outside; or
|
2007-05-02 11:12:04 +02:00
|
|
|
* - We are an authoritative directory server.
|
2005-02-27 10:47:01 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
static int
|
2006-06-05 00:42:13 +02:00
|
|
|
decide_if_publishable_server(void)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2005-02-27 10:47:01 +01:00
|
|
|
or_options_t *options = get_options();
|
|
|
|
|
|
|
|
if (options->ClientOnly)
|
|
|
|
return 0;
|
2007-05-08 11:09:26 +02:00
|
|
|
if (options->_PublishServerDescriptor == NO_AUTHORITY)
|
2005-04-21 12:40:48 +02:00
|
|
|
return 0;
|
2005-02-27 10:47:01 +01:00
|
|
|
if (!server_mode(options))
|
|
|
|
return 0;
|
2007-05-02 11:12:04 +02:00
|
|
|
if (authdir_mode(options))
|
2005-02-27 10:47:01 +01:00
|
|
|
return 1;
|
|
|
|
|
2005-03-31 21:26:33 +02:00
|
|
|
return check_whether_orport_reachable();
|
2005-02-27 10:47:01 +01:00
|
|
|
}
|
|
|
|
|
2005-06-11 20:52:12 +02:00
|
|
|
/** Initiate server descriptor upload as reasonable (if server is publishable,
|
|
|
|
* etc). <b>force</b> is as for router_upload_dir_desc_to_dirservers.
|
2006-01-04 00:34:42 +01:00
|
|
|
*
|
|
|
|
* We need to rebuild the descriptor if it's dirty even if we're not
|
|
|
|
* uploading, because our reachability testing *uses* our descriptor to
|
|
|
|
* determine what IP address and ports to test.
|
2005-06-11 20:52:12 +02:00
|
|
|
*/
|
|
|
|
void
|
2006-06-05 00:42:13 +02:00
|
|
|
consider_publishable_server(int force)
|
2005-06-11 20:52:12 +02:00
|
|
|
{
|
2006-01-06 16:40:34 +01:00
|
|
|
int rebuilt;
|
|
|
|
|
|
|
|
if (!server_mode(get_options()))
|
|
|
|
return;
|
|
|
|
|
|
|
|
rebuilt = router_rebuild_descriptor(0);
|
2006-06-05 00:42:13 +02:00
|
|
|
if (decide_if_publishable_server()) {
|
2005-02-27 10:47:01 +01:00
|
|
|
set_server_advertised(1);
|
2006-01-04 00:34:42 +01:00
|
|
|
if (rebuilt == 0)
|
2005-06-08 21:45:17 +02:00
|
|
|
router_upload_dir_desc_to_dirservers(force);
|
2005-02-27 10:47:01 +01:00
|
|
|
} else {
|
|
|
|
set_server_advertised(0);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/*
|
2004-05-04 20:17:45 +02:00
|
|
|
* OR descriptor generation.
|
2004-05-10 06:34:48 +02:00
|
|
|
*/
|
2004-05-04 20:17:45 +02:00
|
|
|
|
2004-05-10 12:27:54 +02:00
|
|
|
/** My routerinfo. */
|
2004-05-04 20:17:45 +02:00
|
|
|
static routerinfo_t *desc_routerinfo = NULL;
|
2007-05-29 19:31:13 +02:00
|
|
|
/** My extrainfo */
|
2007-04-16 19:55:08 +02:00
|
|
|
static extrainfo_t *desc_extrainfo = NULL;
|
2005-08-22 05:10:53 +02:00
|
|
|
/** Since when has our descriptor been "clean"? 0 if we need to regenerate it
|
|
|
|
* now. */
|
|
|
|
static time_t desc_clean_since = 0;
|
2004-11-13 17:53:48 +01:00
|
|
|
/** Boolean: do we need to regenerate the above? */
|
|
|
|
static int desc_needs_upload = 0;
|
2004-05-04 20:17:45 +02:00
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** OR only: If <b>force</b> is true, or we haven't uploaded this
|
|
|
|
* descriptor successfully yet, try to upload our signed descriptor to
|
|
|
|
* all the directory servers we know about.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
router_upload_dir_desc_to_dirservers(int force)
|
|
|
|
{
|
2010-09-29 06:38:32 +02:00
|
|
|
const routerinfo_t *ri;
|
2007-05-01 22:13:49 +02:00
|
|
|
extrainfo_t *ei;
|
|
|
|
char *msg;
|
|
|
|
size_t desc_len, extra_len = 0, total_len;
|
2007-05-08 11:13:30 +02:00
|
|
|
authority_type_t auth = get_options()->_PublishServerDescriptor;
|
2007-05-01 22:13:49 +02:00
|
|
|
|
|
|
|
ri = router_get_my_routerinfo();
|
|
|
|
if (!ri) {
|
2006-07-17 08:54:28 +02:00
|
|
|
log_info(LD_GENERAL, "No descriptor; skipping upload");
|
2003-12-06 06:54:04 +01:00
|
|
|
return;
|
|
|
|
}
|
2007-05-01 22:13:49 +02:00
|
|
|
ei = router_get_my_extrainfo();
|
2007-05-08 11:13:30 +02:00
|
|
|
if (auth == NO_AUTHORITY)
|
2006-02-19 23:02:02 +01:00
|
|
|
return;
|
2005-08-23 02:47:44 +02:00
|
|
|
if (!force && !desc_needs_upload)
|
2004-11-13 17:53:48 +01:00
|
|
|
return;
|
|
|
|
desc_needs_upload = 0;
|
2007-05-01 22:13:49 +02:00
|
|
|
|
|
|
|
desc_len = ri->cache_info.signed_descriptor_len;
|
2007-05-01 22:41:27 +02:00
|
|
|
extra_len = ei ? ei->cache_info.signed_descriptor_len : 0;
|
2007-05-01 22:13:49 +02:00
|
|
|
total_len = desc_len + extra_len + 1;
|
|
|
|
msg = tor_malloc(total_len);
|
|
|
|
memcpy(msg, ri->cache_info.signed_descriptor_body, desc_len);
|
2007-05-01 22:41:27 +02:00
|
|
|
if (ei) {
|
2007-05-01 22:13:49 +02:00
|
|
|
memcpy(msg+desc_len, ei->cache_info.signed_descriptor_body, extra_len);
|
|
|
|
}
|
|
|
|
msg[desc_len+extra_len] = 0;
|
|
|
|
|
2007-07-22 02:16:48 +02:00
|
|
|
directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_DIR,
|
|
|
|
(auth & BRIDGE_AUTHORITY) ?
|
|
|
|
ROUTER_PURPOSE_BRIDGE :
|
|
|
|
ROUTER_PURPOSE_GENERAL,
|
|
|
|
auth, msg, desc_len, extra_len);
|
2007-05-01 22:13:49 +02:00
|
|
|
tor_free(msg);
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2005-03-19 07:57:16 +01:00
|
|
|
/** OR only: Check whether my exit policy says to allow connection to
|
2005-07-01 04:01:21 +02:00
|
|
|
* conn. Return 0 if we accept; non-0 if we reject.
|
2003-12-06 06:54:04 +01:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2006-07-26 21:07:26 +02:00
|
|
|
router_compare_to_my_exit_policy(edge_connection_t *conn)
|
2004-04-07 21:46:27 +02:00
|
|
|
{
|
2007-01-09 01:37:13 +01:00
|
|
|
if (!router_get_my_routerinfo()) /* make sure desc_routerinfo exists */
|
|
|
|
return -1;
|
2004-07-07 21:49:48 +02:00
|
|
|
|
|
|
|
/* make sure it's resolved to something. this way we can't get a
|
|
|
|
'maybe' below. */
|
2008-08-05 22:08:19 +02:00
|
|
|
if (tor_addr_is_null(&conn->_base.addr))
|
2004-07-07 21:49:48 +02:00
|
|
|
return -1;
|
|
|
|
|
2008-12-26 23:51:25 +01:00
|
|
|
/* XXXX IPv6 */
|
|
|
|
if (tor_addr_family(&conn->_base.addr) != AF_INET)
|
|
|
|
return -1;
|
|
|
|
|
2008-08-05 22:08:19 +02:00
|
|
|
return compare_tor_addr_to_addr_policy(&conn->_base.addr, conn->_base.port,
|
2005-03-19 07:57:16 +01:00
|
|
|
desc_routerinfo->exit_policy) != ADDR_POLICY_ACCEPTED;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2010-09-21 07:03:29 +02:00
|
|
|
/** Return true iff my exit policy is reject *:*. Return -1 if we don't
|
|
|
|
* have a descriptor */
|
|
|
|
int
|
|
|
|
router_my_exit_policy_is_reject_star(void)
|
|
|
|
{
|
|
|
|
if (!router_get_my_routerinfo()) /* make sure desc_routerinfo exists */
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return desc_routerinfo->policy_is_reject_star;
|
|
|
|
}
|
|
|
|
|
2005-05-23 07:20:52 +02:00
|
|
|
/** Return true iff I'm a server and <b>digest</b> is equal to
|
2010-10-04 07:38:53 +02:00
|
|
|
* my server identity key digest. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
router_digest_is_me(const char *digest)
|
2004-04-07 21:46:27 +02:00
|
|
|
{
|
2010-10-04 07:38:53 +02:00
|
|
|
return (server_identitykey &&
|
|
|
|
!memcmp(server_identitykey_digest, digest, DIGEST_LEN));
|
2004-04-07 21:46:27 +02:00
|
|
|
}
|
|
|
|
|
2008-02-24 23:11:12 +01:00
|
|
|
/** Return true iff I'm a server and <b>digest</b> is equal to
|
|
|
|
* my identity digest. */
|
|
|
|
int
|
|
|
|
router_extrainfo_digest_is_me(const char *digest)
|
|
|
|
{
|
2008-02-24 23:11:18 +01:00
|
|
|
extrainfo_t *ei = router_get_my_extrainfo();
|
|
|
|
if (!ei)
|
2008-02-24 23:11:12 +01:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
return !memcmp(digest,
|
2008-02-24 23:11:18 +01:00
|
|
|
ei->cache_info.signed_descriptor_digest,
|
2008-02-24 23:11:12 +01:00
|
|
|
DIGEST_LEN);
|
|
|
|
}
|
|
|
|
|
2005-05-23 07:20:52 +02:00
|
|
|
/** A wrapper around router_digest_is_me(). */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
2010-09-29 06:38:32 +02:00
|
|
|
router_is_me(const routerinfo_t *router)
|
2005-05-23 07:20:52 +02:00
|
|
|
{
|
2005-11-05 21:15:27 +01:00
|
|
|
return router_digest_is_me(router->cache_info.identity_digest);
|
2005-05-23 07:20:52 +02:00
|
|
|
}
|
|
|
|
|
2005-09-08 22:18:15 +02:00
|
|
|
/** Return true iff <b>fp</b> is a hex fingerprint of my identity digest. */
|
|
|
|
int
|
|
|
|
router_fingerprint_is_me(const char *fp)
|
|
|
|
{
|
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
if (strlen(fp) == HEX_DIGEST_LEN &&
|
|
|
|
base16_decode(digest, sizeof(digest), fp, HEX_DIGEST_LEN) == 0)
|
|
|
|
return router_digest_is_me(digest);
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Return a routerinfo for this OR, rebuilding a fresh one if
|
2004-05-04 20:17:45 +02:00
|
|
|
* necessary. Return NULL on error, or if called on an OP. */
|
2010-09-29 06:38:32 +02:00
|
|
|
const routerinfo_t *
|
2005-06-11 20:52:12 +02:00
|
|
|
router_get_my_routerinfo(void)
|
2004-04-06 00:22:42 +02:00
|
|
|
{
|
2004-11-06 06:18:11 +01:00
|
|
|
if (!server_mode(get_options()))
|
2004-04-06 00:22:42 +02:00
|
|
|
return NULL;
|
2006-09-30 22:40:26 +02:00
|
|
|
if (router_rebuild_descriptor(0))
|
|
|
|
return NULL;
|
2004-04-06 00:22:42 +02:00
|
|
|
return desc_routerinfo;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** OR only: Return a signed server descriptor for this OR, rebuilding a fresh
|
2004-05-04 20:17:45 +02:00
|
|
|
* one if necessary. Return NULL on error.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
const char *
|
|
|
|
router_get_my_descriptor(void)
|
|
|
|
{
|
2006-01-12 19:04:17 +01:00
|
|
|
const char *body;
|
2006-04-24 01:09:03 +02:00
|
|
|
if (!router_get_my_routerinfo())
|
|
|
|
return NULL;
|
2006-06-22 09:01:54 +02:00
|
|
|
/* Make sure this is nul-terminated. */
|
|
|
|
tor_assert(desc_routerinfo->cache_info.saved_location == SAVED_NOWHERE);
|
2006-01-12 19:04:17 +01:00
|
|
|
body = signed_descriptor_get_body(&desc_routerinfo->cache_info);
|
2006-06-22 09:01:54 +02:00
|
|
|
tor_assert(!body[desc_routerinfo->cache_info.signed_descriptor_len]);
|
2006-02-13 11:33:00 +01:00
|
|
|
log_debug(LD_GENERAL,"my desc is '%s'", body);
|
2006-01-12 19:04:17 +01:00
|
|
|
return body;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2008-12-22 15:56:28 +01:00
|
|
|
/** Return the extrainfo document for this OR, or NULL if we have none.
|
2007-05-29 19:31:13 +02:00
|
|
|
* Rebuilt it (and the server descriptor) if necessary. */
|
2007-04-16 20:39:39 +02:00
|
|
|
extrainfo_t *
|
2007-04-16 19:55:08 +02:00
|
|
|
router_get_my_extrainfo(void)
|
|
|
|
{
|
|
|
|
if (!server_mode(get_options()))
|
|
|
|
return NULL;
|
|
|
|
if (router_rebuild_descriptor(0))
|
|
|
|
return NULL;
|
2007-04-16 20:39:39 +02:00
|
|
|
return desc_extrainfo;
|
2007-04-16 19:55:08 +02:00
|
|
|
}
|
|
|
|
|
2007-01-22 08:51:06 +01:00
|
|
|
/** A list of nicknames that we've warned about including in our family
|
|
|
|
* declaration verbatim rather than as digests. */
|
2005-10-06 01:20:45 +02:00
|
|
|
static smartlist_t *warned_nonexistent_family = NULL;
|
|
|
|
|
2006-07-17 08:35:06 +02:00
|
|
|
static int router_guess_address_from_dir_headers(uint32_t *guess);
|
|
|
|
|
2008-02-24 00:39:16 +01:00
|
|
|
/** Make a current best guess at our address, either because
|
2006-09-09 05:18:39 +02:00
|
|
|
* it's configured in torrc, or because we've learned it from
|
2008-02-24 00:39:16 +01:00
|
|
|
* dirserver headers. Place the answer in *<b>addr</b> and return
|
|
|
|
* 0 on success, else return -1 if we have no guess. */
|
2006-09-09 05:18:39 +02:00
|
|
|
int
|
|
|
|
router_pick_published_address(or_options_t *options, uint32_t *addr)
|
|
|
|
{
|
|
|
|
if (resolve_my_address(LOG_INFO, options, addr, NULL) < 0) {
|
|
|
|
log_info(LD_CONFIG, "Could not determine our address locally. "
|
|
|
|
"Checking if directory headers provide any hints.");
|
|
|
|
if (router_guess_address_from_dir_headers(addr) < 0) {
|
|
|
|
log_info(LD_CONFIG, "No hints from directory headers either. "
|
|
|
|
"Will try again later.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
2010-10-02 03:31:09 +02:00
|
|
|
log_info(LD_CONFIG,"Success: chose address '%s'.", fmt_addr32(*addr));
|
2006-09-09 05:18:39 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-05-29 19:31:13 +02:00
|
|
|
/** If <b>force</b> is true, or our descriptor is out-of-date, rebuild a fresh
|
|
|
|
* routerinfo, signed server descriptor, and extra-info document for this OR.
|
2006-07-17 08:35:06 +02:00
|
|
|
* Return 0 on success, -1 on temporary error.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
router_rebuild_descriptor(int force)
|
|
|
|
{
|
2003-12-06 06:54:04 +01:00
|
|
|
routerinfo_t *ri;
|
2007-04-16 19:55:08 +02:00
|
|
|
extrainfo_t *ei;
|
2004-08-16 13:43:18 +02:00
|
|
|
uint32_t addr;
|
2004-04-07 23:36:03 +02:00
|
|
|
char platform[256];
|
2004-12-12 00:53:59 +01:00
|
|
|
int hibernating = we_are_hibernating();
|
2004-11-06 06:18:11 +01:00
|
|
|
or_options_t *options = get_options();
|
2004-08-16 13:43:18 +02:00
|
|
|
|
2005-08-22 05:10:53 +02:00
|
|
|
if (desc_clean_since && !force)
|
2004-11-13 17:53:48 +01:00
|
|
|
return 0;
|
|
|
|
|
2006-09-09 05:18:39 +02:00
|
|
|
if (router_pick_published_address(options, &addr) < 0) {
|
|
|
|
/* Stop trying to rebuild our descriptor every second. We'll
|
2010-10-01 20:11:08 +02:00
|
|
|
* learn that it's time to try again when ip_address_changed()
|
2006-09-09 05:18:39 +02:00
|
|
|
* marks it dirty. */
|
|
|
|
desc_clean_since = time(NULL);
|
|
|
|
return -1;
|
2004-04-07 00:23:12 +02:00
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-03-04 02:53:56 +01:00
|
|
|
ri = tor_malloc_zero(sizeof(routerinfo_t));
|
2007-11-07 18:11:23 +01:00
|
|
|
ri->cache_info.routerlist_index = -1;
|
2008-07-24 15:44:04 +02:00
|
|
|
ri->address = tor_dup_ip(addr);
|
2004-11-06 06:18:11 +01:00
|
|
|
ri->nickname = tor_strdup(options->Nickname);
|
2004-08-16 13:43:18 +02:00
|
|
|
ri->addr = addr;
|
2004-12-13 20:42:46 +01:00
|
|
|
ri->or_port = options->ORPort;
|
2005-09-29 08:45:03 +02:00
|
|
|
ri->dir_port = options->DirPort;
|
2005-11-05 21:15:27 +01:00
|
|
|
ri->cache_info.published_on = time(NULL);
|
2005-12-14 21:40:40 +01:00
|
|
|
ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from
|
|
|
|
* main thread */
|
2010-10-04 07:38:53 +02:00
|
|
|
ri->identity_pkey = crypto_pk_dup_key(get_server_identity_key());
|
2005-11-05 21:15:27 +01:00
|
|
|
if (crypto_pk_get_digest(ri->identity_pkey,
|
|
|
|
ri->cache_info.identity_digest)<0) {
|
2004-07-01 03:16:59 +02:00
|
|
|
routerinfo_free(ri);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-07 23:36:03 +02:00
|
|
|
get_platform_str(platform, sizeof(platform));
|
|
|
|
ri->platform = tor_strdup(platform);
|
2007-05-04 11:20:13 +02:00
|
|
|
|
|
|
|
/* compute ri->bandwidthrate as the min of various options */
|
2009-07-07 18:04:00 +02:00
|
|
|
ri->bandwidthrate = get_effective_bwrate(options);
|
2007-05-04 11:20:13 +02:00
|
|
|
|
|
|
|
/* and compute ri->bandwidthburst similarly */
|
2009-07-07 18:04:00 +02:00
|
|
|
ri->bandwidthburst = get_effective_bwburst(options);
|
2005-03-22 20:01:46 +01:00
|
|
|
|
2007-05-04 11:20:13 +02:00
|
|
|
ri->bandwidthcapacity = hibernating ? 0 : rep_hist_bandwidth_assess();
|
2005-03-22 20:01:46 +01:00
|
|
|
|
2011-02-22 20:06:28 +01:00
|
|
|
if (dns_seems_to_be_broken() || has_dns_init_failed()) {
|
|
|
|
/* DNS is screwed up; don't claim to be an exit. */
|
|
|
|
policies_exit_policy_append_reject_star(&ri->exit_policy);
|
|
|
|
} else {
|
|
|
|
policies_parse_exit_policy(options->ExitPolicy, &ri->exit_policy,
|
|
|
|
options->ExitPolicyRejectPrivate,
|
|
|
|
ri->address, !options->BridgeRelay);
|
|
|
|
}
|
2010-09-21 07:03:29 +02:00
|
|
|
ri->policy_is_reject_star =
|
|
|
|
policy_is_reject_star(ri->exit_policy);
|
2005-05-14 02:13:17 +02:00
|
|
|
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
#if 0
|
|
|
|
/* XXXX NM NM I belive this is safe to remove */
|
2005-09-04 01:10:28 +02:00
|
|
|
if (authdir_mode(options))
|
2006-03-19 02:21:59 +01:00
|
|
|
ri->is_valid = ri->is_named = 1; /* believe in yourself */
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
#endif
|
|
|
|
|
2004-11-06 06:18:11 +01:00
|
|
|
if (options->MyFamily) {
|
2005-10-07 20:56:21 +02:00
|
|
|
smartlist_t *family;
|
2005-10-06 01:20:45 +02:00
|
|
|
if (!warned_nonexistent_family)
|
|
|
|
warned_nonexistent_family = smartlist_create();
|
2005-10-07 20:56:21 +02:00
|
|
|
family = smartlist_create();
|
2004-10-15 03:58:11 +02:00
|
|
|
ri->declared_family = smartlist_create();
|
2005-10-05 00:23:31 +02:00
|
|
|
smartlist_split_string(family, options->MyFamily, ",",
|
2008-10-01 05:41:33 +02:00
|
|
|
SPLIT_SKIP_SPACE|SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
2010-09-29 06:38:32 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(family, char *, name) {
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
const node_t *member;
|
2006-12-16 08:04:26 +01:00
|
|
|
if (!strcasecmp(name, options->Nickname))
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
goto skip; /* Don't list ourself, that's redundant */
|
2006-12-16 08:04:26 +01:00
|
|
|
else
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
member = node_get_by_nickname(name, 1);
|
2005-10-05 00:23:31 +02:00
|
|
|
if (!member) {
|
2008-01-07 19:54:58 +01:00
|
|
|
int is_legal = is_legal_nickname_or_hexdigest(name);
|
2006-03-15 06:04:11 +01:00
|
|
|
if (!smartlist_string_isin(warned_nonexistent_family, name) &&
|
|
|
|
!is_legal_hexdigest(name)) {
|
2008-01-07 19:54:58 +01:00
|
|
|
if (is_legal)
|
|
|
|
log_warn(LD_CONFIG,
|
|
|
|
"I have no descriptor for the router named \"%s\" in my "
|
|
|
|
"declared family; I'll use the nickname as is, but "
|
|
|
|
"this may confuse clients.", name);
|
|
|
|
else
|
|
|
|
log_warn(LD_CONFIG, "There is a router named \"%s\" in my "
|
|
|
|
"declared family, but that isn't a legal nickname. "
|
|
|
|
"Skipping it.", escaped(name));
|
2005-10-06 01:20:45 +02:00
|
|
|
smartlist_add(warned_nonexistent_family, tor_strdup(name));
|
|
|
|
}
|
2008-01-07 19:54:58 +01:00
|
|
|
if (is_legal) {
|
|
|
|
smartlist_add(ri->declared_family, name);
|
|
|
|
name = NULL;
|
|
|
|
}
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
} else if (router_digest_is_me(member->identity)) {
|
2006-12-16 08:04:26 +01:00
|
|
|
/* Don't list ourself in our own family; that's redundant */
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
/* XXX shouldn't be possible */
|
2005-10-05 00:23:31 +02:00
|
|
|
} else {
|
|
|
|
char *fp = tor_malloc(HEX_DIGEST_LEN+2);
|
|
|
|
fp[0] = '$';
|
|
|
|
base16_encode(fp+1,HEX_DIGEST_LEN+1,
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
member->identity, DIGEST_LEN);
|
2005-10-05 00:23:31 +02:00
|
|
|
smartlist_add(ri->declared_family, fp);
|
2005-10-06 01:20:45 +02:00
|
|
|
if (smartlist_string_isin(warned_nonexistent_family, name))
|
|
|
|
smartlist_string_remove(warned_nonexistent_family, name);
|
2005-10-05 00:23:31 +02:00
|
|
|
}
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
skip:
|
2005-10-05 00:23:31 +02:00
|
|
|
tor_free(name);
|
2010-09-29 06:38:32 +02:00
|
|
|
} SMARTLIST_FOREACH_END(name);
|
2006-09-14 07:07:34 +02:00
|
|
|
|
2006-09-14 07:17:02 +02:00
|
|
|
/* remove duplicates from the list */
|
2006-09-14 07:07:34 +02:00
|
|
|
smartlist_sort_strings(ri->declared_family);
|
2006-09-15 06:27:58 +02:00
|
|
|
smartlist_uniq_strings(ri->declared_family);
|
2006-09-14 07:07:34 +02:00
|
|
|
|
2005-10-05 00:23:31 +02:00
|
|
|
smartlist_free(family);
|
2004-10-15 03:58:11 +02:00
|
|
|
}
|
2007-04-16 19:55:08 +02:00
|
|
|
|
|
|
|
/* Now generate the extrainfo. */
|
|
|
|
ei = tor_malloc_zero(sizeof(extrainfo_t));
|
2007-05-20 22:16:45 +02:00
|
|
|
ei->cache_info.is_extrainfo = 1;
|
2007-04-16 19:55:08 +02:00
|
|
|
strlcpy(ei->nickname, get_options()->Nickname, sizeof(ei->nickname));
|
|
|
|
ei->cache_info.published_on = ri->cache_info.published_on;
|
|
|
|
memcpy(ei->cache_info.identity_digest, ri->cache_info.identity_digest,
|
|
|
|
DIGEST_LEN);
|
2010-11-13 22:25:19 +01:00
|
|
|
if (extrainfo_dump_to_string(&ei->cache_info.signed_descriptor_body,
|
|
|
|
ei, get_server_identity_key()) < 0) {
|
2007-04-16 19:55:08 +02:00
|
|
|
log_warn(LD_BUG, "Couldn't generate extra-info descriptor.");
|
2008-01-16 06:27:19 +01:00
|
|
|
extrainfo_free(ei);
|
2010-11-15 10:36:08 +01:00
|
|
|
ei = NULL;
|
|
|
|
} else {
|
|
|
|
ei->cache_info.signed_descriptor_len =
|
|
|
|
strlen(ei->cache_info.signed_descriptor_body);
|
|
|
|
router_get_extrainfo_hash(ei->cache_info.signed_descriptor_body,
|
|
|
|
ei->cache_info.signed_descriptor_digest);
|
2007-04-16 19:55:08 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Now finish the router descriptor. */
|
2010-11-15 10:36:08 +01:00
|
|
|
if (ei) {
|
|
|
|
memcpy(ri->cache_info.extra_info_digest,
|
|
|
|
ei->cache_info.signed_descriptor_digest,
|
|
|
|
DIGEST_LEN);
|
|
|
|
} else {
|
|
|
|
/* ri was allocated with tor_malloc_zero, so there is no need to
|
|
|
|
* zero ri->cache_info.extra_info_digest here. */
|
|
|
|
}
|
2006-01-12 19:04:17 +01:00
|
|
|
ri->cache_info.signed_descriptor_body = tor_malloc(8192);
|
|
|
|
if (router_dump_router_to_string(ri->cache_info.signed_descriptor_body, 8192,
|
2010-10-04 07:38:53 +02:00
|
|
|
ri, get_server_identity_key()) < 0) {
|
2007-03-04 21:11:46 +01:00
|
|
|
log_warn(LD_BUG, "Couldn't generate router descriptor.");
|
2010-01-24 02:46:38 +01:00
|
|
|
routerinfo_free(ri);
|
|
|
|
extrainfo_free(ei);
|
2005-02-25 21:46:13 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2005-11-05 21:15:27 +01:00
|
|
|
ri->cache_info.signed_descriptor_len =
|
2006-01-12 19:04:17 +01:00
|
|
|
strlen(ri->cache_info.signed_descriptor_body);
|
2007-05-24 19:13:00 +02:00
|
|
|
|
2008-01-10 19:20:04 +01:00
|
|
|
ri->purpose =
|
|
|
|
options->BridgeRelay ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL;
|
2009-01-06 08:13:24 +01:00
|
|
|
ri->cache_info.send_unencrypted = 1;
|
|
|
|
/* Let bridges serve their own descriptors unencrypted, so they can
|
|
|
|
* pass reachability testing. (If they want to be harder to notice,
|
|
|
|
* they can always leave the DirPort off). */
|
2010-11-24 16:50:29 +01:00
|
|
|
if (ei && !options->BridgeRelay)
|
2008-01-10 19:20:04 +01:00
|
|
|
ei->cache_info.send_unencrypted = 1;
|
|
|
|
|
2007-05-24 19:13:00 +02:00
|
|
|
router_get_router_hash(ri->cache_info.signed_descriptor_body,
|
2010-02-25 10:31:36 +01:00
|
|
|
strlen(ri->cache_info.signed_descriptor_body),
|
2007-05-24 19:13:00 +02:00
|
|
|
ri->cache_info.signed_descriptor_digest);
|
2004-07-22 08:03:53 +02:00
|
|
|
|
2010-11-15 10:36:08 +01:00
|
|
|
if (ei) {
|
|
|
|
tor_assert(! routerinfo_incompatible_with_extrainfo(ri, ei, NULL, NULL));
|
|
|
|
}
|
2007-04-16 19:55:08 +02:00
|
|
|
|
2009-12-12 08:07:59 +01:00
|
|
|
routerinfo_free(desc_routerinfo);
|
2003-12-06 06:54:04 +01:00
|
|
|
desc_routerinfo = ri;
|
2009-12-12 08:07:59 +01:00
|
|
|
extrainfo_free(desc_extrainfo);
|
2007-04-16 19:55:08 +02:00
|
|
|
desc_extrainfo = ei;
|
2005-02-25 21:46:13 +01:00
|
|
|
|
2005-08-22 05:10:53 +02:00
|
|
|
desc_clean_since = time(NULL);
|
2004-11-13 17:53:48 +01:00
|
|
|
desc_needs_upload = 1;
|
2006-09-29 20:13:25 +02:00
|
|
|
control_event_my_descriptor_changed();
|
2003-12-06 06:54:04 +01:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-08-22 05:10:53 +02:00
|
|
|
/** Mark descriptor out of date if it's older than <b>when</b> */
|
|
|
|
void
|
|
|
|
mark_my_descriptor_dirty_if_older_than(time_t when)
|
|
|
|
{
|
|
|
|
if (desc_clean_since < when)
|
|
|
|
mark_my_descriptor_dirty();
|
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** Call when the current descriptor is out of date. */
|
2004-11-13 17:53:48 +01:00
|
|
|
void
|
|
|
|
mark_my_descriptor_dirty(void)
|
|
|
|
{
|
2005-08-22 05:10:53 +02:00
|
|
|
desc_clean_since = 0;
|
|
|
|
}
|
|
|
|
|
2006-03-12 23:48:18 +01:00
|
|
|
/** How frequently will we republish our descriptor because of large (factor
|
|
|
|
* of 2) shifts in estimated bandwidth? */
|
|
|
|
#define MAX_BANDWIDTH_CHANGE_FREQ (20*60)
|
|
|
|
|
2005-08-22 05:10:53 +02:00
|
|
|
/** Check whether bandwidth has changed a lot since the last time we announced
|
2005-11-01 04:48:51 +01:00
|
|
|
* bandwidth. If so, mark our descriptor dirty. */
|
2005-08-22 05:10:53 +02:00
|
|
|
void
|
|
|
|
check_descriptor_bandwidth_changed(time_t now)
|
|
|
|
{
|
|
|
|
static time_t last_changed = 0;
|
|
|
|
uint64_t prev, cur;
|
|
|
|
if (!desc_routerinfo)
|
|
|
|
return;
|
|
|
|
|
|
|
|
prev = desc_routerinfo->bandwidthcapacity;
|
|
|
|
cur = we_are_hibernating() ? 0 : rep_hist_bandwidth_assess();
|
|
|
|
if ((prev != cur && (!prev || !cur)) ||
|
|
|
|
cur > prev*2 ||
|
|
|
|
cur < prev/2) {
|
|
|
|
if (last_changed+MAX_BANDWIDTH_CHANGE_FREQ < now) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_info(LD_GENERAL,
|
|
|
|
"Measured bandwidth has changed; rebuilding descriptor.");
|
2005-08-22 05:10:53 +02:00
|
|
|
mark_my_descriptor_dirty();
|
|
|
|
last_changed = now;
|
|
|
|
}
|
|
|
|
}
|
2004-11-13 17:53:48 +01:00
|
|
|
}
|
|
|
|
|
2007-02-16 21:39:37 +01:00
|
|
|
/** Note at log level severity that our best guess of address has changed from
|
2007-02-24 08:50:38 +01:00
|
|
|
* <b>prev</b> to <b>cur</b>. */
|
2006-07-17 08:35:06 +02:00
|
|
|
static void
|
2008-12-10 02:46:51 +01:00
|
|
|
log_addr_has_changed(int severity, uint32_t prev, uint32_t cur,
|
|
|
|
const char *source)
|
2006-07-17 08:35:06 +02:00
|
|
|
{
|
|
|
|
char addrbuf_prev[INET_NTOA_BUF_LEN];
|
|
|
|
char addrbuf_cur[INET_NTOA_BUF_LEN];
|
|
|
|
struct in_addr in_prev;
|
|
|
|
struct in_addr in_cur;
|
|
|
|
|
|
|
|
in_prev.s_addr = htonl(prev);
|
|
|
|
tor_inet_ntoa(&in_prev, addrbuf_prev, sizeof(addrbuf_prev));
|
|
|
|
|
|
|
|
in_cur.s_addr = htonl(cur);
|
|
|
|
tor_inet_ntoa(&in_cur, addrbuf_cur, sizeof(addrbuf_cur));
|
|
|
|
|
2006-07-17 10:17:51 +02:00
|
|
|
if (prev)
|
2006-07-17 21:33:54 +02:00
|
|
|
log_fn(severity, LD_GENERAL,
|
|
|
|
"Our IP Address has changed from %s to %s; "
|
2008-12-10 02:46:51 +01:00
|
|
|
"rebuilding descriptor (source: %s).",
|
|
|
|
addrbuf_prev, addrbuf_cur, source);
|
2006-07-17 10:17:51 +02:00
|
|
|
else
|
|
|
|
log_notice(LD_GENERAL,
|
2009-06-30 16:14:15 +02:00
|
|
|
"Guessed our IP address as %s (source: %s).",
|
|
|
|
addrbuf_cur, source);
|
2006-07-17 08:35:06 +02:00
|
|
|
}
|
|
|
|
|
2005-10-13 00:41:16 +02:00
|
|
|
/** Check whether our own address as defined by the Address configuration
|
2005-11-01 04:48:51 +01:00
|
|
|
* has changed. This is for routers that get their address from a service
|
|
|
|
* like dyndns. If our address has changed, mark our descriptor dirty. */
|
2005-10-13 00:41:16 +02:00
|
|
|
void
|
|
|
|
check_descriptor_ipaddress_changed(time_t now)
|
|
|
|
{
|
|
|
|
uint32_t prev, cur;
|
|
|
|
or_options_t *options = get_options();
|
2006-06-05 00:42:13 +02:00
|
|
|
(void) now;
|
2005-10-13 00:41:16 +02:00
|
|
|
|
|
|
|
if (!desc_routerinfo)
|
|
|
|
return;
|
|
|
|
|
|
|
|
prev = desc_routerinfo->addr;
|
2006-07-17 08:35:06 +02:00
|
|
|
if (resolve_my_address(LOG_INFO, options, &cur, NULL) < 0) {
|
|
|
|
log_info(LD_CONFIG,"options->Address didn't resolve into an IP.");
|
2005-10-13 00:41:16 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (prev != cur) {
|
2009-06-30 16:14:15 +02:00
|
|
|
log_addr_has_changed(LOG_NOTICE, prev, cur, "resolve");
|
2006-12-28 22:29:20 +01:00
|
|
|
ip_address_changed(0);
|
2006-07-17 08:35:06 +02:00
|
|
|
}
|
|
|
|
}
|
2005-10-13 00:41:16 +02:00
|
|
|
|
2007-02-24 08:50:38 +01:00
|
|
|
/** The most recently guessed value of our IP address, based on directory
|
2007-02-16 21:39:37 +01:00
|
|
|
* headers. */
|
2006-07-17 08:35:06 +02:00
|
|
|
static uint32_t last_guessed_ip = 0;
|
2005-10-13 00:41:16 +02:00
|
|
|
|
2008-02-09 11:46:22 +01:00
|
|
|
/** A directory server <b>d_conn</b> told us our IP address is
|
|
|
|
* <b>suggestion</b>.
|
2006-07-17 08:35:06 +02:00
|
|
|
* If this address is different from the one we think we are now, and
|
|
|
|
* if our computer doesn't actually know its IP address, then switch. */
|
|
|
|
void
|
2008-02-09 11:46:22 +01:00
|
|
|
router_new_address_suggestion(const char *suggestion,
|
|
|
|
const dir_connection_t *d_conn)
|
2006-07-17 08:35:06 +02:00
|
|
|
{
|
2006-11-26 19:36:51 +01:00
|
|
|
uint32_t addr, cur = 0;
|
2006-07-17 08:35:06 +02:00
|
|
|
struct in_addr in;
|
2006-09-09 21:36:51 +02:00
|
|
|
or_options_t *options = get_options();
|
2005-10-13 00:41:16 +02:00
|
|
|
|
2006-07-17 08:35:06 +02:00
|
|
|
/* first, learn what the IP address actually is */
|
|
|
|
if (!tor_inet_aton(suggestion, &in)) {
|
2006-12-13 01:28:56 +01:00
|
|
|
log_debug(LD_DIR, "Malformed X-Your-Address-Is header %s. Ignoring.",
|
|
|
|
escaped(suggestion));
|
2006-07-17 08:35:06 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
addr = ntohl(in.s_addr);
|
|
|
|
|
2006-09-09 21:16:07 +02:00
|
|
|
log_debug(LD_DIR, "Got X-Your-Address-Is: %s.", suggestion);
|
|
|
|
|
2006-11-26 21:01:45 +01:00
|
|
|
if (!server_mode(options)) {
|
|
|
|
last_guessed_ip = addr; /* store it in case we need it later */
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2006-11-26 19:36:51 +01:00
|
|
|
if (resolve_my_address(LOG_INFO, options, &cur, NULL) >= 0) {
|
2006-07-17 08:35:06 +02:00
|
|
|
/* We're all set -- we already know our address. Great. */
|
|
|
|
last_guessed_ip = cur; /* store it in case we need it later */
|
|
|
|
return;
|
|
|
|
}
|
2006-12-25 04:42:38 +01:00
|
|
|
if (is_internal_IP(addr, 0)) {
|
|
|
|
/* Don't believe anybody who says our IP is, say, 127.0.0.1. */
|
|
|
|
return;
|
|
|
|
}
|
2008-08-05 22:08:19 +02:00
|
|
|
if (tor_addr_eq_ipv4h(&d_conn->_base.addr, addr)) {
|
2008-02-09 11:36:49 +01:00
|
|
|
/* Don't believe anybody who says our IP is their IP. */
|
2008-02-09 11:46:22 +01:00
|
|
|
log_debug(LD_DIR, "A directory server told us our IP address is %s, "
|
|
|
|
"but he's just reporting his own IP address. Ignoring.",
|
|
|
|
suggestion);
|
2008-02-09 11:36:49 +01:00
|
|
|
return;
|
|
|
|
}
|
2006-07-17 08:35:06 +02:00
|
|
|
|
2006-12-25 04:42:38 +01:00
|
|
|
/* Okay. We can't resolve our own address, and X-Your-Address-Is is giving
|
|
|
|
* us an answer different from what we had the last time we managed to
|
|
|
|
* resolve it. */
|
2006-07-17 08:35:06 +02:00
|
|
|
if (last_guessed_ip != addr) {
|
2007-01-06 06:42:31 +01:00
|
|
|
control_event_server_status(LOG_NOTICE,
|
|
|
|
"EXTERNAL_ADDRESS ADDRESS=%s METHOD=DIRSERV",
|
|
|
|
suggestion);
|
2008-12-10 02:46:51 +01:00
|
|
|
log_addr_has_changed(LOG_NOTICE, last_guessed_ip, addr,
|
|
|
|
d_conn->_base.address);
|
2006-12-28 22:29:20 +01:00
|
|
|
ip_address_changed(0);
|
2006-07-17 08:35:06 +02:00
|
|
|
last_guessed_ip = addr; /* router_rebuild_descriptor() will fetch it */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/** We failed to resolve our address locally, but we'd like to build
|
|
|
|
* a descriptor and publish / test reachability. If we have a guess
|
|
|
|
* about our address based on directory headers, answer it and return
|
|
|
|
* 0; else return -1. */
|
|
|
|
static int
|
|
|
|
router_guess_address_from_dir_headers(uint32_t *guess)
|
|
|
|
{
|
|
|
|
if (last_guessed_ip) {
|
|
|
|
*guess = last_guessed_ip;
|
|
|
|
return 0;
|
2005-10-13 00:41:16 +02:00
|
|
|
}
|
2006-07-17 08:35:06 +02:00
|
|
|
return -1;
|
2005-10-13 00:41:16 +02:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Set <b>platform</b> (max length <b>len</b>) to a NUL-terminated short
|
|
|
|
* string describing the version of Tor and the operating system we're
|
2004-05-04 20:17:45 +02:00
|
|
|
* currently running on.
|
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
|
|
|
get_platform_str(char *platform, size_t len)
|
2003-12-06 06:54:04 +01:00
|
|
|
{
|
2007-05-22 17:48:46 +02:00
|
|
|
tor_snprintf(platform, len, "Tor %s on %s", get_version(), get_uname());
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/* XXX need to audit this thing and count fenceposts. maybe
|
|
|
|
* refactor so we don't have to keep asking if we're
|
|
|
|
* near the end of maxlen?
|
|
|
|
*/
|
|
|
|
#define DEBUG_ROUTER_DUMP_ROUTER_TO_STRING
|
2004-05-04 20:17:45 +02:00
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** OR only: Given a routerinfo for this router, and an identity key to sign
|
|
|
|
* with, encode the routerinfo as a signed server descriptor and write the
|
|
|
|
* result into <b>s</b>, using at most <b>maxlen</b> bytes. Return -1 on
|
|
|
|
* failure, and the number of bytes used on success.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
|
|
|
|
crypto_pk_env_t *ident_key)
|
|
|
|
{
|
2004-05-04 20:17:45 +02:00
|
|
|
char *onion_pkey; /* Onion key, PEM-encoded. */
|
|
|
|
char *identity_pkey; /* Identity key, PEM-encoded. */
|
2005-08-26 17:34:53 +02:00
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
char published[ISO_TIME_LEN+1];
|
2004-07-22 08:22:04 +02:00
|
|
|
char fingerprint[FINGERPRINT_LEN+1];
|
2010-11-15 07:17:32 +01:00
|
|
|
int has_extra_info_digest;
|
2007-04-16 19:55:08 +02:00
|
|
|
char extra_info_digest[HEX_DIGEST_LEN+1];
|
2004-10-14 04:47:09 +02:00
|
|
|
size_t onion_pkeylen, identity_pkeylen;
|
|
|
|
size_t written;
|
2003-12-06 06:54:04 +01:00
|
|
|
int result=0;
|
2004-12-04 02:14:36 +01:00
|
|
|
addr_policy_t *tmpe;
|
2004-10-15 03:58:11 +02:00
|
|
|
char *family_line;
|
2005-07-15 20:49:35 +02:00
|
|
|
or_options_t *options = get_options();
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Make sure the identity key matches the one in the routerinfo. */
|
2003-12-06 06:54:04 +01:00
|
|
|
if (crypto_pk_cmp_keys(ident_key, router->identity_pkey)) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_warn(LD_BUG,"Tried to sign a router with a private key that didn't "
|
|
|
|
"match router's public key!");
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-07-22 08:22:04 +02:00
|
|
|
/* record our fingerprint, so we can include it in the descriptor */
|
2004-10-06 15:31:48 +02:00
|
|
|
if (crypto_pk_get_fingerprint(router->identity_pkey, fingerprint, 1)<0) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_err(LD_BUG,"Error computing fingerprint");
|
2004-07-22 08:22:04 +02:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* PEM-encode the onion key */
|
2004-11-28 10:05:49 +01:00
|
|
|
if (crypto_pk_write_public_key_to_string(router->onion_pkey,
|
2004-11-28 12:39:53 +01:00
|
|
|
&onion_pkey,&onion_pkeylen)<0) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_warn(LD_BUG,"write onion_pkey to string failed!");
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2009-12-18 12:55:05 +01:00
|
|
|
/* PEM-encode the identity key */
|
2004-11-28 10:05:49 +01:00
|
|
|
if (crypto_pk_write_public_key_to_string(router->identity_pkey,
|
2005-12-14 21:40:40 +01:00
|
|
|
&identity_pkey,&identity_pkeylen)<0) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_warn(LD_BUG,"write identity_pkey to string failed!");
|
2004-05-04 20:17:45 +02:00
|
|
|
tor_free(onion_pkey);
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Encode the publication time. */
|
2005-11-05 21:15:27 +01:00
|
|
|
format_iso_time(published, router->cache_info.published_on);
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2004-10-15 03:58:11 +02:00
|
|
|
if (router->declared_family && smartlist_len(router->declared_family)) {
|
2004-11-03 19:33:07 +01:00
|
|
|
size_t n;
|
2007-05-17 00:15:14 +02:00
|
|
|
char *family = smartlist_join_strings(router->declared_family, " ", 0, &n);
|
2005-05-02 23:22:31 +02:00
|
|
|
n += strlen("family ") + 2; /* 1 for \n, 1 for \0. */
|
2004-10-15 03:58:11 +02:00
|
|
|
family_line = tor_malloc(n);
|
2007-05-17 00:15:14 +02:00
|
|
|
tor_snprintf(family_line, n, "family %s\n", family);
|
|
|
|
tor_free(family);
|
2004-10-15 03:58:11 +02:00
|
|
|
} else {
|
|
|
|
family_line = tor_strdup("");
|
|
|
|
}
|
|
|
|
|
2010-11-15 07:17:32 +01:00
|
|
|
has_extra_info_digest =
|
2010-11-19 22:23:45 +01:00
|
|
|
! tor_digest_is_zero(router->cache_info.extra_info_digest);
|
2010-11-15 07:17:32 +01:00
|
|
|
|
|
|
|
if (has_extra_info_digest) {
|
|
|
|
base16_encode(extra_info_digest, sizeof(extra_info_digest),
|
|
|
|
router->cache_info.extra_info_digest, DIGEST_LEN);
|
|
|
|
}
|
2007-04-16 19:55:08 +02:00
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Generate the easy portion of the router descriptor. */
|
2004-10-27 08:37:34 +02:00
|
|
|
result = tor_snprintf(s, maxlen,
|
2005-01-04 06:46:54 +01:00
|
|
|
"router %s %s %d 0 %d\n"
|
2003-12-06 06:54:04 +01:00
|
|
|
"platform %s\n"
|
2008-03-30 20:14:55 +02:00
|
|
|
"opt protocols Link 1 2 Circuit 1\n"
|
2003-12-06 06:54:04 +01:00
|
|
|
"published %s\n"
|
2004-07-22 08:22:04 +02:00
|
|
|
"opt fingerprint %s\n"
|
2005-05-02 23:22:31 +02:00
|
|
|
"uptime %ld\n"
|
2004-07-12 20:02:54 +02:00
|
|
|
"bandwidth %d %d %d\n"
|
2010-11-15 07:17:32 +01:00
|
|
|
"%s%s%s%s"
|
2003-12-06 06:54:04 +01:00
|
|
|
"onion-key\n%s"
|
2006-09-21 23:49:03 +02:00
|
|
|
"signing-key\n%s"
|
2008-09-26 20:58:45 +02:00
|
|
|
"%s%s%s%s",
|
2003-12-06 06:54:04 +01:00
|
|
|
router->nickname,
|
|
|
|
router->address,
|
|
|
|
router->or_port,
|
2007-10-14 00:31:35 +02:00
|
|
|
decide_to_advertise_dirport(options, router->dir_port),
|
2004-04-07 23:36:03 +02:00
|
|
|
router->platform,
|
2003-12-06 06:54:04 +01:00
|
|
|
published,
|
2004-07-22 08:22:04 +02:00
|
|
|
fingerprint,
|
2005-01-10 06:10:22 +01:00
|
|
|
stats_n_seconds_working,
|
2004-04-25 00:17:50 +02:00
|
|
|
(int) router->bandwidthrate,
|
|
|
|
(int) router->bandwidthburst,
|
2004-08-15 10:15:12 +02:00
|
|
|
(int) router->bandwidthcapacity,
|
2010-11-15 07:17:32 +01:00
|
|
|
has_extra_info_digest ? "opt extra-info-digest " : "",
|
|
|
|
has_extra_info_digest ? extra_info_digest : "",
|
|
|
|
has_extra_info_digest ? "\n" : "",
|
2007-05-19 02:24:29 +02:00
|
|
|
options->DownloadExtraInfo ? "opt caches-extra-info\n" : "",
|
2004-08-07 04:46:16 +02:00
|
|
|
onion_pkey, identity_pkey,
|
2007-07-28 01:18:55 +02:00
|
|
|
family_line,
|
2007-10-29 20:10:42 +01:00
|
|
|
we_are_hibernating() ? "opt hibernating 1\n" : "",
|
2008-09-26 20:58:45 +02:00
|
|
|
options->HidServDirectoryV2 ? "opt hidden-service-dir\n" : "",
|
|
|
|
options->AllowSingleHopExits ? "opt allow-single-hop-exits\n" : "");
|
2007-10-29 20:10:42 +01:00
|
|
|
|
2004-10-16 22:38:57 +02:00
|
|
|
tor_free(family_line);
|
2004-05-04 20:17:45 +02:00
|
|
|
tor_free(onion_pkey);
|
|
|
|
tor_free(identity_pkey);
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2007-02-24 20:49:35 +01:00
|
|
|
if (result < 0) {
|
|
|
|
log_warn(LD_BUG,"descriptor snprintf #1 ran out of room!");
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
2007-02-24 20:49:35 +01:00
|
|
|
}
|
2004-05-04 20:17:45 +02:00
|
|
|
/* From now on, we use 'written' to remember the current length of 's'. */
|
2003-12-06 06:54:04 +01:00
|
|
|
written = result;
|
|
|
|
|
2005-07-15 20:49:35 +02:00
|
|
|
if (options->ContactInfo && strlen(options->ContactInfo)) {
|
2008-01-07 19:54:58 +01:00
|
|
|
const char *ci = options->ContactInfo;
|
|
|
|
if (strchr(ci, '\n') || strchr(ci, '\r'))
|
|
|
|
ci = escaped(ci);
|
|
|
|
result = tor_snprintf(s+written,maxlen-written, "contact %s\n", ci);
|
2007-02-24 20:49:35 +01:00
|
|
|
if (result<0) {
|
|
|
|
log_warn(LD_BUG,"descriptor snprintf #2 ran out of room!");
|
2004-06-21 06:37:27 +02:00
|
|
|
return -1;
|
2007-02-24 20:49:35 +01:00
|
|
|
}
|
2004-06-21 06:37:27 +02:00
|
|
|
written += result;
|
|
|
|
}
|
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Write the exit policy to the end of 's'. */
|
2011-02-22 20:06:28 +01:00
|
|
|
if (!router->exit_policy || !smartlist_len(router->exit_policy)) {
|
2006-12-28 22:29:11 +01:00
|
|
|
strlcat(s+written, "reject *:*\n", maxlen-written);
|
|
|
|
written += strlen("reject *:*\n");
|
|
|
|
tmpe = NULL;
|
2008-01-02 05:43:44 +01:00
|
|
|
} else if (router->exit_policy) {
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < smartlist_len(router->exit_policy); ++i) {
|
|
|
|
tmpe = smartlist_get(router->exit_policy, i);
|
2008-07-24 15:44:04 +02:00
|
|
|
result = policy_write_item(s+written, maxlen-written, tmpe, 1);
|
2008-01-02 05:43:44 +01:00
|
|
|
if (result < 0) {
|
|
|
|
log_warn(LD_BUG,"descriptor policy_write_item ran out of room!");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
tor_assert(result == (int)strlen(s+written));
|
|
|
|
written += result;
|
|
|
|
if (written+2 > maxlen) {
|
|
|
|
log_warn(LD_BUG,"descriptor policy_write_item ran out of room (2)!");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
s[written++] = '\n';
|
2007-02-24 20:49:35 +01:00
|
|
|
}
|
2006-12-29 03:49:12 +01:00
|
|
|
}
|
2006-09-21 23:48:06 +02:00
|
|
|
|
2010-11-17 10:26:34 +01:00
|
|
|
if (written + DIROBJ_MAX_SIG_LEN > maxlen) {
|
|
|
|
/* Not enough room for signature. */
|
2007-02-24 20:49:35 +01:00
|
|
|
log_warn(LD_BUG,"not enough room left in descriptor for signature!");
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
2007-02-24 20:49:35 +01:00
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2009-04-11 02:40:11 +02:00
|
|
|
/* Sign the descriptor */
|
2006-12-29 18:10:29 +01:00
|
|
|
strlcpy(s+written, "router-signature\n", maxlen-written);
|
2003-12-06 06:54:04 +01:00
|
|
|
written += strlen(s+written);
|
|
|
|
s[written] = '\0';
|
2010-02-25 10:31:36 +01:00
|
|
|
if (router_get_router_hash(s, strlen(s), digest) < 0) {
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
2007-02-24 20:49:35 +01:00
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2006-10-31 20:17:07 +01:00
|
|
|
note_crypto_pk_op(SIGN_RTR);
|
2005-08-26 17:34:53 +02:00
|
|
|
if (router_append_dirobj_signature(s+written,maxlen-written,
|
2009-09-14 17:57:19 +02:00
|
|
|
digest,DIGEST_LEN,ident_key)<0) {
|
2006-02-13 11:33:00 +01:00
|
|
|
log_warn(LD_BUG, "Couldn't sign router descriptor");
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
written += strlen(s+written);
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2007-02-24 20:49:35 +01:00
|
|
|
if (written+2 > maxlen) {
|
|
|
|
log_warn(LD_BUG,"Not enough room to finish descriptor.");
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
2007-02-24 20:49:35 +01:00
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
/* include a last '\n' */
|
|
|
|
s[written] = '\n';
|
|
|
|
s[written+1] = 0;
|
|
|
|
|
|
|
|
#ifdef DEBUG_ROUTER_DUMP_ROUTER_TO_STRING
|
2007-04-16 19:55:08 +02:00
|
|
|
{
|
|
|
|
char *s_dup;
|
|
|
|
const char *cp;
|
|
|
|
routerinfo_t *ri_tmp;
|
|
|
|
cp = s_dup = tor_strdup(s);
|
2007-09-27 18:08:10 +02:00
|
|
|
ri_tmp = router_parse_entry_from_string(cp, NULL, 1, 0, NULL);
|
2007-04-16 19:55:08 +02:00
|
|
|
if (!ri_tmp) {
|
|
|
|
log_err(LD_BUG,
|
|
|
|
"We just generated a router descriptor we can't parse.");
|
|
|
|
log_err(LD_BUG, "Descriptor was: <<%s>>", s);
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
tor_free(s_dup);
|
|
|
|
routerinfo_free(ri_tmp);
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2008-02-22 20:09:45 +01:00
|
|
|
return (int)written+1;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2009-08-21 23:02:36 +02:00
|
|
|
/** Load the contents of <b>filename</b>, find the last line starting with
|
|
|
|
* <b>end_line</b>, ensure that its timestamp is not more than 25 hours in
|
|
|
|
* the past or more than 1 hour in the future with respect to <b>now</b>,
|
2009-09-29 05:25:23 +02:00
|
|
|
* and write the file contents starting with that line to *<b>out</b>.
|
|
|
|
* Return 1 for success, 0 if the file does not exist, or -1 if the file
|
|
|
|
* does not contain a line matching these criteria or other failure. */
|
2009-08-14 15:30:24 +02:00
|
|
|
static int
|
2009-08-21 23:02:36 +02:00
|
|
|
load_stats_file(const char *filename, const char *end_line, time_t now,
|
2009-08-19 16:30:00 +02:00
|
|
|
char **out)
|
2009-08-14 15:30:24 +02:00
|
|
|
{
|
|
|
|
int r = -1;
|
|
|
|
char *fname = get_datadir_fname(filename);
|
2009-08-21 23:02:36 +02:00
|
|
|
char *contents, *start = NULL, *tmp, timestr[ISO_TIME_LEN+1];
|
2009-08-19 16:30:00 +02:00
|
|
|
time_t written;
|
2009-08-14 15:30:24 +02:00
|
|
|
switch (file_status(fname)) {
|
|
|
|
case FN_FILE:
|
2009-08-21 23:02:36 +02:00
|
|
|
/* X022 Find an alternative to reading the whole file to memory. */
|
2009-08-19 16:30:00 +02:00
|
|
|
if ((contents = read_file_to_str(fname, 0, NULL))) {
|
2009-08-21 23:02:36 +02:00
|
|
|
tmp = strstr(contents, end_line);
|
|
|
|
/* Find last block starting with end_line */
|
|
|
|
while (tmp) {
|
|
|
|
start = tmp;
|
|
|
|
tmp = strstr(tmp + 1, end_line);
|
|
|
|
}
|
|
|
|
if (!start)
|
|
|
|
goto notfound;
|
|
|
|
if (strlen(start) < strlen(end_line) + 1 + sizeof(timestr))
|
|
|
|
goto notfound;
|
|
|
|
strlcpy(timestr, start + 1 + strlen(end_line), sizeof(timestr));
|
|
|
|
if (parse_iso_time(timestr, &written) < 0)
|
|
|
|
goto notfound;
|
|
|
|
if (written < now - (25*60*60) || written > now + (1*60*60))
|
|
|
|
goto notfound;
|
|
|
|
*out = tor_strdup(start);
|
2009-08-14 15:30:24 +02:00
|
|
|
r = 1;
|
2009-08-19 16:30:00 +02:00
|
|
|
}
|
2009-08-19 23:36:27 +02:00
|
|
|
notfound:
|
2009-08-19 16:30:00 +02:00
|
|
|
tor_free(contents);
|
2009-08-14 15:30:24 +02:00
|
|
|
break;
|
|
|
|
case FN_NOENT:
|
|
|
|
r = 0;
|
|
|
|
break;
|
|
|
|
case FN_ERROR:
|
|
|
|
case FN_DIR:
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
tor_free(fname);
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2010-11-13 22:25:19 +01:00
|
|
|
/** Write the contents of <b>extrainfo</b> and aggregated statistics to
|
|
|
|
* *<b>s_out</b>, signing them with <b>ident_key</b>. Return 0 on
|
|
|
|
* success, negative on failure. */
|
2007-04-16 19:55:08 +02:00
|
|
|
int
|
2010-11-13 22:25:19 +01:00
|
|
|
extrainfo_dump_to_string(char **s_out, extrainfo_t *extrainfo,
|
2007-04-16 19:55:08 +02:00
|
|
|
crypto_pk_env_t *ident_key)
|
|
|
|
{
|
2007-12-17 23:44:16 +01:00
|
|
|
or_options_t *options = get_options();
|
2007-04-16 19:55:08 +02:00
|
|
|
char identity[HEX_DIGEST_LEN+1];
|
|
|
|
char published[ISO_TIME_LEN+1];
|
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
char *bandwidth_usage;
|
|
|
|
int result;
|
2009-08-14 15:30:24 +02:00
|
|
|
static int write_stats_to_extrainfo = 1;
|
2010-11-17 10:26:34 +01:00
|
|
|
char sig[DIROBJ_MAX_SIG_LEN+1];
|
2010-11-13 22:25:19 +01:00
|
|
|
char *s, *pre, *contents, *cp, *s_dup = NULL;
|
2009-12-12 08:32:46 +01:00
|
|
|
time_t now = time(NULL);
|
2010-11-13 22:25:19 +01:00
|
|
|
smartlist_t *chunks = smartlist_create();
|
|
|
|
extrainfo_t *ei_tmp = NULL;
|
2007-04-16 19:55:08 +02:00
|
|
|
|
|
|
|
base16_encode(identity, sizeof(identity),
|
|
|
|
extrainfo->cache_info.identity_digest, DIGEST_LEN);
|
|
|
|
format_iso_time(published, extrainfo->cache_info.published_on);
|
2010-11-13 22:25:19 +01:00
|
|
|
bandwidth_usage = rep_hist_get_bandwidth_lines();
|
2009-08-14 15:30:24 +02:00
|
|
|
|
2010-11-13 22:25:19 +01:00
|
|
|
tor_asprintf(&pre, "extra-info %s %s\npublished %s\n%s",
|
|
|
|
extrainfo->nickname, identity,
|
|
|
|
published, bandwidth_usage);
|
2010-01-25 19:44:17 +01:00
|
|
|
tor_free(bandwidth_usage);
|
2010-11-13 22:25:19 +01:00
|
|
|
smartlist_add(chunks, pre);
|
2010-01-25 19:44:17 +01:00
|
|
|
|
2010-11-12 09:06:27 +01:00
|
|
|
if (geoip_is_loaded()) {
|
2010-11-19 22:58:22 +01:00
|
|
|
char *chunk=NULL;
|
|
|
|
tor_asprintf(&chunk, "geoip-db-digest %s\n", geoip_db_digest());
|
|
|
|
smartlist_add(chunks, chunk);
|
2010-11-12 09:06:27 +01:00
|
|
|
}
|
|
|
|
|
2009-08-14 15:30:24 +02:00
|
|
|
if (options->ExtraInfoStatistics && write_stats_to_extrainfo) {
|
|
|
|
log_info(LD_GENERAL, "Adding stats to extra-info descriptor.");
|
|
|
|
if (options->DirReqStatistics &&
|
2009-08-19 17:10:40 +02:00
|
|
|
load_stats_file("stats"PATH_SEPARATOR"dirreq-stats",
|
2009-09-28 15:20:21 +02:00
|
|
|
"dirreq-stats-end", now, &contents) > 0) {
|
2010-11-13 22:25:19 +01:00
|
|
|
smartlist_add(chunks, contents);
|
2009-08-14 15:30:24 +02:00
|
|
|
}
|
|
|
|
if (options->EntryStatistics &&
|
2009-08-19 17:10:40 +02:00
|
|
|
load_stats_file("stats"PATH_SEPARATOR"entry-stats",
|
2009-09-28 15:20:21 +02:00
|
|
|
"entry-stats-end", now, &contents) > 0) {
|
2010-11-13 22:25:19 +01:00
|
|
|
smartlist_add(chunks, contents);
|
2009-08-14 15:30:24 +02:00
|
|
|
}
|
|
|
|
if (options->CellStatistics &&
|
2009-08-19 17:10:40 +02:00
|
|
|
load_stats_file("stats"PATH_SEPARATOR"buffer-stats",
|
2009-09-28 15:20:21 +02:00
|
|
|
"cell-stats-end", now, &contents) > 0) {
|
2010-11-13 22:25:19 +01:00
|
|
|
smartlist_add(chunks, contents);
|
2009-08-14 15:30:24 +02:00
|
|
|
}
|
|
|
|
if (options->ExitPortStatistics &&
|
2009-08-19 17:10:40 +02:00
|
|
|
load_stats_file("stats"PATH_SEPARATOR"exit-stats",
|
2009-09-28 15:20:21 +02:00
|
|
|
"exit-stats-end", now, &contents) > 0) {
|
2010-11-13 22:25:19 +01:00
|
|
|
smartlist_add(chunks, contents);
|
2009-08-14 15:30:24 +02:00
|
|
|
}
|
2010-08-15 14:58:35 +02:00
|
|
|
if (options->ConnDirectionStatistics &&
|
2010-08-02 15:06:14 +02:00
|
|
|
load_stats_file("stats"PATH_SEPARATOR"conn-stats",
|
2010-08-24 08:11:17 +02:00
|
|
|
"conn-bi-direct", now, &contents) > 0) {
|
2010-12-03 16:57:08 +01:00
|
|
|
smartlist_add(chunks, contents);
|
2010-08-02 15:06:14 +02:00
|
|
|
}
|
2009-08-14 15:30:24 +02:00
|
|
|
}
|
|
|
|
|
2010-01-25 19:44:17 +01:00
|
|
|
if (should_record_bridge_info(options) && write_stats_to_extrainfo) {
|
|
|
|
const char *bridge_stats = geoip_get_bridge_stats_extrainfo(now);
|
2009-12-12 08:32:46 +01:00
|
|
|
if (bridge_stats) {
|
2010-11-13 22:25:19 +01:00
|
|
|
smartlist_add(chunks, tor_strdup(bridge_stats));
|
2007-12-17 23:44:16 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-11-13 22:25:19 +01:00
|
|
|
smartlist_add(chunks, tor_strdup("router-signature\n"));
|
|
|
|
s = smartlist_join_strings(chunks, "", 0, NULL);
|
2007-04-16 19:55:08 +02:00
|
|
|
|
2010-11-17 10:26:34 +01:00
|
|
|
while (strlen(s) > MAX_EXTRAINFO_UPLOAD_SIZE - DIROBJ_MAX_SIG_LEN) {
|
2010-11-19 22:13:11 +01:00
|
|
|
/* So long as there are at least two chunks (one for the initial
|
|
|
|
* extra-info line and one for the router-signature), we can keep removing
|
|
|
|
* things. */
|
2010-11-17 10:26:34 +01:00
|
|
|
if (smartlist_len(chunks) > 2) {
|
2010-11-19 22:13:11 +01:00
|
|
|
/* We remove the next-to-last element (remember, len-1 is the last
|
|
|
|
element), since we need to keep the router-signature element. */
|
2010-11-17 10:26:34 +01:00
|
|
|
int idx = smartlist_len(chunks) - 2;
|
|
|
|
char *e = smartlist_get(chunks, idx);
|
|
|
|
smartlist_del_keeporder(chunks, idx);
|
2010-11-13 22:25:19 +01:00
|
|
|
log_warn(LD_GENERAL, "We just generated an extra-info descriptor "
|
|
|
|
"with statistics that exceeds the 50 KB "
|
2010-11-17 10:26:34 +01:00
|
|
|
"upload limit. Removing last added "
|
|
|
|
"statistics.");
|
|
|
|
tor_free(e);
|
|
|
|
tor_free(s);
|
|
|
|
s = smartlist_join_strings(chunks, "", 0, NULL);
|
2010-11-13 22:25:19 +01:00
|
|
|
} else {
|
2010-11-15 13:39:53 +01:00
|
|
|
log_warn(LD_BUG, "We just generated an extra-info descriptors that "
|
2010-11-17 10:26:34 +01:00
|
|
|
"exceeds the 50 KB upload limit.");
|
2010-11-13 22:25:19 +01:00
|
|
|
goto err;
|
2007-04-16 19:55:08 +02:00
|
|
|
}
|
|
|
|
}
|
2009-08-14 15:30:24 +02:00
|
|
|
|
2010-11-13 22:25:19 +01:00
|
|
|
memset(sig, 0, sizeof(sig));
|
|
|
|
if (router_get_extrainfo_hash(s, digest) < 0 ||
|
|
|
|
router_append_dirobj_signature(sig, sizeof(sig), digest, DIGEST_LEN,
|
|
|
|
ident_key) < 0) {
|
2010-11-17 10:26:34 +01:00
|
|
|
log_warn(LD_BUG, "Could not append signature to extra-info "
|
|
|
|
"descriptor.");
|
2010-11-13 22:25:19 +01:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
smartlist_add(chunks, tor_strdup(sig));
|
|
|
|
tor_free(s);
|
|
|
|
s = smartlist_join_strings(chunks, "", 0, NULL);
|
|
|
|
|
|
|
|
cp = s_dup = tor_strdup(s);
|
|
|
|
ei_tmp = extrainfo_parse_entry_from_string(cp, NULL, 1, NULL);
|
|
|
|
if (!ei_tmp) {
|
|
|
|
if (write_stats_to_extrainfo) {
|
|
|
|
log_warn(LD_GENERAL, "We just generated an extra-info descriptor "
|
|
|
|
"with statistics that we can't parse. Not "
|
|
|
|
"adding statistics to this or any future "
|
2010-11-17 10:26:34 +01:00
|
|
|
"extra-info descriptors.");
|
2009-08-14 15:30:24 +02:00
|
|
|
write_stats_to_extrainfo = 0;
|
2010-11-17 10:26:34 +01:00
|
|
|
result = extrainfo_dump_to_string(s_out, extrainfo, ident_key);
|
|
|
|
goto done;
|
2010-11-13 22:25:19 +01:00
|
|
|
} else {
|
2010-11-17 10:26:34 +01:00
|
|
|
log_warn(LD_BUG, "We just generated an extrainfo descriptor we "
|
|
|
|
"can't parse.");
|
2010-11-13 22:25:19 +01:00
|
|
|
goto err;
|
2009-08-14 15:30:24 +02:00
|
|
|
}
|
|
|
|
}
|
2007-04-16 19:55:08 +02:00
|
|
|
|
2010-11-13 22:25:19 +01:00
|
|
|
*s_out = s;
|
|
|
|
s = NULL; /* prevent free */
|
|
|
|
result = 0;
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
err:
|
|
|
|
result = -1;
|
|
|
|
|
|
|
|
done:
|
|
|
|
tor_free(s);
|
|
|
|
SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(chunks);
|
|
|
|
tor_free(s_dup);
|
|
|
|
extrainfo_free(ei_tmp);
|
|
|
|
|
|
|
|
return result;
|
2007-04-16 19:55:08 +02:00
|
|
|
}
|
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** Return true iff <b>s</b> is a legally valid server nickname. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
is_legal_nickname(const char *s)
|
2004-08-18 06:44:24 +02:00
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
tor_assert(s);
|
|
|
|
len = strlen(s);
|
|
|
|
return len > 0 && len <= MAX_NICKNAME_LEN &&
|
2005-10-24 21:39:45 +02:00
|
|
|
strspn(s,LEGAL_NICKNAME_CHARACTERS) == len;
|
2004-08-18 06:44:24 +02:00
|
|
|
}
|
2005-10-24 21:39:45 +02:00
|
|
|
|
2005-03-17 13:38:37 +01:00
|
|
|
/** Return true iff <b>s</b> is a legally valid server nickname or
|
|
|
|
* hex-encoded identity-key digest. */
|
2005-06-11 20:52:12 +02:00
|
|
|
int
|
|
|
|
is_legal_nickname_or_hexdigest(const char *s)
|
2004-08-18 06:44:24 +02:00
|
|
|
{
|
|
|
|
if (*s!='$')
|
|
|
|
return is_legal_nickname(s);
|
2006-03-15 06:04:11 +01:00
|
|
|
else
|
|
|
|
return is_legal_hexdigest(s);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return true iff <b>s</b> is a legally valid hex-encoded identity-key
|
|
|
|
* digest. */
|
|
|
|
int
|
|
|
|
is_legal_hexdigest(const char *s)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
tor_assert(s);
|
2006-06-13 14:05:59 +02:00
|
|
|
if (s[0] == '$') s++;
|
2004-08-18 06:44:24 +02:00
|
|
|
len = strlen(s);
|
2006-10-03 20:58:40 +02:00
|
|
|
if (len > HEX_DIGEST_LEN) {
|
|
|
|
if (s[HEX_DIGEST_LEN] == '=' ||
|
|
|
|
s[HEX_DIGEST_LEN] == '~') {
|
|
|
|
if (!is_legal_nickname(s+HEX_DIGEST_LEN+1))
|
|
|
|
return 0;
|
|
|
|
} else {
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return (len >= HEX_DIGEST_LEN &&
|
|
|
|
strspn(s,HEX_CHARACTERS)==HEX_DIGEST_LEN);
|
|
|
|
}
|
|
|
|
|
2007-01-22 08:51:06 +01:00
|
|
|
/** Set <b>buf</b> (which must have MAX_VERBOSE_NICKNAME_LEN+1 bytes) to the
|
|
|
|
* verbose representation of the identity of <b>router</b>. The format is:
|
|
|
|
* A dollar sign.
|
|
|
|
* The upper-case hexadecimal encoding of the SHA1 hash of router's identity.
|
|
|
|
* A "=" if the router is named; a "~" if it is not.
|
|
|
|
* The router's nickname.
|
|
|
|
**/
|
2006-10-03 20:58:40 +02:00
|
|
|
void
|
2009-03-18 20:30:26 +01:00
|
|
|
router_get_verbose_nickname(char *buf, const routerinfo_t *router)
|
2006-10-03 20:58:40 +02:00
|
|
|
{
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
const char *good_digest = networkstatus_get_router_digest_by_nickname(
|
|
|
|
router->nickname);
|
|
|
|
int is_named = good_digest && !memcmp(good_digest,
|
|
|
|
router->cache_info.identity_digest,
|
|
|
|
DIGEST_LEN);
|
2006-10-03 20:58:40 +02:00
|
|
|
buf[0] = '$';
|
|
|
|
base16_encode(buf+1, HEX_DIGEST_LEN+1, router->cache_info.identity_digest,
|
|
|
|
DIGEST_LEN);
|
Initial conversion to use node_t throughout our codebase.
A node_t is an abstraction over routerstatus_t, routerinfo_t, and
microdesc_t. It should try to present a consistent interface to all
of them. There should be a node_t for a server whenever there is
* A routerinfo_t for it in the routerlist
* A routerstatus_t in the current_consensus.
(note that a microdesc_t alone isn't enough to make a node_t exist,
since microdescriptors aren't usable on their own.)
There are three ways to get a node_t right now: looking it up by ID,
looking it up by nickname, and iterating over the whole list of
microdescriptors.
All (or nearly all) functions that are supposed to return "a router"
-- especially those used in building connections and circuits --
should return a node_t, not a routerinfo_t or a routerstatus_t.
A node_t should hold all the *mutable* flags about a node. This
patch moves the is_foo flags from routerinfo_t into node_t. The
flags in routerstatus_t remain, but they get set from the consensus
and should not change.
Some other highlights of this patch are:
* Looking up routerinfo and routerstatus by nickname is now
unified and based on the "look up a node by nickname" function.
This tries to look only at the values from current consensus,
and not get confused by the routerinfo_t->is_named flag, which
could get set for other weird reasons. This changes the
behavior of how authorities (when acting as clients) deal with
nodes that have been listed by nickname.
* I tried not to artificially increase the size of the diff here
by moving functions around. As a result, some functions that
now operate on nodes are now in the wrong file -- they should
get moved to nodelist.c once this refactoring settles down.
This moving should happen as part of a patch that moves
functions AND NOTHING ELSE.
* Some old code is now left around inside #if 0/1 blocks, and
should get removed once I've verified that I don't want it
sitting around to see how we used to do things.
There are still some unimplemented functions: these are flagged
with "UNIMPLEMENTED_NODELIST()." I'll work on filling in the
implementation here, piece by piece.
I wish this patch could have been smaller, but there did not seem to
be any piece of it that was independent from the rest. Moving flags
forces many functions that once returned routerinfo_t * to return
node_t *, which forces their friends to change, and so on.
2010-09-29 21:00:41 +02:00
|
|
|
buf[1+HEX_DIGEST_LEN] = is_named ? '=' : '~';
|
2006-10-03 20:58:40 +02:00
|
|
|
strlcpy(buf+1+HEX_DIGEST_LEN+1, router->nickname, MAX_NICKNAME_LEN+1);
|
2009-03-18 20:30:26 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/** Set <b>buf</b> (which must have MAX_VERBOSE_NICKNAME_LEN+1 bytes) to the
|
|
|
|
* verbose representation of the identity of <b>router</b>. The format is:
|
|
|
|
* A dollar sign.
|
|
|
|
* The upper-case hexadecimal encoding of the SHA1 hash of router's identity.
|
|
|
|
* A "=" if the router is named; a "~" if it is not.
|
|
|
|
* The router's nickname.
|
|
|
|
**/
|
|
|
|
void
|
|
|
|
routerstatus_get_verbose_nickname(char *buf, const routerstatus_t *router)
|
|
|
|
{
|
|
|
|
buf[0] = '$';
|
|
|
|
base16_encode(buf+1, HEX_DIGEST_LEN+1, router->identity_digest,
|
|
|
|
DIGEST_LEN);
|
|
|
|
buf[1+HEX_DIGEST_LEN] = router->is_named ? '=' : '~';
|
|
|
|
strlcpy(buf+1+HEX_DIGEST_LEN+1, router->nickname, MAX_NICKNAME_LEN+1);
|
2004-08-18 06:44:24 +02:00
|
|
|
}
|
|
|
|
|
2005-10-06 01:20:45 +02:00
|
|
|
/** Forget that we have issued any router-related warnings, so that we'll
|
|
|
|
* warn again if we see the same errors. */
|
|
|
|
void
|
|
|
|
router_reset_warnings(void)
|
|
|
|
{
|
|
|
|
if (warned_nonexistent_family) {
|
|
|
|
SMARTLIST_FOREACH(warned_nonexistent_family, char *, cp, tor_free(cp));
|
|
|
|
smartlist_clear(warned_nonexistent_family);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Given a router purpose, convert it to a string. Don't call this on
|
|
|
|
* ROUTER_PURPOSE_UNKNOWN: The whole point of that value is that we don't
|
|
|
|
* know its string representation. */
|
2007-09-27 22:46:30 +02:00
|
|
|
const char *
|
|
|
|
router_purpose_to_string(uint8_t p)
|
|
|
|
{
|
|
|
|
switch (p)
|
|
|
|
{
|
|
|
|
case ROUTER_PURPOSE_GENERAL: return "general";
|
|
|
|
case ROUTER_PURPOSE_BRIDGE: return "bridge";
|
|
|
|
case ROUTER_PURPOSE_CONTROLLER: return "controller";
|
|
|
|
default:
|
|
|
|
tor_assert(0);
|
|
|
|
}
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-10-12 09:57:29 +02:00
|
|
|
/** Given a string, convert it to a router purpose. */
|
2007-09-27 22:46:30 +02:00
|
|
|
uint8_t
|
|
|
|
router_purpose_from_string(const char *s)
|
|
|
|
{
|
|
|
|
if (!strcmp(s, "general"))
|
|
|
|
return ROUTER_PURPOSE_GENERAL;
|
|
|
|
else if (!strcmp(s, "bridge"))
|
|
|
|
return ROUTER_PURPOSE_BRIDGE;
|
|
|
|
else if (!strcmp(s, "controller"))
|
|
|
|
return ROUTER_PURPOSE_CONTROLLER;
|
|
|
|
else
|
|
|
|
return ROUTER_PURPOSE_UNKNOWN;
|
|
|
|
}
|
|
|
|
|
2005-10-06 01:20:45 +02:00
|
|
|
/** Release all static resources held in router.c */
|
2005-06-11 20:52:12 +02:00
|
|
|
void
|
2005-10-06 01:20:45 +02:00
|
|
|
router_free_all(void)
|
2005-02-11 02:26:47 +01:00
|
|
|
{
|
2009-12-12 08:07:59 +01:00
|
|
|
crypto_free_pk_env(onionkey);
|
|
|
|
crypto_free_pk_env(lastonionkey);
|
2010-10-04 07:38:53 +02:00
|
|
|
crypto_free_pk_env(server_identitykey);
|
|
|
|
crypto_free_pk_env(client_identitykey);
|
2009-12-12 08:07:59 +01:00
|
|
|
tor_mutex_free(key_lock);
|
|
|
|
routerinfo_free(desc_routerinfo);
|
|
|
|
extrainfo_free(desc_extrainfo);
|
|
|
|
crypto_free_pk_env(authority_signing_key);
|
|
|
|
authority_cert_free(authority_key_certificate);
|
|
|
|
crypto_free_pk_env(legacy_signing_key);
|
|
|
|
authority_cert_free(legacy_key_certificate);
|
2007-04-16 19:55:08 +02:00
|
|
|
|
2005-10-06 01:20:45 +02:00
|
|
|
if (warned_nonexistent_family) {
|
|
|
|
SMARTLIST_FOREACH(warned_nonexistent_family, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(warned_nonexistent_family);
|
|
|
|
}
|
2005-02-11 02:26:47 +01:00
|
|
|
}
|
2005-10-06 06:33:40 +02:00
|
|
|
|