2003-12-06 06:54:04 +01:00
|
|
|
/* Copyright 2001,2002,2003 Roger Dingledine, Matej Pfajfar. */
|
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
/* $Id$ */
|
|
|
|
|
|
|
|
#include "or.h"
|
|
|
|
|
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
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
extern or_options_t options; /* command-line and config-file options */
|
2004-07-05 00:48:11 +02:00
|
|
|
extern long stats_n_seconds_uptime;
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
/** Exposed for test.c. */ void get_platform_str(char *platform, size_t len);
|
2004-04-07 23:36:03 +02:00
|
|
|
|
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;
|
2004-05-04 20:17:45 +02:00
|
|
|
static time_t onionkey_set_at=0; /* When was onionkey last changed? */
|
2003-12-06 06:54:04 +01:00
|
|
|
static crypto_pk_env_t *onionkey=NULL;
|
2004-04-25 00:17:50 +02:00
|
|
|
static crypto_pk_env_t *lastonionkey=NULL;
|
2003-12-06 06:54:04 +01:00
|
|
|
static crypto_pk_env_t *identitykey=NULL;
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Replace the current onion key with <b>k</b>. Does not affect lastonionkey;
|
2004-05-04 20:17:45 +02:00
|
|
|
* to update onionkey correctly, call rotate_onion_key().
|
|
|
|
*/
|
2003-12-06 06:54:04 +01:00
|
|
|
void set_onion_key(crypto_pk_env_t *k) {
|
2004-06-05 03:50:35 +02:00
|
|
|
tor_mutex_acquire(key_lock);
|
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);
|
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. */
|
2003-12-06 06:54:04 +01: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;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Return the onion key that was current before the most recent onion
|
2004-05-04 20:17:45 +02:00
|
|
|
* key rotation. If no rotation has been performed since this process
|
|
|
|
* started, return NULL.
|
|
|
|
*/
|
2004-04-25 00:17:50 +02:00
|
|
|
crypto_pk_env_t *get_previous_onion_key(void) {
|
|
|
|
return lastonionkey;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2004-06-05 03:50:35 +02:00
|
|
|
void dup_onion_keys(crypto_pk_env_t **key, crypto_pk_env_t **last)
|
|
|
|
{
|
|
|
|
tor_assert(key && last);
|
|
|
|
tor_mutex_acquire(key_lock);
|
|
|
|
*key = crypto_pk_dup_key(onionkey);
|
|
|
|
if (lastonionkey)
|
2004-06-05 03:56:54 +02:00
|
|
|
*last = crypto_pk_dup_key(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.
|
|
|
|
*/
|
2004-04-25 00:17:50 +02:00
|
|
|
time_t get_onion_key_set_at(void) {
|
|
|
|
return onionkey_set_at;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Set the current identity key to k.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2003-12-06 06:54:04 +01:00
|
|
|
void set_identity_key(crypto_pk_env_t *k) {
|
|
|
|
identitykey = k;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Returns the current identity key; requires that the identity key has been
|
2004-05-04 20:17:45 +02:00
|
|
|
* set.
|
|
|
|
*/
|
2003-12-06 06:54:04 +01:00
|
|
|
crypto_pk_env_t *get_identity_key(void) {
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(identitykey);
|
2003-12-06 06:54:04 +01:00
|
|
|
return identitykey;
|
|
|
|
}
|
|
|
|
|
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
|
|
|
*/
|
|
|
|
void rotate_onion_key(void)
|
|
|
|
{
|
|
|
|
char fname[512];
|
2004-08-09 06:27:13 +02:00
|
|
|
char fname_prev[512];
|
2004-04-25 00:17:50 +02:00
|
|
|
crypto_pk_env_t *prkey;
|
2004-08-09 06:27:13 +02:00
|
|
|
sprintf(fname,"%s/keys/secret_onion_key",get_data_directory(&options));
|
|
|
|
sprintf(fname_prev,"%s/keys/secret_onion_key.old",
|
|
|
|
get_data_directory(&options));
|
2004-04-25 00:17:50 +02:00
|
|
|
if (!(prkey = crypto_new_pk_env())) {
|
|
|
|
log(LOG_ERR, "Error creating crypto environment.");
|
|
|
|
goto error;
|
|
|
|
}
|
2004-04-25 05:38:19 +02:00
|
|
|
if (crypto_pk_generate_key(prkey)) {
|
2004-04-26 20:09:50 +02:00
|
|
|
log(LOG_ERR, "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)) {
|
|
|
|
log(LOG_ERR, "Couldn't write generated key to %s.", fname);
|
|
|
|
goto error;
|
|
|
|
}
|
2004-06-05 03:50:35 +02:00
|
|
|
tor_mutex_acquire(key_lock);
|
2004-04-25 00:17:50 +02:00
|
|
|
if (lastonionkey)
|
|
|
|
crypto_free_pk_env(lastonionkey);
|
2004-04-25 21:04:11 +02:00
|
|
|
log_fn(LOG_INFO, "Rotating onion key");
|
2004-04-25 00:17:50 +02:00
|
|
|
lastonionkey = onionkey;
|
|
|
|
set_onion_key(prkey);
|
2004-06-05 03:50:35 +02:00
|
|
|
tor_mutex_release(key_lock);
|
2004-04-25 00:17:50 +02:00
|
|
|
return;
|
|
|
|
error:
|
|
|
|
log_fn(LOG_WARN, "Couldn't rotate onion key.");
|
|
|
|
}
|
|
|
|
|
2004-08-04 07:10:49 +02:00
|
|
|
/** The latest calculated bandwidth usage for our node. */
|
2004-08-15 10:15:12 +02:00
|
|
|
static int bw_capacity = 0;
|
2004-07-22 06:20:27 +02:00
|
|
|
/** Tuck <b>bw</b> away so we can produce it when somebody
|
2004-08-15 10:15:12 +02:00
|
|
|
* calls router_get_bandwidth_capacity() below.
|
2004-07-22 06:20:27 +02:00
|
|
|
*/
|
2004-08-15 10:15:12 +02:00
|
|
|
void router_set_bandwidth_capacity(int bw) {
|
|
|
|
bw_capacity = bw;
|
2004-07-22 06:20:27 +02:00
|
|
|
}
|
|
|
|
/** Return the value we tucked away above, or zero by default. */
|
2004-08-15 10:15:12 +02:00
|
|
|
int router_get_bandwidth_capacity(void) {
|
|
|
|
return bw_capacity;
|
2004-07-22 06:20:27 +02:00
|
|
|
}
|
|
|
|
|
2004-07-13 20:23:40 +02:00
|
|
|
/* Read an RSA secret key key from a file that was once named fname_old,
|
|
|
|
* but is now named fname_new. Rename the file from old to new as needed.
|
|
|
|
*/
|
2004-07-22 08:03:53 +02:00
|
|
|
static crypto_pk_env_t *
|
|
|
|
init_key_from_file_name_changed(const char *fname_old,
|
|
|
|
const char *fname_new)
|
2004-07-13 20:23:40 +02:00
|
|
|
{
|
|
|
|
|
2004-08-09 06:27:13 +02:00
|
|
|
if (file_status(fname_new) == FN_FILE || file_status(fname_old) != FN_FILE)
|
|
|
|
/* The new filename is there, or both are, or neither is. */
|
2004-07-13 20:23:40 +02:00
|
|
|
return init_key_from_file(fname_new);
|
|
|
|
|
|
|
|
/* The old filename exists, and the new one doesn't. Rename and load. */
|
|
|
|
if (rename(fname_old, fname_new) < 0) {
|
|
|
|
log_fn(LOG_ERR, "Couldn't rename %s to %s: %s", fname_old, fname_new,
|
|
|
|
strerror(errno));
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
return init_key_from_file(fname_new);
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Try to read an RSA key from <b>fname</b>. If <b>fname</b> doesn't exist,
|
|
|
|
* create a new RSA key and save it in <b>fname</b>. Return the read/created
|
|
|
|
* key, or NULL on error.
|
2004-03-31 23:35:23 +02:00
|
|
|
*/
|
|
|
|
crypto_pk_env_t *init_key_from_file(const char *fname)
|
2003-12-06 06:54:04 +01:00
|
|
|
{
|
|
|
|
crypto_pk_env_t *prkey = NULL;
|
|
|
|
FILE *file = NULL;
|
|
|
|
|
2004-04-03 04:40:30 +02:00
|
|
|
if (!(prkey = crypto_new_pk_env())) {
|
2003-12-06 06:54:04 +01:00
|
|
|
log(LOG_ERR, "Error creating crypto environment.");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
switch(file_status(fname)) {
|
|
|
|
case FN_DIR:
|
|
|
|
case FN_ERROR:
|
|
|
|
log(LOG_ERR, "Can't read key from %s", fname);
|
|
|
|
goto error;
|
|
|
|
case FN_NOENT:
|
|
|
|
log(LOG_INFO, "No key found in %s; generating fresh key.", fname);
|
|
|
|
if (crypto_pk_generate_key(prkey)) {
|
2004-04-26 20:09:50 +02:00
|
|
|
log(LOG_ERR, "Error generating onion key");
|
2003-12-06 06:54:04 +01:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (crypto_pk_check_key(prkey) <= 0) {
|
|
|
|
log(LOG_ERR, "Generated key seems invalid");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
log(LOG_INFO, "Generated key seems valid");
|
|
|
|
if (crypto_pk_write_private_key_to_filename(prkey, fname)) {
|
|
|
|
log(LOG_ERR, "Couldn't write generated key to %s.", fname);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
return prkey;
|
|
|
|
case FN_FILE:
|
|
|
|
if (crypto_pk_read_private_key_from_filename(prkey, fname)) {
|
|
|
|
log(LOG_ERR, "Error loading private key.");
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
return prkey;
|
|
|
|
default:
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(0);
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
error:
|
|
|
|
if (prkey)
|
|
|
|
crypto_free_pk_env(prkey);
|
|
|
|
if (file)
|
|
|
|
fclose(file);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Initialize all OR private keys, and the TLS context, as necessary.
|
2004-05-04 20:17:45 +02:00
|
|
|
* On OPs, this only initializes the tls context.
|
|
|
|
*/
|
2003-12-06 06:54:04 +01:00
|
|
|
int init_keys(void) {
|
|
|
|
char keydir[512];
|
2004-07-13 20:23:40 +02:00
|
|
|
char keydir2[512];
|
2003-12-06 06:54:04 +01:00
|
|
|
char fingerprint[FINGERPRINT_LEN+MAX_NICKNAME_LEN+3];
|
|
|
|
char *cp;
|
2004-06-30 18:37:08 +02:00
|
|
|
const char *tmp, *mydesc, *datadir;
|
2003-12-06 06:54:04 +01:00
|
|
|
crypto_pk_env_t *prkey;
|
2004-10-14 03:44:32 +02:00
|
|
|
char digest[20];
|
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
|
|
|
|
2004-07-18 23:47:04 +02:00
|
|
|
/* OP's don't need persistant keys; just make up an identity and
|
|
|
|
* initialize the TLS context. */
|
|
|
|
if (!server_mode()) {
|
|
|
|
#if 0
|
|
|
|
/* XXXX008 enable this once we make ORs tolerate unknown routers. */
|
|
|
|
if (!(prkey = crypto_new_pk_env()))
|
|
|
|
return -1;
|
|
|
|
if (crypto_pk_generate_key(prkey))
|
|
|
|
return -1;
|
|
|
|
set_identity_key(prkey);
|
|
|
|
if (tor_tls_context_new(get_identity_key(), 1, options.Nickname,
|
|
|
|
MAX_SSL_KEY_LIFETIME) < 0) {
|
|
|
|
log_fn(LOG_ERR, "Error creating TLS context for OP.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
if (tor_tls_context_new(NULL, 0, NULL, MAX_SSL_KEY_LIFETIME)<0) {
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_ERR, "Error creating TLS context for OP.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Make sure DataDirectory exists, and is private. */
|
2004-06-30 18:37:08 +02:00
|
|
|
datadir = get_data_directory(&options);
|
|
|
|
tor_assert(datadir);
|
|
|
|
if (strlen(datadir) > (512-128)) {
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_ERR, "DataDirectory is too long.");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-06-30 18:37:08 +02:00
|
|
|
if (check_private_dir(datadir, 1)) {
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Check the key directory. */
|
2004-06-30 18:37:08 +02:00
|
|
|
sprintf(keydir,"%s/keys", datadir);
|
2003-12-06 06:54:04 +01:00
|
|
|
if (check_private_dir(keydir, 1)) {
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
cp = keydir + strlen(keydir); /* End of string. */
|
|
|
|
|
|
|
|
/* 1. Read identity key. Make it if none is found. */
|
2004-07-13 20:23:40 +02:00
|
|
|
sprintf(keydir,"%s/keys/identity.key",datadir);
|
|
|
|
sprintf(keydir2,"%s/keys/secret_id_key",datadir);
|
|
|
|
log_fn(LOG_INFO,"Reading/making identity key %s...",keydir2);
|
|
|
|
prkey = init_key_from_file_name_changed(keydir,keydir2);
|
2003-12-06 06:54:04 +01:00
|
|
|
if (!prkey) return -1;
|
|
|
|
set_identity_key(prkey);
|
|
|
|
/* 2. Read onion key. Make it if none is found. */
|
2004-07-13 20:23:40 +02:00
|
|
|
sprintf(keydir,"%s/keys/onion.key",datadir);
|
|
|
|
sprintf(keydir2,"%s/keys/secret_onion_key",datadir);
|
|
|
|
log_fn(LOG_INFO,"Reading/making onion key %s...",keydir2);
|
|
|
|
prkey = init_key_from_file_name_changed(keydir,keydir2);
|
2003-12-06 06:54:04 +01:00
|
|
|
if (!prkey) return -1;
|
|
|
|
set_onion_key(prkey);
|
2004-08-09 06:27:13 +02:00
|
|
|
sprintf(keydir,"%s/keys/secret_onion_key.old",datadir);
|
|
|
|
if (file_status(keydir) == FN_FILE) {
|
|
|
|
prkey = init_key_from_file(keydir);
|
|
|
|
if (prkey)
|
|
|
|
lastonionkey = prkey;
|
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
|
|
|
|
/* 3. Initialize link key and TLS context. */
|
2004-04-25 00:17:50 +02:00
|
|
|
if (tor_tls_context_new(get_identity_key(), 1, options.Nickname,
|
|
|
|
MAX_SSL_KEY_LIFETIME) < 0) {
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_ERR, "Error initializing TLS context");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* 4. Dump router descriptor to 'router.desc' */
|
|
|
|
/* Must be called after keys are initialized. */
|
2004-07-20 12:17:43 +02:00
|
|
|
tmp = mydesc = router_get_my_descriptor();
|
|
|
|
if (!mydesc) {
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_ERR, "Error initializing descriptor.");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-07-20 12:17:43 +02:00
|
|
|
if(authdir_mode()) {
|
|
|
|
/* We need to add our own fingerprint so it gets recognized. */
|
|
|
|
if (dirserv_add_own_fingerprint(options.Nickname, get_identity_key())) {
|
|
|
|
log_fn(LOG_ERR, "Error adding own fingerprint to approved set");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (dirserv_add_descriptor(&tmp) != 1) {
|
|
|
|
log(LOG_ERR, "Unable to add own descriptor to directory.");
|
|
|
|
return -1;
|
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
2004-07-20 12:17:43 +02:00
|
|
|
|
2004-06-30 18:37:08 +02:00
|
|
|
sprintf(keydir,"%s/router.desc", datadir);
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_INFO,"Dumping descriptor to %s...",keydir);
|
2004-09-08 09:16:34 +02:00
|
|
|
if (write_str_to_file(keydir, mydesc,0)) {
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
/* 5. Dump fingerprint to 'fingerprint' */
|
2004-06-30 18:37:08 +02:00
|
|
|
sprintf(keydir,"%s/fingerprint", datadir);
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_INFO,"Dumping fingerprint to %s...",keydir);
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(strlen(options.Nickname) <= MAX_NICKNAME_LEN);
|
2003-12-06 06:54:04 +01:00
|
|
|
strcpy(fingerprint, options.Nickname);
|
|
|
|
strcat(fingerprint, " ");
|
|
|
|
if (crypto_pk_get_fingerprint(get_identity_key(),
|
2004-10-06 15:31:48 +02:00
|
|
|
fingerprint+strlen(fingerprint), 1)<0) {
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_ERR, "Error computing fingerprint");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
strcat(fingerprint, "\n");
|
2004-09-08 09:16:34 +02:00
|
|
|
if (write_str_to_file(keydir, fingerprint, 0))
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
2004-07-20 12:17:43 +02:00
|
|
|
if(!authdir_mode())
|
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 */
|
2004-06-30 18:37:08 +02:00
|
|
|
sprintf(keydir,"%s/approved-routers", datadir);
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_INFO,"Loading approved fingerprints from %s...",keydir);
|
|
|
|
if(dirserv_parse_fingerprint_file(keydir) < 0) {
|
|
|
|
log_fn(LOG_ERR, "Error loading fingerprints");
|
|
|
|
return -1;
|
|
|
|
}
|
2004-10-14 03:44:32 +02:00
|
|
|
/* 6b. [authdirserver only] add own key to approved directories. */
|
|
|
|
crypto_pk_get_digest(get_identity_key(), digest);
|
|
|
|
if (!router_digest_is_trusted_dir(digest)) {
|
2004-10-14 06:06:24 +02:00
|
|
|
add_trusted_dir_server(options.Address, (uint16_t)options.DirPort, digest);
|
2004-10-14 03:44:32 +02:00
|
|
|
}
|
2004-07-20 12:17:43 +02:00
|
|
|
/* 7. [authdirserver only] load old directory, if it's there */
|
2004-06-30 18:37:08 +02:00
|
|
|
sprintf(keydir,"%s/cached-directory", datadir);
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_INFO,"Loading cached directory from %s...",keydir);
|
2004-09-08 09:16:34 +02:00
|
|
|
cp = read_file_to_str(keydir,0);
|
2003-12-06 06:54:04 +01:00
|
|
|
if(!cp) {
|
|
|
|
log_fn(LOG_INFO,"Cached directory %s not present. Ok.",keydir);
|
|
|
|
} else {
|
2004-10-07 22:22:58 +02:00
|
|
|
tor_strstrip(cp,"\r"); /* XXXX Workaround for win32 read_file_to_str bug. */
|
2004-07-20 12:17:43 +02:00
|
|
|
if(dirserv_load_from_directory_string(cp) < 0){
|
|
|
|
log_fn(LOG_ERR, "Cached directory %s is corrupt", keydir);
|
|
|
|
tor_free(cp);
|
|
|
|
return -1;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
2004-06-30 18:37:08 +02:00
|
|
|
tor_free(cp);
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
/* success */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/*
|
2004-05-04 20:17:45 +02:00
|
|
|
* Clique maintenance
|
2004-05-10 06:34:48 +02:00
|
|
|
*/
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-07-22 01:43:47 +02:00
|
|
|
/** OR only: if in clique mode, try to open connections to all of the
|
|
|
|
* other ORs we know about. Otherwise, open connections to those we
|
|
|
|
* think are in clique mode.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2003-12-06 06:54:04 +01:00
|
|
|
void router_retry_connections(void) {
|
|
|
|
int i;
|
|
|
|
routerinfo_t *router;
|
|
|
|
routerlist_t *rl;
|
|
|
|
|
2004-07-22 01:43:47 +02:00
|
|
|
tor_assert(server_mode());
|
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
router_get_routerlist(&rl);
|
2004-10-14 05:44:45 +02:00
|
|
|
if (!rl) return;
|
2004-04-07 21:46:27 +02:00
|
|
|
for (i=0;i < smartlist_len(rl->routers);i++) {
|
|
|
|
router = smartlist_get(rl->routers, i);
|
|
|
|
if(router_is_me(router))
|
|
|
|
continue;
|
2004-07-22 01:43:47 +02:00
|
|
|
if(!clique_mode() && !router_is_clique_mode(router))
|
|
|
|
continue;
|
2004-07-02 01:13:04 +02:00
|
|
|
if(!connection_get_by_identity_digest(router->identity_digest,
|
|
|
|
CONN_TYPE_OR)) {
|
2003-12-06 06:54:04 +01:00
|
|
|
/* not in the list */
|
|
|
|
log_fn(LOG_DEBUG,"connecting to OR %s:%u.",router->address,router->or_port);
|
2004-07-02 11:29:01 +02:00
|
|
|
connection_or_connect(router->addr, router->or_port, router->identity_digest);
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2004-07-20 21:45:29 +02:00
|
|
|
int router_is_clique_mode(routerinfo_t *router) {
|
|
|
|
if(router->is_trusted_dir)
|
|
|
|
return 1;
|
2004-09-27 08:00:43 +02:00
|
|
|
if(!tor_version_as_new_as(router->platform, "0.0.8pre1"))
|
2004-07-20 21:45:29 +02:00
|
|
|
return 1;
|
|
|
|
return 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;
|
2004-05-10 12:27:54 +02:00
|
|
|
/** String representation of my descriptor, signed by me. */
|
2004-05-04 20:17:45 +02:00
|
|
|
static char descriptor[8192];
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** OR only: try to upload our signed descriptor to all the directory servers
|
2004-05-04 20:17:45 +02:00
|
|
|
* we know about.
|
|
|
|
*/
|
2004-04-01 05:23:28 +02:00
|
|
|
void router_upload_dir_desc_to_dirservers(void) {
|
2004-03-31 00:57:49 +02:00
|
|
|
const char *s;
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-03-31 00:57:49 +02:00
|
|
|
s = router_get_my_descriptor();
|
|
|
|
if (!s) {
|
2003-12-06 06:54:04 +01:00
|
|
|
log_fn(LOG_WARN, "No descriptor; skipping upload");
|
|
|
|
return;
|
|
|
|
}
|
2004-05-13 01:48:57 +02:00
|
|
|
directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_DIR, s, strlen(s));
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2004-08-08 07:26:13 +02:00
|
|
|
#define DEFAULT_EXIT_POLICY "reject 0.0.0.0/8,reject 169.254.0.0/16,reject 127.0.0.0/8,reject 192.168.0.0/16,reject 10.0.0.0/8,reject 172.16.0.0/12,accept *:20-22,accept *:53,accept *:79-81,accept *:110,accept *:143,accept *:443,accept *:873,accept *:993,accept *:995,reject *:4661-4662,reject *:1214,reject *:6346,accept *:1024-65535,reject *:*"
|
2004-02-18 08:23:38 +01:00
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Set the exit policy on <b>router</b> to match the exit policy in the
|
|
|
|
* current configuration file. If the exit policy doesn't have a catch-all
|
|
|
|
* rule, then append the default exit policy as well.
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2004-02-18 04:56:12 +01:00
|
|
|
static void router_add_exit_policy_from_config(routerinfo_t *router) {
|
2004-05-20 04:42:50 +02:00
|
|
|
struct exit_policy_t *ep;
|
|
|
|
struct config_line_t default_policy;
|
|
|
|
config_parse_exit_policy(options.ExitPolicy, &router->exit_policy);
|
|
|
|
|
|
|
|
for (ep = router->exit_policy; ep; ep = ep->next) {
|
|
|
|
if (ep->msk == 0 && ep->prt_min <= 1 && ep->prt_max >= 65535) {
|
|
|
|
/* if exitpolicy includes a *:* line, then we're done. */
|
|
|
|
return;
|
|
|
|
}
|
2004-02-18 08:23:38 +01:00
|
|
|
}
|
2004-05-20 04:42:50 +02:00
|
|
|
|
|
|
|
/* Else, append the default exitpolicy. */
|
|
|
|
default_policy.key = NULL;
|
|
|
|
default_policy.value = DEFAULT_EXIT_POLICY;
|
|
|
|
default_policy.next = NULL;
|
|
|
|
config_parse_exit_policy(&default_policy, &router->exit_policy);
|
2004-02-18 04:56:12 +01:00
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** OR only: Return false if my exit policy says to allow connection to
|
2004-05-04 20:17:45 +02:00
|
|
|
* conn. Else return true.
|
2003-12-06 06:54:04 +01:00
|
|
|
*/
|
2004-04-07 21:46:27 +02:00
|
|
|
int router_compare_to_my_exit_policy(connection_t *conn)
|
|
|
|
{
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(desc_routerinfo);
|
2004-07-07 21:49:48 +02:00
|
|
|
|
|
|
|
/* make sure it's resolved to something. this way we can't get a
|
|
|
|
'maybe' below. */
|
|
|
|
if (!conn->addr)
|
|
|
|
return -1;
|
|
|
|
|
2004-04-07 21:46:27 +02:00
|
|
|
return router_compare_addr_to_exit_policy(conn->addr, conn->port,
|
2004-02-17 09:29:22 +01:00
|
|
|
desc_routerinfo->exit_policy);
|
2004-02-18 04:56:12 +01:00
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
|
|
|
|
2004-05-10 06:34:48 +02:00
|
|
|
/** Return true iff <b>router</b> has the same nickname as this OR. (For an
|
|
|
|
* OP, always returns false.)
|
2004-05-04 20:17:45 +02:00
|
|
|
*/
|
2004-04-07 21:46:27 +02:00
|
|
|
int router_is_me(routerinfo_t *router)
|
|
|
|
{
|
2004-07-22 10:08:25 +02:00
|
|
|
routerinfo_t *me = router_get_my_routerinfo();
|
2004-04-25 22:37:37 +02:00
|
|
|
tor_assert(router);
|
2004-07-22 10:08:25 +02:00
|
|
|
if(!me || memcmp(me->identity_digest, router->identity_digest, DIGEST_LEN))
|
|
|
|
return 0;
|
|
|
|
return 1;
|
2004-04-07 21:46:27 +02:00
|
|
|
}
|
|
|
|
|
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. */
|
2004-04-06 00:22:42 +02:00
|
|
|
routerinfo_t *router_get_my_routerinfo(void)
|
|
|
|
{
|
2004-07-18 23:47:04 +02:00
|
|
|
if (!server_mode())
|
2004-04-06 00:22:42 +02:00
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (!desc_routerinfo) {
|
|
|
|
if (router_rebuild_descriptor())
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
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.
|
|
|
|
*/
|
2003-12-06 06:54:04 +01:00
|
|
|
const char *router_get_my_descriptor(void) {
|
|
|
|
if (!desc_routerinfo) {
|
|
|
|
if (router_rebuild_descriptor())
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
log_fn(LOG_DEBUG,"my desc is '%s'",descriptor);
|
|
|
|
return descriptor;
|
|
|
|
}
|
|
|
|
|
2004-05-09 18:47:25 +02:00
|
|
|
/** Rebuild a fresh routerinfo and signed server descriptor for this
|
2004-05-04 20:17:45 +02:00
|
|
|
* OR. Return 0 on success, -1 on error.
|
|
|
|
*/
|
2003-12-06 06:54:04 +01:00
|
|
|
int router_rebuild_descriptor(void) {
|
|
|
|
routerinfo_t *ri;
|
2004-08-16 13:43:18 +02:00
|
|
|
uint32_t addr;
|
2004-04-07 23:36:03 +02:00
|
|
|
char platform[256];
|
2004-08-16 13:43:18 +02:00
|
|
|
struct in_addr in;
|
|
|
|
|
|
|
|
if(resolve_my_address(options.Address, &addr) < 0) {
|
|
|
|
log_fn(LOG_WARN,"options.Address didn't resolve into an IP.");
|
2004-04-07 00:23:12 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-03-04 02:53:56 +01:00
|
|
|
ri = tor_malloc_zero(sizeof(routerinfo_t));
|
2004-08-16 13:43:18 +02:00
|
|
|
in.s_addr = htonl(addr);
|
|
|
|
ri->address = tor_strdup(inet_ntoa(in));
|
2003-12-06 06:54:04 +01:00
|
|
|
ri->nickname = tor_strdup(options.Nickname);
|
2004-08-16 13:43:18 +02:00
|
|
|
ri->addr = addr;
|
2003-12-06 06:54:04 +01:00
|
|
|
ri->or_port = options.ORPort;
|
|
|
|
ri->socks_port = options.SocksPort;
|
|
|
|
ri->dir_port = options.DirPort;
|
|
|
|
ri->published_on = time(NULL);
|
2004-06-05 03:50:35 +02:00
|
|
|
ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from main thread */
|
2003-12-06 06:54:04 +01:00
|
|
|
ri->identity_pkey = crypto_pk_dup_key(get_identity_key());
|
2004-07-01 03:16:59 +02:00
|
|
|
if (crypto_pk_get_digest(ri->identity_pkey, ri->identity_digest)<0) {
|
|
|
|
routerinfo_free(ri);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-04-07 23:36:03 +02:00
|
|
|
get_platform_str(platform, sizeof(platform));
|
|
|
|
ri->platform = tor_strdup(platform);
|
2004-01-11 00:40:38 +01:00
|
|
|
ri->bandwidthrate = options.BandwidthRate;
|
|
|
|
ri->bandwidthburst = options.BandwidthBurst;
|
2004-08-15 10:15:12 +02:00
|
|
|
ri->bandwidthcapacity = router_get_bandwidth_capacity();
|
2003-12-06 06:54:04 +01:00
|
|
|
ri->exit_policy = NULL; /* zero it out first */
|
|
|
|
router_add_exit_policy_from_config(ri);
|
2004-07-21 20:53:56 +02:00
|
|
|
ri->is_trusted_dir = authdir_mode();
|
2004-07-22 08:03:53 +02:00
|
|
|
if(desc_routerinfo) /* inherit values */
|
|
|
|
ri->is_verified = desc_routerinfo->is_verified;
|
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
if (desc_routerinfo)
|
|
|
|
routerinfo_free(desc_routerinfo);
|
|
|
|
desc_routerinfo = ri;
|
|
|
|
if (router_dump_router_to_string(descriptor, 8192, ri, get_identity_key())<0) {
|
|
|
|
log_fn(LOG_WARN, "Couldn't dump router to string.");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
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.
|
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
void get_platform_str(char *platform, size_t len)
|
2003-12-06 06:54:04 +01:00
|
|
|
{
|
2004-07-20 23:13:11 +02:00
|
|
|
snprintf(platform, len-1, "Tor %s on %s",
|
|
|
|
VERSION, get_uname());
|
2003-12-06 06:54:04 +01:00
|
|
|
platform[len-1] = '\0';
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 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
|
|
|
*/
|
2004-10-14 04:47:09 +02:00
|
|
|
int router_dump_router_to_string(char *s, size_t maxlen, routerinfo_t *router,
|
2003-12-06 06:54:04 +01:00
|
|
|
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. */
|
2003-12-06 06:54:04 +01:00
|
|
|
char digest[20];
|
|
|
|
char signature[128];
|
|
|
|
char published[32];
|
2004-07-22 08:22:04 +02:00
|
|
|
char fingerprint[FINGERPRINT_LEN+1];
|
2004-05-04 20:17:45 +02:00
|
|
|
struct in_addr in;
|
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;
|
|
|
|
struct exit_policy_t *tmpe;
|
2004-08-07 04:46:16 +02:00
|
|
|
char *bandwidth_usage;
|
2003-12-06 06:54:04 +01:00
|
|
|
#ifdef DEBUG_ROUTER_DUMP_ROUTER_TO_STRING
|
2003-12-17 22:09:31 +01:00
|
|
|
char *s_tmp, *s_dup;
|
2003-12-09 00:45:37 +01:00
|
|
|
const char *cp;
|
2003-12-06 06:54:04 +01:00
|
|
|
routerinfo_t *ri_tmp;
|
|
|
|
#endif
|
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)) {
|
|
|
|
log_fn(LOG_WARN,"Tried to sign a router with a private key that didn't match router's public key!");
|
|
|
|
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) {
|
2004-07-22 08:22:04 +02:00
|
|
|
log_fn(LOG_ERR, "Error computing fingerprint");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* PEM-encode the onion key */
|
2003-12-06 06:54:04 +01:00
|
|
|
if(crypto_pk_write_public_key_to_string(router->onion_pkey,
|
|
|
|
&onion_pkey,&onion_pkeylen)<0) {
|
|
|
|
log_fn(LOG_WARN,"write onion_pkey to string failed!");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* PEM-encode the identity key key */
|
2003-12-06 06:54:04 +01:00
|
|
|
if(crypto_pk_write_public_key_to_string(router->identity_pkey,
|
|
|
|
&identity_pkey,&identity_pkeylen)<0) {
|
|
|
|
log_fn(LOG_WARN,"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. */
|
2004-08-07 04:46:16 +02:00
|
|
|
format_iso_time(published, router->published_on);
|
2003-12-17 22:09:31 +01:00
|
|
|
|
2004-08-07 04:46:16 +02:00
|
|
|
/* How busy have we been? */
|
|
|
|
bandwidth_usage = rep_hist_get_bandwidth_lines();
|
2004-08-09 06:27:13 +02:00
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Generate the easy portion of the router descriptor. */
|
2003-12-17 22:09:31 +01:00
|
|
|
result = snprintf(s, maxlen,
|
2004-04-25 00:17:50 +02:00
|
|
|
"router %s %s %d %d %d\n"
|
2003-12-06 06:54:04 +01:00
|
|
|
"platform %s\n"
|
|
|
|
"published %s\n"
|
2004-07-22 08:22:04 +02:00
|
|
|
"opt fingerprint %s\n"
|
2004-07-20 23:13:11 +02:00
|
|
|
"opt uptime %ld\n"
|
2004-07-12 20:02:54 +02:00
|
|
|
"bandwidth %d %d %d\n"
|
2003-12-06 06:54:04 +01:00
|
|
|
"onion-key\n%s"
|
2004-08-07 04:46:16 +02:00
|
|
|
"signing-key\n%s%s",
|
2003-12-06 06:54:04 +01:00
|
|
|
router->nickname,
|
|
|
|
router->address,
|
|
|
|
router->or_port,
|
|
|
|
router->socks_port,
|
2004-06-21 06:37:27 +02:00
|
|
|
/* Due to an 0.0.7 bug, we can't actually say that we have a dirport unles
|
|
|
|
* we're an authoritative directory.
|
|
|
|
*/
|
|
|
|
router->is_trusted_dir ? router->dir_port : 0,
|
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,
|
2004-07-20 23:13:11 +02:00
|
|
|
stats_n_seconds_uptime,
|
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,
|
2004-08-07 04:46:16 +02:00
|
|
|
onion_pkey, identity_pkey,
|
|
|
|
bandwidth_usage);
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
tor_free(onion_pkey);
|
|
|
|
tor_free(identity_pkey);
|
2004-08-07 04:59:46 +02:00
|
|
|
tor_free(bandwidth_usage);
|
2003-12-06 06:54:04 +01:00
|
|
|
|
2004-10-14 04:47:09 +02:00
|
|
|
if(result < 0 || (size_t)result >= maxlen) {
|
2003-12-06 06:54:04 +01:00
|
|
|
/* apparently different glibcs do different things on snprintf error.. so check both */
|
|
|
|
return -1;
|
|
|
|
}
|
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;
|
|
|
|
|
2004-06-21 06:37:27 +02:00
|
|
|
if (router->dir_port && !router->is_trusted_dir) {
|
|
|
|
/* dircacheport wasn't recognized before 0.0.8pre. (When 0.0.7 is gone,
|
2004-06-21 06:40:24 +02:00
|
|
|
* we can fold this back into dirport anyway.) */
|
2004-06-21 06:37:27 +02:00
|
|
|
result = snprintf(s+written,maxlen-written, "opt dircacheport %d\n",
|
|
|
|
router->dir_port);
|
|
|
|
if (result<0 || result+written > maxlen)
|
|
|
|
return -1;
|
|
|
|
written += result;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (options.ContactInfo && strlen(options.ContactInfo)) {
|
|
|
|
result = snprintf(s+written,maxlen-written, "opt contact %s\n",
|
|
|
|
options.ContactInfo);
|
|
|
|
if (result<0 || result+written > maxlen)
|
|
|
|
return -1;
|
|
|
|
written += result;
|
|
|
|
}
|
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Write the exit policy to the end of 's'. */
|
2003-12-06 06:54:04 +01:00
|
|
|
for(tmpe=router->exit_policy; tmpe; tmpe=tmpe->next) {
|
|
|
|
in.s_addr = htonl(tmpe->addr);
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Write: "accept 1.2.3.4" */
|
2003-12-06 06:54:04 +01:00
|
|
|
result = snprintf(s+written, maxlen-written, "%s %s",
|
|
|
|
tmpe->policy_type == EXIT_POLICY_ACCEPT ? "accept" : "reject",
|
|
|
|
tmpe->msk == 0 ? "*" : inet_ntoa(in));
|
|
|
|
if(result < 0 || result+written > maxlen) {
|
|
|
|
/* apparently different glibcs do different things on snprintf error.. so check both */
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
written += result;
|
|
|
|
if (tmpe->msk != 0xFFFFFFFFu && tmpe->msk != 0) {
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Write "/255.255.0.0" */
|
2003-12-06 06:54:04 +01:00
|
|
|
in.s_addr = htonl(tmpe->msk);
|
|
|
|
result = snprintf(s+written, maxlen-written, "/%s", inet_ntoa(in));
|
|
|
|
if (result<0 || result+written > maxlen)
|
|
|
|
return -1;
|
|
|
|
written += result;
|
|
|
|
}
|
2004-10-13 03:25:42 +02:00
|
|
|
if (tmpe->prt_min <= 1 && tmpe->prt_max == 65535) {
|
2004-05-04 20:17:45 +02:00
|
|
|
/* There is no port set; write ":*" */
|
2003-12-13 03:44:02 +01:00
|
|
|
if (written > maxlen-4)
|
|
|
|
return -1;
|
|
|
|
strcat(s+written, ":*\n");
|
|
|
|
written += 3;
|
|
|
|
} else if (tmpe->prt_min == tmpe->prt_max) {
|
2004-05-04 20:17:45 +02:00
|
|
|
/* There is only one port; write ":80". */
|
2003-12-13 03:44:02 +01:00
|
|
|
result = snprintf(s+written, maxlen-written, ":%d\n", tmpe->prt_min);
|
2003-12-06 06:54:04 +01:00
|
|
|
if (result<0 || result+written > maxlen)
|
|
|
|
return -1;
|
|
|
|
written += result;
|
|
|
|
} else {
|
2004-05-04 20:17:45 +02:00
|
|
|
/* There is a range of ports; write ":79-80". */
|
2003-12-13 03:44:02 +01:00
|
|
|
result = snprintf(s+written, maxlen-written, ":%d-%d\n", tmpe->prt_min,
|
|
|
|
tmpe->prt_max);
|
|
|
|
if (result<0 || result+written > maxlen)
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
2003-12-13 03:44:02 +01:00
|
|
|
written += result;
|
2003-12-06 06:54:04 +01:00
|
|
|
}
|
2004-10-13 03:25:42 +02:00
|
|
|
if (tmpe->msk == 0 && tmpe->prt_min <= 1 && tmpe->prt_max == 65535)
|
|
|
|
/* This was a catch-all rule, so future rules are irrelevant. */
|
|
|
|
break;
|
2003-12-06 06:54:04 +01:00
|
|
|
} /* end for */
|
|
|
|
if (written > maxlen-256) /* Not enough room for signature. */
|
|
|
|
return -1;
|
|
|
|
|
2004-05-04 20:17:45 +02:00
|
|
|
/* Sign the directory */
|
2003-12-06 06:54:04 +01:00
|
|
|
strcat(s+written, "router-signature\n");
|
|
|
|
written += strlen(s+written);
|
|
|
|
s[written] = '\0';
|
|
|
|
if (router_get_router_hash(s, digest) < 0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (crypto_pk_private_sign(ident_key, digest, 20, signature) < 0) {
|
|
|
|
log_fn(LOG_WARN, "Error signing digest");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
strcat(s+written, "-----BEGIN SIGNATURE-----\n");
|
|
|
|
written += strlen(s+written);
|
|
|
|
if (base64_encode(s+written, maxlen-written, signature, 128) < 0) {
|
|
|
|
log_fn(LOG_WARN, "Couldn't base64-encode signature");
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
written += strlen(s+written);
|
|
|
|
strcat(s+written, "-----END SIGNATURE-----\n");
|
|
|
|
written += strlen(s+written);
|
2003-12-17 22:09:31 +01:00
|
|
|
|
|
|
|
if (written > maxlen-2)
|
2003-12-06 06:54:04 +01:00
|
|
|
return -1;
|
|
|
|
/* include a last '\n' */
|
|
|
|
s[written] = '\n';
|
|
|
|
s[written+1] = 0;
|
|
|
|
|
|
|
|
#ifdef DEBUG_ROUTER_DUMP_ROUTER_TO_STRING
|
2003-12-09 00:45:37 +01:00
|
|
|
cp = s_tmp = s_dup = tor_strdup(s);
|
2004-05-10 19:30:51 +02:00
|
|
|
ri_tmp = router_parse_entry_from_string(cp, NULL);
|
2003-12-06 06:54:04 +01:00
|
|
|
if (!ri_tmp) {
|
2003-12-17 22:09:31 +01:00
|
|
|
log_fn(LOG_ERR, "We just generated a router descriptor we can't parse: <<%s>>",
|
2003-12-06 06:54:04 +01:00
|
|
|
s);
|
|
|
|
return -1;
|
|
|
|
}
|
2004-09-29 08:52:36 +02:00
|
|
|
tor_free(s_dup);
|
2003-12-06 06:54:04 +01:00
|
|
|
routerinfo_free(ri_tmp);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return written+1;
|
|
|
|
}
|
|
|
|
|
2004-08-18 06:44:24 +02:00
|
|
|
int is_legal_nickname(const char *s)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
tor_assert(s);
|
|
|
|
len = strlen(s);
|
|
|
|
return len > 0 && len <= MAX_NICKNAME_LEN &&
|
|
|
|
strspn(s,LEGAL_NICKNAME_CHARACTERS)==len;
|
|
|
|
}
|
|
|
|
int is_legal_nickname_or_hexdigest(const char *s)
|
|
|
|
{
|
|
|
|
size_t len;
|
|
|
|
tor_assert(s);
|
|
|
|
if (*s!='$')
|
|
|
|
return is_legal_nickname(s);
|
|
|
|
|
|
|
|
len = strlen(s);
|
|
|
|
return len == HEX_DIGEST_LEN+1 && strspn(s+1,HEX_CHARACTERS)==len-1;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2003-12-06 06:54:04 +01:00
|
|
|
/*
|
|
|
|
Local Variables:
|
|
|
|
mode:c
|
|
|
|
indent-tabs-mode:nil
|
|
|
|
c-basic-offset:2
|
|
|
|
End:
|
|
|
|
*/
|