2007-12-12 22:09:01 +01:00
|
|
|
/* Copyright (c) 2001-2004, Roger Dingledine.
|
|
|
|
* Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
|
2010-02-27 23:13:37 +01:00
|
|
|
* Copyright (c) 2007-2010, The Tor Project, Inc. */
|
2007-06-03 05:05:10 +02:00
|
|
|
/* See LICENSE for licensing information */
|
|
|
|
|
2007-06-14 00:39:08 +02:00
|
|
|
#define DIRVOTE_PRIVATE
|
2007-06-03 05:05:10 +02:00
|
|
|
#include "or.h"
|
|
|
|
|
|
|
|
/**
|
|
|
|
* \file dirvote.c
|
2007-07-18 22:46:12 +02:00
|
|
|
* \brief Functions to compute directory consensus, and schedule voting.
|
2007-06-03 05:05:10 +02:00
|
|
|
**/
|
|
|
|
|
2009-10-15 22:06:00 +02:00
|
|
|
/** A consensus that we have built and are appending signatures to. Once it's
|
|
|
|
* time to publish it, it will become an active consensus if it accumulates
|
|
|
|
* enough signatures. */
|
2009-09-23 09:02:32 +02:00
|
|
|
typedef struct pending_consensus_t {
|
|
|
|
/** The body of the consensus that we're currently building. Once we
|
|
|
|
* have it built, it goes into dirserv.c */
|
|
|
|
char *body;
|
|
|
|
/** The parsed in-progress consensus document. */
|
|
|
|
networkstatus_t *consensus;
|
|
|
|
} pending_consensus_t;
|
2009-09-22 22:52:51 +02:00
|
|
|
|
|
|
|
static int dirvote_add_signatures_to_all_pending_consensuses(
|
2007-07-30 01:11:44 +02:00
|
|
|
const char *detached_signatures_body,
|
|
|
|
const char **msg_out);
|
2009-09-22 22:52:51 +02:00
|
|
|
static int dirvote_add_signatures_to_pending_consensus(
|
|
|
|
pending_consensus_t *pc,
|
|
|
|
ns_detached_signatures_t *sigs,
|
|
|
|
const char **msg_out);
|
2007-09-08 22:25:57 +02:00
|
|
|
static char *list_v3_auth_ids(void);
|
2007-09-22 08:06:05 +02:00
|
|
|
static void dirvote_fetch_missing_votes(void);
|
|
|
|
static void dirvote_fetch_missing_signatures(void);
|
2007-10-22 19:31:26 +02:00
|
|
|
static int dirvote_perform_vote(void);
|
2007-10-02 22:35:23 +02:00
|
|
|
static void dirvote_clear_votes(int all_votes);
|
2009-09-22 22:52:51 +02:00
|
|
|
static int dirvote_compute_consensuses(void);
|
2007-10-02 22:35:23 +02:00
|
|
|
static int dirvote_publish_consensus(void);
|
2009-08-20 02:06:59 +02:00
|
|
|
static char *make_consensus_method_list(int low, int high, const char *sep);
|
2009-08-20 04:07:32 +02:00
|
|
|
|
|
|
|
/** The highest consensus method that we currently support. */
|
2010-01-30 02:10:50 +01:00
|
|
|
#define MAX_SUPPORTED_CONSENSUS_METHOD 9
|
2009-09-15 04:15:57 +02:00
|
|
|
|
2010-02-23 03:43:13 +01:00
|
|
|
/** Lowest consensus method that contains a 'directory-footer' marker */
|
|
|
|
#define MIN_METHOD_FOR_FOOTER 9
|
|
|
|
|
|
|
|
/** Lowest consensus method that contains bandwidth weights */
|
|
|
|
#define MIN_METHOD_FOR_BW_WEIGHTS 9
|
|
|
|
|
|
|
|
/** Lowest consensus method that contains consensus params */
|
2009-09-15 04:15:57 +02:00
|
|
|
#define MIN_METHOD_FOR_PARAMS 7
|
2007-07-30 01:11:44 +02:00
|
|
|
|
2009-08-24 18:51:33 +02:00
|
|
|
/** Lowest consensus method that generates microdescriptors */
|
|
|
|
#define MIN_METHOD_FOR_MICRODESC 8
|
|
|
|
|
2007-07-18 22:46:12 +02:00
|
|
|
/* =====
|
2007-10-22 19:31:26 +02:00
|
|
|
* Voting
|
|
|
|
* =====*/
|
2007-07-18 22:46:12 +02:00
|
|
|
|
2009-08-24 18:51:33 +02:00
|
|
|
/* Overestimated. */
|
|
|
|
#define MICRODESC_LINE_LEN 80
|
|
|
|
|
2007-12-09 20:11:22 +01:00
|
|
|
/** Return a new string containing the string representation of the vote in
|
2007-10-22 19:31:26 +02:00
|
|
|
* <b>v3_ns</b>, signed with our v3 signing key <b>private_signing_key</b>.
|
|
|
|
* For v3 authorities. */
|
|
|
|
char *
|
|
|
|
format_networkstatus_vote(crypto_pk_env_t *private_signing_key,
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *v3_ns)
|
2007-06-03 05:05:10 +02:00
|
|
|
{
|
2007-10-22 19:31:26 +02:00
|
|
|
size_t len;
|
|
|
|
char *status = NULL;
|
|
|
|
const char *client_versions = NULL, *server_versions = NULL;
|
|
|
|
char *outp, *endp;
|
|
|
|
char fingerprint[FINGERPRINT_LEN+1];
|
|
|
|
char ipaddr[INET_NTOA_BUF_LEN];
|
|
|
|
char digest[DIGEST_LEN];
|
|
|
|
struct in_addr in;
|
|
|
|
uint32_t addr;
|
|
|
|
routerlist_t *rl = router_get_routerlist();
|
|
|
|
char *version_lines = NULL;
|
2010-02-25 20:59:35 +01:00
|
|
|
int r;
|
2007-10-22 19:31:26 +02:00
|
|
|
networkstatus_voter_info_t *voter;
|
|
|
|
|
|
|
|
tor_assert(private_signing_key);
|
2008-07-24 11:22:27 +02:00
|
|
|
tor_assert(v3_ns->type == NS_TYPE_VOTE || v3_ns->type == NS_TYPE_OPINION);
|
2007-10-22 19:31:26 +02:00
|
|
|
|
|
|
|
voter = smartlist_get(v3_ns->voters, 0);
|
|
|
|
|
|
|
|
addr = voter->addr;
|
|
|
|
in.s_addr = htonl(addr);
|
|
|
|
tor_inet_ntoa(&in, ipaddr, sizeof(ipaddr));
|
|
|
|
|
|
|
|
base16_encode(fingerprint, sizeof(fingerprint),
|
|
|
|
v3_ns->cert->cache_info.identity_digest, DIGEST_LEN);
|
|
|
|
client_versions = v3_ns->client_versions;
|
|
|
|
server_versions = v3_ns->server_versions;
|
|
|
|
|
|
|
|
if (client_versions || server_versions) {
|
|
|
|
size_t v_len = 64;
|
|
|
|
char *cp;
|
|
|
|
if (client_versions)
|
|
|
|
v_len += strlen(client_versions);
|
2008-01-15 06:57:19 +01:00
|
|
|
if (server_versions)
|
2007-10-22 19:31:26 +02:00
|
|
|
v_len += strlen(server_versions);
|
|
|
|
version_lines = tor_malloc(v_len);
|
|
|
|
cp = version_lines;
|
|
|
|
if (client_versions) {
|
2010-02-25 20:59:35 +01:00
|
|
|
r = tor_snprintf(cp, v_len-(cp-version_lines),
|
2007-10-22 19:31:26 +02:00
|
|
|
"client-versions %s\n", client_versions);
|
2010-02-25 20:59:35 +01:00
|
|
|
if (r < 0) {
|
|
|
|
log_err(LD_BUG, "Insufficient memory for client-versions line");
|
|
|
|
tor_assert(0);
|
|
|
|
}
|
2007-10-22 19:31:26 +02:00
|
|
|
cp += strlen(cp);
|
|
|
|
}
|
2010-02-25 20:59:35 +01:00
|
|
|
if (server_versions) {
|
|
|
|
r = tor_snprintf(cp, v_len-(cp-version_lines),
|
2007-10-22 19:31:26 +02:00
|
|
|
"server-versions %s\n", server_versions);
|
2010-02-25 20:59:35 +01:00
|
|
|
if (r < 0) {
|
|
|
|
log_err(LD_BUG, "Insufficient memory for server-versions line");
|
|
|
|
tor_assert(0);
|
|
|
|
}
|
|
|
|
}
|
2007-10-22 19:31:26 +02:00
|
|
|
} else {
|
|
|
|
version_lines = tor_strdup("");
|
2007-06-03 05:05:10 +02:00
|
|
|
}
|
2007-10-22 19:31:26 +02:00
|
|
|
|
|
|
|
len = 8192;
|
|
|
|
len += strlen(version_lines);
|
2009-08-24 18:51:33 +02:00
|
|
|
len += (RS_ENTRY_LEN+MICRODESC_LINE_LEN)*smartlist_len(rl->routers);
|
2010-02-15 02:49:08 +01:00
|
|
|
len += strlen("\ndirectory-footer\n");
|
2007-10-22 19:31:26 +02:00
|
|
|
len += v3_ns->cert->cache_info.signed_descriptor_len;
|
|
|
|
|
|
|
|
status = tor_malloc(len);
|
|
|
|
{
|
|
|
|
char published[ISO_TIME_LEN+1];
|
|
|
|
char va[ISO_TIME_LEN+1];
|
|
|
|
char fu[ISO_TIME_LEN+1];
|
|
|
|
char vu[ISO_TIME_LEN+1];
|
|
|
|
char *flags = smartlist_join_strings(v3_ns->known_flags, " ", 0, NULL);
|
2009-09-15 04:15:57 +02:00
|
|
|
char *params;
|
2007-10-22 19:31:26 +02:00
|
|
|
authority_cert_t *cert = v3_ns->cert;
|
2009-08-20 04:07:32 +02:00
|
|
|
char *methods =
|
2009-08-20 02:06:59 +02:00
|
|
|
make_consensus_method_list(1, MAX_SUPPORTED_CONSENSUS_METHOD, " ");
|
2007-10-22 19:31:26 +02:00
|
|
|
format_iso_time(published, v3_ns->published);
|
|
|
|
format_iso_time(va, v3_ns->valid_after);
|
|
|
|
format_iso_time(fu, v3_ns->fresh_until);
|
|
|
|
format_iso_time(vu, v3_ns->valid_until);
|
|
|
|
|
2009-09-15 04:15:57 +02:00
|
|
|
if (v3_ns->net_params)
|
|
|
|
params = smartlist_join_strings(v3_ns->net_params, " ", 0, NULL);
|
|
|
|
else
|
|
|
|
params = tor_strdup("");
|
|
|
|
|
2007-10-22 19:31:26 +02:00
|
|
|
tor_assert(cert);
|
2010-02-25 20:59:35 +01:00
|
|
|
r = tor_snprintf(status, len,
|
2007-10-22 19:31:26 +02:00
|
|
|
"network-status-version 3\n"
|
2008-07-24 11:22:27 +02:00
|
|
|
"vote-status %s\n"
|
2009-08-20 04:07:32 +02:00
|
|
|
"consensus-methods %s\n"
|
2007-10-22 19:31:26 +02:00
|
|
|
"published %s\n"
|
|
|
|
"valid-after %s\n"
|
|
|
|
"fresh-until %s\n"
|
|
|
|
"valid-until %s\n"
|
|
|
|
"voting-delay %d %d\n"
|
|
|
|
"%s" /* versions */
|
|
|
|
"known-flags %s\n"
|
2009-09-15 04:15:57 +02:00
|
|
|
"params %s\n"
|
2007-10-22 19:31:26 +02:00
|
|
|
"dir-source %s %s %s %s %d %d\n"
|
|
|
|
"contact %s\n",
|
2008-07-24 11:22:27 +02:00
|
|
|
v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion",
|
2009-08-20 04:07:32 +02:00
|
|
|
methods,
|
2007-10-22 19:31:26 +02:00
|
|
|
published, va, fu, vu,
|
|
|
|
v3_ns->vote_seconds, v3_ns->dist_seconds,
|
|
|
|
version_lines,
|
|
|
|
flags,
|
2009-09-15 04:15:57 +02:00
|
|
|
params,
|
2007-10-22 19:31:26 +02:00
|
|
|
voter->nickname, fingerprint, voter->address,
|
2009-09-23 09:02:32 +02:00
|
|
|
ipaddr, voter->dir_port, voter->or_port, voter->contact);
|
2007-10-22 19:31:26 +02:00
|
|
|
|
2010-02-25 20:59:35 +01:00
|
|
|
if (r < 0) {
|
|
|
|
log_err(LD_BUG, "Insufficient memory for network status line");
|
|
|
|
tor_assert(0);
|
|
|
|
}
|
|
|
|
|
2009-09-15 04:15:57 +02:00
|
|
|
tor_free(params);
|
2007-10-22 19:31:26 +02:00
|
|
|
tor_free(flags);
|
2009-08-20 04:07:32 +02:00
|
|
|
tor_free(methods);
|
2007-10-22 19:31:26 +02:00
|
|
|
outp = status + strlen(status);
|
|
|
|
endp = status + len;
|
2008-05-12 04:14:01 +02:00
|
|
|
|
|
|
|
if (!tor_digest_is_zero(voter->legacy_id_digest)) {
|
|
|
|
char fpbuf[HEX_DIGEST_LEN+1];
|
|
|
|
base16_encode(fpbuf, sizeof(fpbuf), voter->legacy_id_digest, DIGEST_LEN);
|
2010-02-25 20:59:35 +01:00
|
|
|
r = tor_snprintf(outp, endp-outp, "legacy-dir-key %s\n", fpbuf);
|
|
|
|
if (r < 0) {
|
|
|
|
log_err(LD_BUG, "Insufficient memory for legacy-dir-key line");
|
|
|
|
tor_assert(0);
|
|
|
|
}
|
2008-05-12 04:14:01 +02:00
|
|
|
outp += strlen(outp);
|
|
|
|
}
|
|
|
|
|
2007-10-22 19:31:26 +02:00
|
|
|
tor_assert(outp + cert->cache_info.signed_descriptor_len < endp);
|
|
|
|
memcpy(outp, cert->cache_info.signed_descriptor_body,
|
|
|
|
cert->cache_info.signed_descriptor_len);
|
|
|
|
|
|
|
|
outp += cert->cache_info.signed_descriptor_len;
|
2007-06-05 00:29:00 +02:00
|
|
|
}
|
2007-06-03 05:05:10 +02:00
|
|
|
|
2009-08-24 18:51:33 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(v3_ns->routerstatus_list, vote_routerstatus_t *,
|
|
|
|
vrs) {
|
|
|
|
vote_microdesc_hash_t *h;
|
2007-10-22 19:31:26 +02:00
|
|
|
if (routerstatus_format_entry(outp, endp-outp, &vrs->status,
|
2009-07-31 06:33:53 +02:00
|
|
|
vrs->version, NS_V3_VOTE) < 0) {
|
2007-10-22 19:31:26 +02:00
|
|
|
log_warn(LD_BUG, "Unable to print router status.");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
outp += strlen(outp);
|
2009-08-24 18:51:33 +02:00
|
|
|
|
|
|
|
for (h = vrs->microdesc; h; h = h->next) {
|
|
|
|
size_t mlen = strlen(h->microdesc_hash_line);
|
|
|
|
if (outp+mlen >= endp) {
|
|
|
|
log_warn(LD_BUG, "Can't fit microdesc line in vote.");
|
|
|
|
}
|
|
|
|
memcpy(outp, h->microdesc_hash_line, mlen+1);
|
|
|
|
outp += strlen(outp);
|
|
|
|
}
|
|
|
|
} SMARTLIST_FOREACH_END(vrs);
|
2007-10-22 19:31:26 +02:00
|
|
|
|
2010-02-25 20:59:35 +01:00
|
|
|
r = tor_snprintf(outp, endp-outp, "directory-footer\n");
|
|
|
|
if (r < 0) {
|
|
|
|
log_err(LD_BUG, "Insufficient memory for directory-footer line");
|
|
|
|
tor_assert(0);
|
|
|
|
}
|
2010-02-15 02:49:08 +01:00
|
|
|
outp += strlen(outp);
|
|
|
|
|
2007-10-22 19:31:26 +02:00
|
|
|
{
|
|
|
|
char signing_key_fingerprint[FINGERPRINT_LEN+1];
|
|
|
|
if (tor_snprintf(outp, endp-outp, "directory-signature ")<0) {
|
|
|
|
log_warn(LD_BUG, "Unable to start signature line.");
|
|
|
|
goto err;
|
2007-06-13 21:06:23 +02:00
|
|
|
}
|
2007-10-22 19:31:26 +02:00
|
|
|
outp += strlen(outp);
|
2007-06-03 05:05:10 +02:00
|
|
|
|
2007-10-22 19:31:26 +02:00
|
|
|
if (crypto_pk_get_fingerprint(private_signing_key,
|
|
|
|
signing_key_fingerprint, 0)<0) {
|
|
|
|
log_warn(LD_BUG, "Unable to get fingerprint for signing key");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
if (tor_snprintf(outp, endp-outp, "%s %s\n", fingerprint,
|
|
|
|
signing_key_fingerprint)<0) {
|
|
|
|
log_warn(LD_BUG, "Unable to end signature line.");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
outp += strlen(outp);
|
2007-06-03 05:05:10 +02:00
|
|
|
}
|
|
|
|
|
2009-08-24 18:51:33 +02:00
|
|
|
if (router_get_networkstatus_v3_hash(status, digest, DIGEST_SHA1)<0)
|
2007-10-22 19:31:26 +02:00
|
|
|
goto err;
|
|
|
|
note_crypto_pk_op(SIGN_DIR);
|
2009-09-14 17:57:19 +02:00
|
|
|
if (router_append_dirobj_signature(outp,endp-outp,digest, DIGEST_LEN,
|
2007-10-22 19:31:26 +02:00
|
|
|
private_signing_key)<0) {
|
|
|
|
log_warn(LD_BUG, "Unable to sign networkstatus vote.");
|
|
|
|
goto err;
|
|
|
|
}
|
2007-06-03 05:05:10 +02:00
|
|
|
|
2007-10-22 19:31:26 +02:00
|
|
|
{
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *v;
|
2008-07-24 11:22:27 +02:00
|
|
|
if (!(v = networkstatus_parse_vote_from_string(status, NULL,
|
|
|
|
v3_ns->type))) {
|
|
|
|
log_err(LD_BUG,"Generated a networkstatus %s we couldn't parse: "
|
|
|
|
"<<%s>>",
|
|
|
|
v3_ns->type == NS_TYPE_VOTE ? "vote" : "opinion", status);
|
2007-10-22 19:31:26 +02:00
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
networkstatus_vote_free(v);
|
|
|
|
}
|
|
|
|
|
|
|
|
goto done;
|
|
|
|
|
|
|
|
err:
|
|
|
|
tor_free(status);
|
|
|
|
done:
|
|
|
|
tor_free(version_lines);
|
|
|
|
return status;
|
2007-06-05 00:29:00 +02:00
|
|
|
}
|
|
|
|
|
2007-10-22 19:31:26 +02:00
|
|
|
/* =====
|
|
|
|
* Consensus generation
|
|
|
|
* ===== */
|
|
|
|
|
2007-06-17 17:10:43 +02:00
|
|
|
/** Given a vote <b>vote</b> (not a consensus!), return its associated
|
2007-12-18 22:37:58 +01:00
|
|
|
* networkstatus_voter_info_t. */
|
2007-06-05 00:29:00 +02:00
|
|
|
static networkstatus_voter_info_t *
|
2008-02-05 22:39:29 +01:00
|
|
|
get_voter(const networkstatus_t *vote)
|
2007-06-05 00:29:00 +02:00
|
|
|
{
|
|
|
|
tor_assert(vote);
|
2008-07-24 11:22:27 +02:00
|
|
|
tor_assert(vote->type == NS_TYPE_VOTE);
|
2007-06-05 00:29:00 +02:00
|
|
|
tor_assert(vote->voters);
|
|
|
|
tor_assert(smartlist_len(vote->voters) == 1);
|
|
|
|
return smartlist_get(vote->voters, 0);
|
|
|
|
}
|
|
|
|
|
2009-10-15 22:06:00 +02:00
|
|
|
/** Return the signature made by <b>voter</b> using the algorithm
|
|
|
|
* <b>alg</b>, or NULL if none is found. */
|
2009-09-16 23:01:01 +02:00
|
|
|
document_signature_t *
|
|
|
|
voter_get_sig_by_algorithm(const networkstatus_voter_info_t *voter,
|
|
|
|
digest_algorithm_t alg)
|
|
|
|
{
|
|
|
|
if (!voter->sigs)
|
|
|
|
return NULL;
|
|
|
|
SMARTLIST_FOREACH(voter->sigs, document_signature_t *, sig,
|
|
|
|
if (sig->alg == alg)
|
|
|
|
return sig);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** Temporary structure used in constructing a list of dir-source entries
|
|
|
|
* for a consensus. One of these is generated for every vote, and one more
|
|
|
|
* for every legacy key in each vote. */
|
2008-12-22 15:56:28 +01:00
|
|
|
typedef struct dir_src_ent_t {
|
2008-05-12 04:14:01 +02:00
|
|
|
networkstatus_t *v;
|
|
|
|
const char *digest;
|
|
|
|
int is_legacy;
|
|
|
|
} dir_src_ent_t;
|
|
|
|
|
2008-02-05 22:39:29 +01:00
|
|
|
/** Helper for sorting networkstatus_t votes (not consensuses) by the
|
2007-06-17 17:10:43 +02:00
|
|
|
* hash of their voters' identity digests. */
|
2007-06-04 21:19:01 +02:00
|
|
|
static int
|
|
|
|
_compare_votes_by_authority_id(const void **_a, const void **_b)
|
|
|
|
{
|
2008-02-05 22:39:29 +01:00
|
|
|
const networkstatus_t *a = *_a, *b = *_b;
|
2007-06-05 00:29:00 +02:00
|
|
|
return memcmp(get_voter(a)->identity_digest,
|
|
|
|
get_voter(b)->identity_digest, DIGEST_LEN);
|
2007-06-04 21:19:01 +02:00
|
|
|
}
|
|
|
|
|
2008-12-22 18:53:04 +01:00
|
|
|
/** Helper: Compare the dir_src_ent_ts in *<b>_a</b> and *<b>_b</b> by
|
|
|
|
* their identity digests, and return -1, 0, or 1 depending on their
|
|
|
|
* ordering */
|
2008-05-12 04:14:01 +02:00
|
|
|
static int
|
|
|
|
_compare_dir_src_ents_by_authority_id(const void **_a, const void **_b)
|
|
|
|
{
|
|
|
|
const dir_src_ent_t *a = *_a, *b = *_b;
|
|
|
|
const networkstatus_voter_info_t *a_v = get_voter(a->v),
|
|
|
|
*b_v = get_voter(b->v);
|
|
|
|
const char *a_id, *b_id;
|
|
|
|
a_id = a->is_legacy ? a_v->legacy_id_digest : a_v->identity_digest;
|
|
|
|
b_id = b->is_legacy ? b_v->legacy_id_digest : b_v->identity_digest;
|
|
|
|
|
|
|
|
return memcmp(a_id, b_id, DIGEST_LEN);
|
|
|
|
}
|
|
|
|
|
2007-06-17 17:10:43 +02:00
|
|
|
/** Given a sorted list of strings <b>in</b>, add every member to <b>out</b>
|
|
|
|
* that occurs more than <b>min</b> times. */
|
2007-06-04 21:19:01 +02:00
|
|
|
static void
|
|
|
|
get_frequent_members(smartlist_t *out, smartlist_t *in, int min)
|
|
|
|
{
|
|
|
|
char *cur = NULL;
|
|
|
|
int count = 0;
|
|
|
|
SMARTLIST_FOREACH(in, char *, cp,
|
|
|
|
{
|
|
|
|
if (cur && !strcmp(cp, cur)) {
|
|
|
|
++count;
|
|
|
|
} else {
|
|
|
|
if (count > min)
|
|
|
|
smartlist_add(out, cur);
|
|
|
|
cur = cp;
|
|
|
|
count = 1;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
if (count > min)
|
|
|
|
smartlist_add(out, cur);
|
|
|
|
}
|
|
|
|
|
2007-06-17 17:10:43 +02:00
|
|
|
/** Given a sorted list of strings <b>lst</b>, return the member that appears
|
2007-07-03 00:07:53 +02:00
|
|
|
* most. Break ties in favor of later-occurring members. */
|
2009-08-24 18:51:33 +02:00
|
|
|
#define get_most_frequent_member(lst) \
|
|
|
|
smartlist_get_most_frequent_string(lst)
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2007-06-17 17:10:43 +02:00
|
|
|
/** Return 0 if and only if <b>a</b> and <b>b</b> are routerstatuses
|
|
|
|
* that come from the same routerinfo, with the same derived elements.
|
|
|
|
*/
|
2007-06-04 21:19:01 +02:00
|
|
|
static int
|
2007-06-17 17:10:43 +02:00
|
|
|
compare_vote_rs(const vote_routerstatus_t *a, const vote_routerstatus_t *b)
|
2007-06-04 21:19:01 +02:00
|
|
|
{
|
|
|
|
int r;
|
2007-06-17 17:10:43 +02:00
|
|
|
if ((r = memcmp(a->status.identity_digest, b->status.identity_digest,
|
|
|
|
DIGEST_LEN)))
|
|
|
|
return r;
|
2007-06-04 21:19:01 +02:00
|
|
|
if ((r = memcmp(a->status.descriptor_digest, b->status.descriptor_digest,
|
|
|
|
DIGEST_LEN)))
|
|
|
|
return r;
|
2008-02-22 20:09:45 +01:00
|
|
|
if ((r = (int)(b->status.published_on - a->status.published_on)))
|
2007-06-04 21:19:01 +02:00
|
|
|
return r;
|
2007-06-04 21:54:02 +02:00
|
|
|
if ((r = strcmp(b->status.nickname, a->status.nickname)))
|
|
|
|
return r;
|
2007-06-17 17:10:23 +02:00
|
|
|
if ((r = (((int)b->status.addr) - ((int)a->status.addr))))
|
|
|
|
return r;
|
2007-06-04 21:19:01 +02:00
|
|
|
if ((r = (((int)b->status.or_port) - ((int)a->status.or_port))))
|
|
|
|
return r;
|
|
|
|
if ((r = (((int)b->status.dir_port) - ((int)a->status.dir_port))))
|
|
|
|
return r;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-06-17 17:10:43 +02:00
|
|
|
/** Helper for sorting routerlists based on compare_vote_rs. */
|
2007-06-04 21:19:01 +02:00
|
|
|
static int
|
2007-06-17 17:10:43 +02:00
|
|
|
_compare_vote_rs(const void **_a, const void **_b)
|
2007-06-04 21:19:01 +02:00
|
|
|
{
|
|
|
|
const vote_routerstatus_t *a = *_a, *b = *_b;
|
2007-06-17 17:10:43 +02:00
|
|
|
return compare_vote_rs(a,b);
|
2007-06-04 21:19:01 +02:00
|
|
|
}
|
|
|
|
|
2007-06-17 17:10:43 +02:00
|
|
|
/** Given a list of vote_routerstatus_t, all for the same router identity,
|
|
|
|
* return whichever is most frequent, breaking ties in favor of more
|
2008-08-05 20:54:23 +02:00
|
|
|
* recently published vote_routerstatus_t and in case of ties there,
|
2009-05-27 23:55:51 +02:00
|
|
|
* in favor of smaller descriptor digest.
|
2007-06-17 17:10:43 +02:00
|
|
|
*/
|
2007-06-04 21:19:01 +02:00
|
|
|
static vote_routerstatus_t *
|
2009-08-24 18:51:33 +02:00
|
|
|
compute_routerstatus_consensus(smartlist_t *votes, int consensus_method,
|
|
|
|
char *microdesc_digest256_out)
|
2007-06-04 21:19:01 +02:00
|
|
|
{
|
|
|
|
vote_routerstatus_t *most = NULL, *cur = NULL;
|
|
|
|
int most_n = 0, cur_n = 0;
|
|
|
|
time_t most_published = 0;
|
|
|
|
|
2008-08-05 20:54:23 +02:00
|
|
|
/* _compare_vote_rs() sorts the items by identity digest (all the same),
|
|
|
|
* then by SD digest. That way, if we have a tie that the published_on
|
|
|
|
* date cannot tie, we use the descriptor with the smaller digest.
|
|
|
|
*/
|
2007-06-17 17:10:43 +02:00
|
|
|
smartlist_sort(votes, _compare_vote_rs);
|
2007-06-04 21:19:01 +02:00
|
|
|
SMARTLIST_FOREACH(votes, vote_routerstatus_t *, rs,
|
|
|
|
{
|
2007-06-17 17:10:43 +02:00
|
|
|
if (cur && !compare_vote_rs(cur, rs)) {
|
2007-06-04 21:19:01 +02:00
|
|
|
++cur_n;
|
|
|
|
} else {
|
|
|
|
if (cur_n > most_n ||
|
2007-06-05 00:29:00 +02:00
|
|
|
(cur && cur_n == most_n &&
|
|
|
|
cur->status.published_on > most_published)) {
|
2007-06-04 21:19:01 +02:00
|
|
|
most = cur;
|
|
|
|
most_n = cur_n;
|
|
|
|
most_published = cur->status.published_on;
|
|
|
|
}
|
|
|
|
cur_n = 1;
|
|
|
|
cur = rs;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
if (cur_n > most_n ||
|
|
|
|
(cur && cur_n == most_n && cur->status.published_on > most_published)) {
|
|
|
|
most = cur;
|
|
|
|
most_n = cur_n;
|
|
|
|
most_published = cur->status.published_on;
|
|
|
|
}
|
|
|
|
|
|
|
|
tor_assert(most);
|
2009-08-24 18:51:33 +02:00
|
|
|
|
|
|
|
if (consensus_method >= MIN_METHOD_FOR_MICRODESC &&
|
|
|
|
microdesc_digest256_out) {
|
|
|
|
smartlist_t *digests = smartlist_create();
|
|
|
|
const char *best_microdesc_digest;
|
2009-10-13 23:06:01 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(votes, vote_routerstatus_t *, rs) {
|
2009-08-24 18:51:33 +02:00
|
|
|
char d[DIGEST256_LEN];
|
|
|
|
if (compare_vote_rs(rs, most))
|
|
|
|
continue;
|
2009-10-15 22:06:00 +02:00
|
|
|
if (!vote_routerstatus_find_microdesc_hash(d, rs, consensus_method,
|
|
|
|
DIGEST_SHA256))
|
2009-08-24 18:51:33 +02:00
|
|
|
smartlist_add(digests, tor_memdup(d, sizeof(d)));
|
2009-10-13 23:06:01 +02:00
|
|
|
} SMARTLIST_FOREACH_END(rs);
|
2009-08-24 18:51:33 +02:00
|
|
|
smartlist_sort_digests256(digests);
|
|
|
|
best_microdesc_digest = smartlist_get_most_frequent_digest256(digests);
|
|
|
|
if (best_microdesc_digest)
|
|
|
|
memcpy(microdesc_digest256_out, best_microdesc_digest, DIGEST256_LEN);
|
|
|
|
SMARTLIST_FOREACH(digests, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(digests);
|
|
|
|
}
|
|
|
|
|
2007-06-04 21:19:01 +02:00
|
|
|
return most;
|
|
|
|
}
|
|
|
|
|
2009-10-15 22:06:00 +02:00
|
|
|
/** Given a list of strings in <b>lst</b>, set the <b>len_out</b>-byte digest
|
|
|
|
* at <b>digest_out</b> to the hash of the concatenation of those strings,
|
|
|
|
* computed with the algorithm <b>alg</b>. */
|
2007-06-04 21:54:02 +02:00
|
|
|
static void
|
2009-09-23 09:02:32 +02:00
|
|
|
hash_list_members(char *digest_out, size_t len_out,
|
|
|
|
smartlist_t *lst, digest_algorithm_t alg)
|
2007-06-04 21:54:02 +02:00
|
|
|
{
|
2009-09-23 09:02:32 +02:00
|
|
|
crypto_digest_env_t *d;
|
|
|
|
if (alg == DIGEST_SHA1)
|
|
|
|
d = crypto_new_digest_env();
|
|
|
|
else
|
|
|
|
d = crypto_new_digest256_env(alg);
|
2007-06-04 21:54:02 +02:00
|
|
|
SMARTLIST_FOREACH(lst, const char *, cp,
|
|
|
|
crypto_digest_add_bytes(d, cp, strlen(cp)));
|
2009-09-23 09:02:32 +02:00
|
|
|
crypto_digest_get_digest(d, digest_out, len_out);
|
2007-06-04 21:54:02 +02:00
|
|
|
crypto_free_digest_env(d);
|
|
|
|
}
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2008-02-06 17:58:05 +01:00
|
|
|
/** Sorting helper: compare two strings based on their values as base-ten
|
|
|
|
* positive integers. (Non-integers are treated as prior to all integers, and
|
|
|
|
* compared lexically.) */
|
2007-10-19 20:56:30 +02:00
|
|
|
static int
|
|
|
|
_cmp_int_strings(const void **_a, const void **_b)
|
|
|
|
{
|
|
|
|
const char *a = *_a, *b = *_b;
|
|
|
|
int ai = (int)tor_parse_long(a, 10, 1, INT_MAX, NULL, NULL);
|
|
|
|
int bi = (int)tor_parse_long(b, 10, 1, INT_MAX, NULL, NULL);
|
2008-02-06 17:58:05 +01:00
|
|
|
if (ai<bi) {
|
2007-10-19 20:56:30 +02:00
|
|
|
return -1;
|
2008-02-06 17:58:05 +01:00
|
|
|
} else if (ai==bi) {
|
|
|
|
if (ai == 0) /* Parsing failed. */
|
|
|
|
return strcmp(a, b);
|
2007-10-19 20:56:30 +02:00
|
|
|
return 0;
|
2008-02-06 17:58:05 +01:00
|
|
|
} else {
|
2007-10-19 20:56:30 +02:00
|
|
|
return 1;
|
2008-02-06 17:58:05 +01:00
|
|
|
}
|
2007-10-19 20:56:30 +02:00
|
|
|
}
|
|
|
|
|
2008-02-06 17:58:05 +01:00
|
|
|
/** Given a list of networkstatus_t votes, determine and return the number of
|
|
|
|
* the highest consensus method that is supported by 2/3 of the voters. */
|
2007-10-19 20:56:30 +02:00
|
|
|
static int
|
|
|
|
compute_consensus_method(smartlist_t *votes)
|
|
|
|
{
|
|
|
|
smartlist_t *all_methods = smartlist_create();
|
|
|
|
smartlist_t *acceptable_methods = smartlist_create();
|
|
|
|
smartlist_t *tmp = smartlist_create();
|
|
|
|
int min = (smartlist_len(votes) * 2) / 3;
|
|
|
|
int n_ok;
|
|
|
|
int result;
|
2008-02-05 22:39:29 +01:00
|
|
|
SMARTLIST_FOREACH(votes, networkstatus_t *, vote,
|
2007-10-19 20:56:30 +02:00
|
|
|
{
|
|
|
|
tor_assert(vote->supported_methods);
|
|
|
|
smartlist_add_all(tmp, vote->supported_methods);
|
|
|
|
smartlist_sort(tmp, _cmp_int_strings);
|
|
|
|
smartlist_uniq(tmp, _cmp_int_strings, NULL);
|
|
|
|
smartlist_add_all(all_methods, tmp);
|
|
|
|
smartlist_clear(tmp);
|
|
|
|
});
|
|
|
|
|
|
|
|
smartlist_sort(all_methods, _cmp_int_strings);
|
|
|
|
get_frequent_members(acceptable_methods, all_methods, min);
|
|
|
|
n_ok = smartlist_len(acceptable_methods);
|
|
|
|
if (n_ok) {
|
|
|
|
const char *best = smartlist_get(acceptable_methods, n_ok-1);
|
|
|
|
result = (int)tor_parse_long(best, 10, 1, INT_MAX, NULL, NULL);
|
|
|
|
} else {
|
|
|
|
result = 1;
|
|
|
|
}
|
|
|
|
smartlist_free(tmp);
|
|
|
|
smartlist_free(all_methods);
|
|
|
|
smartlist_free(acceptable_methods);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2008-02-06 17:58:05 +01:00
|
|
|
/** Return true iff <b>method</b> is a consensus method that we support. */
|
2007-10-19 20:56:30 +02:00
|
|
|
static int
|
|
|
|
consensus_method_is_supported(int method)
|
|
|
|
{
|
2009-08-20 04:07:32 +02:00
|
|
|
return (method >= 1) && (method <= MAX_SUPPORTED_CONSENSUS_METHOD);
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Return a newly allocated string holding the numbers between low and high
|
|
|
|
* (inclusive) that are supported consensus methods. */
|
|
|
|
static char *
|
2009-08-20 02:06:59 +02:00
|
|
|
make_consensus_method_list(int low, int high, const char *separator)
|
2009-08-20 04:07:32 +02:00
|
|
|
{
|
|
|
|
char *list;
|
|
|
|
|
|
|
|
char b[32];
|
|
|
|
int i;
|
|
|
|
smartlist_t *lst;
|
|
|
|
lst = smartlist_create();
|
|
|
|
for (i = low; i <= high; ++i) {
|
|
|
|
if (!consensus_method_is_supported(i))
|
|
|
|
continue;
|
|
|
|
tor_snprintf(b, sizeof(b), "%d", i);
|
|
|
|
smartlist_add(lst, tor_strdup(b));
|
|
|
|
}
|
2009-08-20 02:06:59 +02:00
|
|
|
list = smartlist_join_strings(lst, separator, 0, NULL);
|
2009-08-20 04:07:32 +02:00
|
|
|
tor_assert(list);
|
|
|
|
SMARTLIST_FOREACH(lst, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(lst);
|
|
|
|
return list;
|
2007-10-19 20:56:30 +02:00
|
|
|
}
|
|
|
|
|
2008-09-05 22:04:27 +02:00
|
|
|
/** Helper: given <b>lst</b>, a list of version strings such that every
|
2009-05-27 23:55:51 +02:00
|
|
|
* version appears once for every versioning voter who recommends it, return a
|
2008-09-05 22:04:27 +02:00
|
|
|
* newly allocated string holding the resulting client-versions or
|
|
|
|
* server-versions list. May change contents of <b>lst</b> */
|
|
|
|
static char *
|
|
|
|
compute_consensus_versions_list(smartlist_t *lst, int n_versioning)
|
|
|
|
{
|
|
|
|
int min = n_versioning / 2;
|
|
|
|
smartlist_t *good = smartlist_create();
|
|
|
|
char *result;
|
|
|
|
sort_version_list(lst, 0);
|
|
|
|
get_frequent_members(good, lst, min);
|
|
|
|
result = smartlist_join_strings(good, ",", 0, NULL);
|
|
|
|
smartlist_free(good);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2009-09-15 04:15:57 +02:00
|
|
|
/** Helper: given a list of valid networkstatus_t, return a new string
|
|
|
|
* containing the contents of the consensus network parameter set.
|
|
|
|
*/
|
|
|
|
/* private */ char *
|
|
|
|
dirvote_compute_params(smartlist_t *votes)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
int32_t *vals;
|
|
|
|
|
|
|
|
int cur_param_len;
|
|
|
|
const char *cur_param;
|
|
|
|
const char *eq;
|
|
|
|
char *result;
|
|
|
|
|
|
|
|
const int n_votes = smartlist_len(votes);
|
|
|
|
smartlist_t *output;
|
|
|
|
smartlist_t *param_list = smartlist_create();
|
|
|
|
|
|
|
|
/* We require that the parameter lists in the votes are well-formed: that
|
|
|
|
is, that their keywords are unique and sorted, and that their values are
|
|
|
|
between INT32_MIN and INT32_MAX inclusive. This should be guaranteed by
|
|
|
|
the parsing code. */
|
|
|
|
|
|
|
|
vals = tor_malloc(sizeof(int)*n_votes);
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH_BEGIN(votes, networkstatus_t *, v) {
|
|
|
|
if (!v->net_params)
|
|
|
|
continue;
|
|
|
|
smartlist_add_all(param_list, v->net_params);
|
|
|
|
} SMARTLIST_FOREACH_END(v);
|
|
|
|
|
|
|
|
if (smartlist_len(param_list) == 0) {
|
|
|
|
tor_free(vals);
|
|
|
|
smartlist_free(param_list);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
smartlist_sort_strings(param_list);
|
|
|
|
i = 0;
|
|
|
|
cur_param = smartlist_get(param_list, 0);
|
|
|
|
eq = strchr(cur_param, '=');
|
|
|
|
tor_assert(eq);
|
2009-09-15 10:33:58 +02:00
|
|
|
cur_param_len = (int)(eq+1 - cur_param);
|
2009-09-15 04:15:57 +02:00
|
|
|
|
|
|
|
output = smartlist_create();
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH_BEGIN(param_list, const char *, param) {
|
|
|
|
const char *next_param;
|
|
|
|
int ok=0;
|
|
|
|
eq = strchr(param, '=');
|
|
|
|
tor_assert(i<n_votes);
|
|
|
|
vals[i++] = (int32_t)
|
|
|
|
tor_parse_long(eq+1, 10, INT32_MIN, INT32_MAX, &ok, NULL);
|
|
|
|
tor_assert(ok);
|
|
|
|
|
|
|
|
if (param_sl_idx+1 == smartlist_len(param_list))
|
|
|
|
next_param = NULL;
|
|
|
|
else
|
|
|
|
next_param = smartlist_get(param_list, param_sl_idx+1);
|
|
|
|
if (!next_param || strncmp(next_param, param, cur_param_len)) {
|
|
|
|
/* We've reached the end of a series. */
|
|
|
|
int32_t median = median_int32(vals, i);
|
|
|
|
char *out_string = tor_malloc(64+cur_param_len);
|
|
|
|
memcpy(out_string, param, cur_param_len);
|
|
|
|
tor_snprintf(out_string+cur_param_len,64, "%ld", (long)median);
|
|
|
|
smartlist_add(output, out_string);
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
if (next_param) {
|
|
|
|
eq = strchr(next_param, '=');
|
2009-09-15 10:33:58 +02:00
|
|
|
cur_param_len = (int)(eq+1 - next_param);
|
2009-09-15 04:15:57 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} SMARTLIST_FOREACH_END(param);
|
|
|
|
|
|
|
|
result = smartlist_join_strings(output, " ", 0, NULL);
|
|
|
|
SMARTLIST_FOREACH(output, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(output);
|
|
|
|
smartlist_free(param_list);
|
|
|
|
tor_free(vals);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2010-01-30 02:10:50 +01:00
|
|
|
#define RANGE_CHECK(a,b,c,d,e,f,g,mx) \
|
|
|
|
((a) >= 0 && (a) <= (mx) && (b) >= 0 && (b) <= (mx) && \
|
|
|
|
(c) >= 0 && (c) <= (mx) && (d) >= 0 && (d) <= (mx) && \
|
|
|
|
(e) >= 0 && (e) <= (mx) && (f) >= 0 && (f) <= (mx) && \
|
|
|
|
(g) >= 0 && (g) <= (mx))
|
|
|
|
|
|
|
|
#define CHECK_EQ(a, b, margin) \
|
|
|
|
((a)-(b) >= 0 ? (a)-(b) <= (margin) : (b)-(a) <= (margin))
|
|
|
|
|
|
|
|
typedef enum {
|
|
|
|
BW_WEIGHTS_NO_ERROR = 0,
|
|
|
|
BW_WEIGHTS_RANGE_ERROR = 1,
|
|
|
|
BW_WEIGHTS_SUMG_ERROR = 2,
|
|
|
|
BW_WEIGHTS_SUME_ERROR = 3,
|
|
|
|
BW_WEIGHTS_SUMD_ERROR = 4,
|
|
|
|
BW_WEIGHTS_BALANCE_MID_ERROR = 5,
|
|
|
|
BW_WEIGHTS_BALANCE_EG_ERROR = 6
|
|
|
|
} bw_weights_error_t;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Verify that any weightings satisfy the balanced formulas.
|
|
|
|
*/
|
|
|
|
static bw_weights_error_t
|
|
|
|
networkstatus_check_weights(int64_t Wgg, int64_t Wgd, int64_t Wmg,
|
|
|
|
int64_t Wme, int64_t Wmd, int64_t Wee,
|
|
|
|
int64_t Wed, int64_t scale, int64_t G,
|
|
|
|
int64_t M, int64_t E, int64_t D, int64_t T,
|
|
|
|
int64_t margin, int do_balance) {
|
|
|
|
bw_weights_error_t berr = BW_WEIGHTS_NO_ERROR;
|
|
|
|
|
|
|
|
// Wed + Wmd + Wgd == 1
|
|
|
|
if (!CHECK_EQ(Wed + Wmd + Wgd, scale, margin)) {
|
|
|
|
berr = BW_WEIGHTS_SUMD_ERROR;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wmg + Wgg == 1
|
|
|
|
if (!CHECK_EQ(Wmg + Wgg, scale, margin)) {
|
|
|
|
berr = BW_WEIGHTS_SUMG_ERROR;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wme + Wee == 1
|
|
|
|
if (!CHECK_EQ(Wme + Wee, scale, margin)) {
|
|
|
|
berr = BW_WEIGHTS_SUME_ERROR;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Verify weights within range 0->1
|
|
|
|
if (!RANGE_CHECK(Wgg, Wgd, Wmg, Wme, Wmd, Wed, Wee, scale)) {
|
|
|
|
berr = BW_WEIGHTS_RANGE_ERROR;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (do_balance) {
|
|
|
|
// Wgg*G + Wgd*D == Wee*E + Wed*D, already scaled
|
|
|
|
if (!CHECK_EQ(Wgg*G + Wgd*D, Wee*E + Wed*D, (margin*T)/3)) {
|
|
|
|
berr = BW_WEIGHTS_BALANCE_EG_ERROR;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Wgg*G + Wgd*D == M*scale + Wmd*D + Wme*E + Wmg*G, already scaled
|
|
|
|
if (!CHECK_EQ(Wgg*G + Wgd*D, M*scale + Wmd*D + Wme*E + Wmg*G,
|
|
|
|
(margin*T)/3)) {
|
|
|
|
berr = BW_WEIGHTS_BALANCE_MID_ERROR;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
|
|
|
if (berr) {
|
|
|
|
log_info(LD_DIR,
|
|
|
|
"Bw weight mismatch %d. G="I64_FORMAT" M="I64_FORMAT
|
|
|
|
" E="I64_FORMAT" D="I64_FORMAT" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
berr,
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
return berr;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
networkstatus_compute_bw_weights_v9(smartlist_t *chunks, int64_t G, int64_t M,
|
|
|
|
int64_t E, int64_t D, int64_t T,
|
|
|
|
int64_t weight_scale)
|
|
|
|
{
|
|
|
|
int64_t Wgg = -1, Wgd = -1;
|
|
|
|
int64_t Wmg = -1, Wme = -1, Wmd = -1;
|
|
|
|
int64_t Wed = -1, Wee = -1;
|
|
|
|
const char *casename;
|
|
|
|
char buf[512];
|
|
|
|
int r;
|
|
|
|
|
2010-02-24 20:17:31 +01:00
|
|
|
if (G <= 0 || M <= 0 || E <= 0 || D <= 0) {
|
|
|
|
log_warn(LD_DIR, "Consensus with empty bandwidth: "
|
|
|
|
"G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT
|
|
|
|
" D="I64_FORMAT" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-02-24 20:17:31 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2010-01-30 02:10:50 +01:00
|
|
|
/*
|
|
|
|
* Computed from cases in 3.4.3 of dir-spec.txt
|
|
|
|
*
|
|
|
|
* 1. Neither are scarce
|
|
|
|
* 2. Both Guard and Exit are scarce
|
|
|
|
* a. R+D <= S
|
|
|
|
* b. R+D > S
|
|
|
|
* 3. One of Guard or Exit is scarce
|
|
|
|
* a. S+D < T/3
|
|
|
|
* b. S+D >= T/3
|
|
|
|
*/
|
|
|
|
if (3*E >= T && 3*G >= T) { // E >= T/3 && G >= T/3
|
|
|
|
bw_weights_error_t berr = 0;
|
|
|
|
/* Case 1: Neither are scarce.
|
|
|
|
*
|
|
|
|
* Attempt to ensure that we have a large amount of exit bandwidth
|
|
|
|
* in the middle position.
|
|
|
|
*/
|
|
|
|
casename = "Case 1 (Wme*E = Wmd*D)";
|
|
|
|
Wgg = (weight_scale*(D+E+G+M))/(3*G);
|
|
|
|
if (D==0) Wmd = 0;
|
|
|
|
else Wmd = (weight_scale*(2*D + 2*E - G - M))/(6*D);
|
|
|
|
Wme = (weight_scale*(2*D + 2*E - G - M))/(6*E);
|
|
|
|
Wee = (weight_scale*(-2*D + 4*E + G + M))/(6*E);
|
|
|
|
Wgd = 0;
|
|
|
|
Wmg = weight_scale - Wgg;
|
|
|
|
Wed = weight_scale - Wmd;
|
|
|
|
|
|
|
|
berr = networkstatus_check_weights(Wgg, Wgd, Wmg, Wme, Wmd, Wee, Wed,
|
|
|
|
weight_scale, G, M, E, D, T, 10, 1);
|
|
|
|
|
|
|
|
if (berr) {
|
|
|
|
log_warn(LD_DIR, "Bw Weights error %d for case %s. "
|
|
|
|
"G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT
|
|
|
|
" D="I64_FORMAT" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
berr, casename,
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
}
|
|
|
|
} else if (3*E < T && 3*G < T) { // E < T/3 && G < T/3
|
|
|
|
int64_t R = MIN(E, G);
|
|
|
|
int64_t S = MAX(E, G);
|
|
|
|
/*
|
|
|
|
* Case 2: Both Guards and Exits are scarce
|
|
|
|
* Balance D between E and G, depending upon
|
|
|
|
* D capacity and scarcity.
|
|
|
|
*/
|
|
|
|
if (R+D < S) { // Subcase a
|
|
|
|
Wgg = weight_scale;
|
|
|
|
Wee = weight_scale;
|
|
|
|
Wmg = 0;
|
|
|
|
Wme = 0;
|
|
|
|
Wmd = 0;
|
|
|
|
if (E < G) {
|
|
|
|
casename = "Case 2a (E scarce)";
|
|
|
|
Wed = weight_scale;
|
|
|
|
Wgd = 0;
|
2010-02-25 23:00:14 +01:00
|
|
|
} else { /* E >= G */
|
2010-01-30 02:10:50 +01:00
|
|
|
casename = "Case 2a (G scarce)";
|
|
|
|
Wed = 0;
|
|
|
|
Wgd = weight_scale;
|
|
|
|
}
|
|
|
|
} else { // Subcase b: R+D > S
|
|
|
|
bw_weights_error_t berr = 0;
|
|
|
|
casename = "Case 2b (Wme*E == Wmd*D)";
|
|
|
|
if (D != 0) {
|
|
|
|
Wgg = weight_scale;
|
|
|
|
Wgd = (weight_scale*(D + E - 2*G + M))/(3*D); // T/3 >= G (Ok)
|
|
|
|
Wmd = (weight_scale*(D + E + G - 2*M))/(6*D); // T/3 >= M
|
|
|
|
Wme = (weight_scale*(D + E + G - 2*M))/(6*E);
|
|
|
|
Wee = (weight_scale*(-D + 5*E - G + 2*M))/(6*E); // 2E+M >= T/3
|
|
|
|
Wmg = 0;
|
|
|
|
Wed = weight_scale - Wgd - Wmd;
|
|
|
|
|
|
|
|
berr = networkstatus_check_weights(Wgg, Wgd, Wmg, Wme, Wmd, Wee, Wed,
|
|
|
|
weight_scale, G, M, E, D, T, 10, 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (D == 0 || berr) { // Can happen if M > T/3
|
|
|
|
casename = "Case 2b (E=G)";
|
|
|
|
Wgg = weight_scale;
|
|
|
|
Wee = weight_scale;
|
|
|
|
Wmg = 0;
|
|
|
|
Wme = 0;
|
|
|
|
Wmd = 0;
|
|
|
|
if (D == 0) Wgd = 0;
|
|
|
|
else Wgd = (weight_scale*(D+E-G))/(2*D);
|
|
|
|
Wed = weight_scale - Wgd;
|
|
|
|
berr = networkstatus_check_weights(Wgg, Wgd, Wmg, Wme, Wmd, Wee,
|
|
|
|
Wed, weight_scale, G, M, E, D, T, 10, 1);
|
|
|
|
}
|
|
|
|
if (berr != BW_WEIGHTS_NO_ERROR &&
|
|
|
|
berr != BW_WEIGHTS_BALANCE_MID_ERROR) {
|
|
|
|
log_warn(LD_DIR, "Bw Weights error %d for case %s. "
|
|
|
|
"G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT
|
|
|
|
" D="I64_FORMAT" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
berr, casename,
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
} else { // if (E < T/3 || G < T/3) {
|
|
|
|
int64_t S = MIN(E, G);
|
|
|
|
// Case 3: Exactly one of Guard or Exit is scarce
|
|
|
|
if (!(3*E < T || 3*G < T) || !(3*G >= T || 3*E >= T)) {
|
|
|
|
log_warn(LD_BUG,
|
|
|
|
"Bw-Weights Case 3 but with G="I64_FORMAT" M="
|
|
|
|
I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
if (3*(S+D) < T) { // Subcase a: S+D < T/3
|
|
|
|
if (G < E) {
|
|
|
|
casename = "Case 3a (G scarce)";
|
|
|
|
Wgg = Wgd = weight_scale;
|
|
|
|
Wmd = Wed = Wmg = 0;
|
|
|
|
// Minor subcase, if E is more scarce than M,
|
|
|
|
// keep its bandwidth in place.
|
|
|
|
if (E < M) Wme = 0;
|
|
|
|
else Wme = (weight_scale*(E-M))/(2*E);
|
|
|
|
Wee = weight_scale-Wme;
|
|
|
|
} else { // G >= E
|
|
|
|
casename = "Case 3a (E scarce)";
|
|
|
|
Wee = Wed = weight_scale;
|
|
|
|
Wmd = Wgd = Wme = 0;
|
|
|
|
// Minor subcase, if G is more scarce than M,
|
|
|
|
// keep its bandwidth in place.
|
|
|
|
if (G < M) Wmg = 0;
|
|
|
|
else Wmg = (weight_scale*(G-M))/(2*G);
|
|
|
|
Wgg = weight_scale-Wmg;
|
|
|
|
}
|
|
|
|
} else { // Subcase b: S+D >= T/3
|
|
|
|
bw_weights_error_t berr = 0;
|
|
|
|
// D != 0 because S+D >= T/3
|
|
|
|
if (G < E) {
|
|
|
|
casename = "Case 3b (G scarce, Wme*E == Wmd*D)";
|
|
|
|
Wgd = (weight_scale*(D + E - 2*G + M))/(3*D);
|
|
|
|
Wmd = (weight_scale*(D + E + G - 2*M))/(6*D);
|
|
|
|
Wme = (weight_scale*(D + E + G - 2*M))/(6*E);
|
|
|
|
Wee = (weight_scale*(-D + 5*E - G + 2*M))/(6*E);
|
|
|
|
Wgg = weight_scale;
|
|
|
|
Wmg = 0;
|
|
|
|
Wed = weight_scale - Wgd - Wmd;
|
|
|
|
|
|
|
|
berr = networkstatus_check_weights(Wgg, Wgd, Wmg, Wme, Wmd, Wee,
|
|
|
|
Wed, weight_scale, G, M, E, D, T, 10, 1);
|
|
|
|
} else { // G >= E
|
|
|
|
casename = "Case 3b (E scarce, Wme*E == Wmd*D)";
|
|
|
|
Wgg = (weight_scale*(D + E + G + M))/(3*G);
|
|
|
|
Wmd = (weight_scale*(2*D + 2*E - G - M))/(6*D);
|
|
|
|
Wme = (weight_scale*(2*D + 2*E - G - M))/(6*E);
|
|
|
|
Wee = (weight_scale*(-2*D + 4*E + G + M))/(6*E);
|
|
|
|
Wgd = 0;
|
|
|
|
Wmg = weight_scale - Wgg;
|
|
|
|
Wed = weight_scale - Wmd;
|
|
|
|
|
|
|
|
berr = networkstatus_check_weights(Wgg, Wgd, Wmg, Wme, Wmd, Wee,
|
|
|
|
Wed, weight_scale, G, M, E, D, T, 10, 1);
|
|
|
|
}
|
|
|
|
if (berr) {
|
|
|
|
log_warn(LD_DIR, "Bw Weights error %d for case %s. "
|
|
|
|
"G="I64_FORMAT" M="I64_FORMAT
|
|
|
|
" E="I64_FORMAT" D="I64_FORMAT" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
berr, casename,
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-02-25 20:42:45 +01:00
|
|
|
/* We cast down the weights to 32 bit ints on the assumption that
|
|
|
|
* weight_scale is ~= 10000. We need to ensure a rogue authority
|
|
|
|
* doesn't break this assumption to rig our weights */
|
|
|
|
tor_assert(0 < weight_scale && weight_scale < INT32_MAX);
|
|
|
|
|
2010-01-30 02:10:50 +01:00
|
|
|
if (Wgg < 0 || Wgg > weight_scale) {
|
|
|
|
log_warn(LD_DIR, "Bw %s: Wgg="I64_FORMAT"! G="I64_FORMAT
|
|
|
|
" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
|
|
|
|
" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
casename, I64_PRINTF_ARG(Wgg),
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
|
|
|
|
2010-01-30 02:10:50 +01:00
|
|
|
Wgg = MAX(MIN(Wgg, weight_scale), 0);
|
|
|
|
}
|
|
|
|
if (Wgd < 0 || Wgd > weight_scale) {
|
|
|
|
log_warn(LD_DIR, "Bw %s: Wgd="I64_FORMAT"! G="I64_FORMAT
|
|
|
|
" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
|
|
|
|
" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
casename, I64_PRINTF_ARG(Wgd),
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
Wgd = MAX(MIN(Wgd, weight_scale), 0);
|
|
|
|
}
|
|
|
|
if (Wmg < 0 || Wmg > weight_scale) {
|
|
|
|
log_warn(LD_DIR, "Bw %s: Wmg="I64_FORMAT"! G="I64_FORMAT
|
|
|
|
" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
|
|
|
|
" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
casename, I64_PRINTF_ARG(Wmg),
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
Wmg = MAX(MIN(Wmg, weight_scale), 0);
|
|
|
|
}
|
|
|
|
if (Wme < 0 || Wme > weight_scale) {
|
|
|
|
log_warn(LD_DIR, "Bw %s: Wme="I64_FORMAT"! G="I64_FORMAT
|
|
|
|
" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
|
|
|
|
" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
casename, I64_PRINTF_ARG(Wme),
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
Wme = MAX(MIN(Wme, weight_scale), 0);
|
|
|
|
}
|
|
|
|
if (Wmd < 0 || Wmd > weight_scale) {
|
|
|
|
log_warn(LD_DIR, "Bw %s: Wmd="I64_FORMAT"! G="I64_FORMAT
|
|
|
|
" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
|
|
|
|
" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
casename, I64_PRINTF_ARG(Wmd),
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
Wmd = MAX(MIN(Wmd, weight_scale), 0);
|
|
|
|
}
|
|
|
|
if (Wee < 0 || Wee > weight_scale) {
|
|
|
|
log_warn(LD_DIR, "Bw %s: Wee="I64_FORMAT"! G="I64_FORMAT
|
|
|
|
" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
|
|
|
|
" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
casename, I64_PRINTF_ARG(Wee),
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
Wee = MAX(MIN(Wee, weight_scale), 0);
|
|
|
|
}
|
|
|
|
if (Wed < 0 || Wed > weight_scale) {
|
|
|
|
log_warn(LD_DIR, "Bw %s: Wed="I64_FORMAT"! G="I64_FORMAT
|
|
|
|
" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
|
|
|
|
" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
casename, I64_PRINTF_ARG(Wed),
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
Wed = MAX(MIN(Wed, weight_scale), 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
// Add consensus weight keywords
|
|
|
|
smartlist_add(chunks, tor_strdup("bandwidth-weights "));
|
|
|
|
/*
|
|
|
|
* Provide Wgm=Wgg, Wmm=1, Wem=Wee, Weg=Wed. May later determine
|
|
|
|
* that middle nodes need different bandwidth weights for dirport traffic,
|
|
|
|
* or that weird exit policies need special weight, or that bridges
|
|
|
|
* need special weight.
|
|
|
|
*
|
|
|
|
* NOTE: This list is sorted.
|
|
|
|
*/
|
|
|
|
r = tor_snprintf(buf, sizeof(buf),
|
2010-02-25 20:42:45 +01:00
|
|
|
"Wbd=%d Wbe=%d Wbg=%d Wbm=%d "
|
|
|
|
"Wdb=%d "
|
|
|
|
"Web=%d Wed=%d Wee=%d Weg=%d Wem=%d "
|
|
|
|
"Wgb=%d Wgd=%d Wgg=%d Wgm=%d "
|
|
|
|
"Wmb=%d Wmd=%d Wme=%d Wmg=%d Wmm=%d\n",
|
|
|
|
(int)Wmd, (int)Wme, (int)Wmg, (int)weight_scale,
|
|
|
|
(int)weight_scale,
|
|
|
|
(int)weight_scale, (int)Wed, (int)Wee, (int)Wed, (int)Wee,
|
|
|
|
(int)weight_scale, (int)Wgd, (int)Wgg, (int)Wgg,
|
|
|
|
(int)weight_scale, (int)Wmd, (int)Wme, (int)Wmg, (int)weight_scale);
|
2010-01-30 02:10:50 +01:00
|
|
|
if (r<0) {
|
|
|
|
log_warn(LD_BUG,
|
|
|
|
"Not enough space in buffer for bandwidth-weights line.");
|
|
|
|
*buf = '\0';
|
|
|
|
}
|
|
|
|
smartlist_add(chunks, tor_strdup(buf));
|
|
|
|
log_notice(LD_CIRC, "Computed bandwidth weights for %s: "
|
|
|
|
"G="I64_FORMAT" M="I64_FORMAT" E="I64_FORMAT" D="I64_FORMAT
|
|
|
|
" T="I64_FORMAT,
|
2010-02-25 22:22:40 +01:00
|
|
|
casename,
|
|
|
|
I64_PRINTF_ARG(G), I64_PRINTF_ARG(M), I64_PRINTF_ARG(E),
|
|
|
|
I64_PRINTF_ARG(D), I64_PRINTF_ARG(T));
|
2010-01-30 02:10:50 +01:00
|
|
|
}
|
|
|
|
|
2008-02-05 22:39:29 +01:00
|
|
|
/** Given a list of vote networkstatus_t in <b>votes</b>, our public
|
2007-06-17 17:10:43 +02:00
|
|
|
* authority <b>identity_key</b>, our private authority <b>signing_key</b>,
|
|
|
|
* and the number of <b>total_authorities</b> that we believe exist in our
|
|
|
|
* voting quorum, generate the text of a new v3 consensus vote, and return the
|
2007-08-14 04:23:57 +02:00
|
|
|
* value in a newly allocated string.
|
|
|
|
*
|
|
|
|
* Note: this function DOES NOT check whether the votes are from
|
|
|
|
* recognized authorities. (dirvote_add_vote does that.) */
|
2007-06-04 21:19:01 +02:00
|
|
|
char *
|
2007-06-04 21:54:02 +02:00
|
|
|
networkstatus_compute_consensus(smartlist_t *votes,
|
2007-06-17 17:10:23 +02:00
|
|
|
int total_authorities,
|
2007-06-04 21:54:02 +02:00
|
|
|
crypto_pk_env_t *identity_key,
|
2008-05-12 06:22:01 +02:00
|
|
|
crypto_pk_env_t *signing_key,
|
|
|
|
const char *legacy_id_key_digest,
|
2009-08-24 18:51:33 +02:00
|
|
|
crypto_pk_env_t *legacy_signing_key,
|
|
|
|
consensus_flavor_t flavor)
|
2007-06-04 21:19:01 +02:00
|
|
|
{
|
|
|
|
smartlist_t *chunks;
|
2007-06-04 21:54:02 +02:00
|
|
|
char *result = NULL;
|
2007-10-19 20:56:30 +02:00
|
|
|
int consensus_method;
|
2007-06-04 21:19:01 +02:00
|
|
|
time_t valid_after, fresh_until, valid_until;
|
|
|
|
int vote_seconds, dist_seconds;
|
|
|
|
char *client_versions = NULL, *server_versions = NULL;
|
|
|
|
smartlist_t *flags;
|
2009-09-23 09:02:32 +02:00
|
|
|
const char *flavor_name;
|
2010-01-30 02:10:50 +01:00
|
|
|
int64_t G=0, M=0, E=0, D=0, T=0; /* For bandwidth weights */
|
2009-08-24 18:51:33 +02:00
|
|
|
const routerstatus_format_type_t rs_format =
|
|
|
|
flavor == FLAV_NS ? NS_V3_CONSENSUS : NS_V3_CONSENSUS_MICRODESC;
|
2010-01-30 02:10:50 +01:00
|
|
|
char *params = NULL;
|
2009-08-24 18:51:33 +02:00
|
|
|
tor_assert(flavor == FLAV_NS || flavor == FLAV_MICRODESC);
|
2007-06-17 17:10:23 +02:00
|
|
|
tor_assert(total_authorities >= smartlist_len(votes));
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2009-09-23 09:02:32 +02:00
|
|
|
flavor_name = networkstatus_get_flavor_name(flavor);
|
|
|
|
|
2007-06-04 21:19:01 +02:00
|
|
|
if (!smartlist_len(votes)) {
|
|
|
|
log_warn(LD_DIR, "Can't compute a consensus from no votes.");
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
flags = smartlist_create();
|
|
|
|
|
2007-10-19 20:56:30 +02:00
|
|
|
consensus_method = compute_consensus_method(votes);
|
|
|
|
if (consensus_method_is_supported(consensus_method)) {
|
|
|
|
log_info(LD_DIR, "Generating consensus using method %d.",
|
|
|
|
consensus_method);
|
|
|
|
} else {
|
|
|
|
log_warn(LD_DIR, "The other authorities will use consensus method %d, "
|
|
|
|
"which I don't support. Maybe I should upgrade!",
|
|
|
|
consensus_method);
|
|
|
|
consensus_method = 1;
|
|
|
|
}
|
|
|
|
|
2007-06-04 21:19:01 +02:00
|
|
|
/* Compute medians of time-related things, and figure out how many
|
|
|
|
* routers we might need to talk about. */
|
|
|
|
{
|
2007-09-17 20:27:49 +02:00
|
|
|
int n_votes = smartlist_len(votes);
|
|
|
|
time_t *va_times = tor_malloc(n_votes * sizeof(time_t));
|
|
|
|
time_t *fu_times = tor_malloc(n_votes * sizeof(time_t));
|
|
|
|
time_t *vu_times = tor_malloc(n_votes * sizeof(time_t));
|
|
|
|
int *votesec_list = tor_malloc(n_votes * sizeof(int));
|
|
|
|
int *distsec_list = tor_malloc(n_votes * sizeof(int));
|
2007-06-04 21:19:01 +02:00
|
|
|
int n_versioning_clients = 0, n_versioning_servers = 0;
|
|
|
|
smartlist_t *combined_client_versions = smartlist_create();
|
|
|
|
smartlist_t *combined_server_versions = smartlist_create();
|
2008-09-05 22:04:27 +02:00
|
|
|
|
2008-09-10 07:33:49 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(votes, networkstatus_t *, v) {
|
2008-07-24 11:22:27 +02:00
|
|
|
tor_assert(v->type == NS_TYPE_VOTE);
|
2007-09-17 20:27:49 +02:00
|
|
|
va_times[v_sl_idx] = v->valid_after;
|
|
|
|
fu_times[v_sl_idx] = v->fresh_until;
|
|
|
|
vu_times[v_sl_idx] = v->valid_until;
|
|
|
|
votesec_list[v_sl_idx] = v->vote_seconds;
|
|
|
|
distsec_list[v_sl_idx] = v->dist_seconds;
|
2007-06-04 21:19:01 +02:00
|
|
|
if (v->client_versions) {
|
|
|
|
smartlist_t *cv = smartlist_create();
|
|
|
|
++n_versioning_clients;
|
|
|
|
smartlist_split_string(cv, v->client_versions, ",",
|
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
sort_version_list(cv, 1);
|
|
|
|
smartlist_add_all(combined_client_versions, cv);
|
|
|
|
smartlist_free(cv); /* elements get freed later. */
|
|
|
|
}
|
|
|
|
if (v->server_versions) {
|
|
|
|
smartlist_t *sv = smartlist_create();
|
|
|
|
++n_versioning_servers;
|
|
|
|
smartlist_split_string(sv, v->server_versions, ",",
|
|
|
|
SPLIT_SKIP_SPACE|SPLIT_IGNORE_BLANK, 0);
|
|
|
|
sort_version_list(sv, 1);
|
|
|
|
smartlist_add_all(combined_server_versions, sv);
|
|
|
|
smartlist_free(sv); /* elements get freed later. */
|
|
|
|
}
|
2007-06-08 20:41:09 +02:00
|
|
|
SMARTLIST_FOREACH(v->known_flags, const char *, cp,
|
|
|
|
smartlist_add(flags, tor_strdup(cp)));
|
2008-09-10 07:33:49 +02:00
|
|
|
} SMARTLIST_FOREACH_END(v);
|
2007-09-17 20:27:49 +02:00
|
|
|
valid_after = median_time(va_times, n_votes);
|
|
|
|
fresh_until = median_time(fu_times, n_votes);
|
|
|
|
valid_until = median_time(vu_times, n_votes);
|
|
|
|
vote_seconds = median_int(votesec_list, n_votes);
|
|
|
|
dist_seconds = median_int(distsec_list, n_votes);
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2007-08-15 17:38:58 +02:00
|
|
|
tor_assert(valid_after+MIN_VOTE_INTERVAL <= fresh_until);
|
|
|
|
tor_assert(fresh_until+MIN_VOTE_INTERVAL <= valid_until);
|
|
|
|
tor_assert(vote_seconds >= MIN_VOTE_SECONDS);
|
|
|
|
tor_assert(dist_seconds >= MIN_DIST_SECONDS);
|
|
|
|
|
2008-09-05 22:04:27 +02:00
|
|
|
server_versions = compute_consensus_versions_list(combined_server_versions,
|
|
|
|
n_versioning_servers);
|
|
|
|
client_versions = compute_consensus_versions_list(combined_client_versions,
|
|
|
|
n_versioning_clients);
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(combined_server_versions, char *, cp, tor_free(cp));
|
|
|
|
SMARTLIST_FOREACH(combined_client_versions, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(combined_server_versions);
|
|
|
|
smartlist_free(combined_client_versions);
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
smartlist_sort_strings(flags);
|
|
|
|
smartlist_uniq_strings(flags);
|
|
|
|
|
2007-09-17 20:27:49 +02:00
|
|
|
tor_free(va_times);
|
|
|
|
tor_free(fu_times);
|
|
|
|
tor_free(vu_times);
|
|
|
|
tor_free(votesec_list);
|
|
|
|
tor_free(distsec_list);
|
2007-06-04 21:19:01 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
chunks = smartlist_create();
|
|
|
|
|
|
|
|
{
|
2010-03-01 03:46:50 +01:00
|
|
|
char *buf=NULL;
|
2007-06-04 21:19:01 +02:00
|
|
|
char va_buf[ISO_TIME_LEN+1], fu_buf[ISO_TIME_LEN+1],
|
|
|
|
vu_buf[ISO_TIME_LEN+1];
|
|
|
|
char *flaglist;
|
|
|
|
format_iso_time(va_buf, valid_after);
|
|
|
|
format_iso_time(fu_buf, fresh_until);
|
|
|
|
format_iso_time(vu_buf, valid_until);
|
|
|
|
flaglist = smartlist_join_strings(flags, " ", 0, NULL);
|
|
|
|
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf, "network-status-version 3%s%s\n"
|
2009-09-23 09:02:32 +02:00
|
|
|
"vote-status consensus\n",
|
|
|
|
flavor == FLAV_NS ? "" : " ",
|
|
|
|
flavor == FLAV_NS ? "" : flavor_name);
|
|
|
|
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, buf);
|
2007-10-19 20:56:30 +02:00
|
|
|
|
|
|
|
if (consensus_method >= 2) {
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf, "consensus-method %d\n",
|
2007-10-19 20:56:30 +02:00
|
|
|
consensus_method);
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, buf);
|
2007-10-19 20:56:30 +02:00
|
|
|
}
|
|
|
|
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf,
|
2007-06-04 21:19:01 +02:00
|
|
|
"valid-after %s\n"
|
|
|
|
"fresh-until %s\n"
|
|
|
|
"valid-until %s\n"
|
|
|
|
"voting-delay %d %d\n"
|
|
|
|
"client-versions %s\n"
|
|
|
|
"server-versions %s\n"
|
|
|
|
"known-flags %s\n",
|
|
|
|
va_buf, fu_buf, vu_buf,
|
|
|
|
vote_seconds, dist_seconds,
|
|
|
|
client_versions, server_versions, flaglist);
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, buf);
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
tor_free(flaglist);
|
|
|
|
}
|
|
|
|
|
2009-09-15 04:15:57 +02:00
|
|
|
if (consensus_method >= MIN_METHOD_FOR_PARAMS) {
|
2010-01-30 02:10:50 +01:00
|
|
|
params = dirvote_compute_params(votes);
|
2009-09-15 04:15:57 +02:00
|
|
|
if (params) {
|
|
|
|
smartlist_add(chunks, tor_strdup("params "));
|
|
|
|
smartlist_add(chunks, params);
|
|
|
|
smartlist_add(chunks, tor_strdup("\n"));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-04 21:19:01 +02:00
|
|
|
/* Sort the votes. */
|
|
|
|
smartlist_sort(votes, _compare_votes_by_authority_id);
|
|
|
|
/* Add the authority sections. */
|
|
|
|
{
|
2008-05-12 04:14:01 +02:00
|
|
|
smartlist_t *dir_sources = smartlist_create();
|
2009-09-16 23:01:01 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(votes, networkstatus_t *, v) {
|
2008-05-12 04:14:01 +02:00
|
|
|
dir_src_ent_t *e = tor_malloc_zero(sizeof(dir_src_ent_t));
|
|
|
|
e->v = v;
|
|
|
|
e->digest = get_voter(v)->identity_digest;
|
|
|
|
e->is_legacy = 0;
|
|
|
|
smartlist_add(dir_sources, e);
|
|
|
|
if (consensus_method >= 3 &&
|
|
|
|
!tor_digest_is_zero(get_voter(v)->legacy_id_digest)) {
|
|
|
|
dir_src_ent_t *e_legacy = tor_malloc_zero(sizeof(dir_src_ent_t));
|
|
|
|
e_legacy->v = v;
|
|
|
|
e_legacy->digest = get_voter(v)->legacy_id_digest;
|
|
|
|
e_legacy->is_legacy = 1;
|
2008-05-12 06:22:01 +02:00
|
|
|
smartlist_add(dir_sources, e_legacy);
|
2008-05-12 04:14:01 +02:00
|
|
|
}
|
2009-09-16 23:01:01 +02:00
|
|
|
} SMARTLIST_FOREACH_END(v);
|
2008-05-12 04:14:01 +02:00
|
|
|
smartlist_sort(dir_sources, _compare_dir_src_ents_by_authority_id);
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2010-03-01 03:46:50 +01:00
|
|
|
SMARTLIST_FOREACH_BEGIN(dir_sources, const dir_src_ent_t *, e) {
|
2008-05-12 04:14:01 +02:00
|
|
|
struct in_addr in;
|
|
|
|
char ip[INET_NTOA_BUF_LEN];
|
|
|
|
char fingerprint[HEX_DIGEST_LEN+1];
|
|
|
|
char votedigest[HEX_DIGEST_LEN+1];
|
|
|
|
networkstatus_t *v = e->v;
|
|
|
|
networkstatus_voter_info_t *voter = get_voter(v);
|
2010-03-01 03:46:50 +01:00
|
|
|
char *buf = NULL;
|
2008-05-12 04:14:01 +02:00
|
|
|
|
|
|
|
if (e->is_legacy)
|
|
|
|
tor_assert(consensus_method >= 2);
|
|
|
|
|
|
|
|
in.s_addr = htonl(voter->addr);
|
|
|
|
tor_inet_ntoa(&in, ip, sizeof(ip));
|
|
|
|
base16_encode(fingerprint, sizeof(fingerprint), e->digest, DIGEST_LEN);
|
|
|
|
base16_encode(votedigest, sizeof(votedigest), voter->vote_digest,
|
|
|
|
DIGEST_LEN);
|
|
|
|
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf,
|
2008-05-12 04:14:01 +02:00
|
|
|
"dir-source %s%s %s %s %s %d %d\n",
|
|
|
|
voter->nickname, e->is_legacy ? "-legacy" : "",
|
|
|
|
fingerprint, voter->address, ip,
|
|
|
|
voter->dir_port,
|
|
|
|
voter->or_port);
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, buf);
|
2008-05-12 04:14:01 +02:00
|
|
|
if (! e->is_legacy) {
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf,
|
2008-05-12 04:14:01 +02:00
|
|
|
"contact %s\n"
|
|
|
|
"vote-digest %s\n",
|
|
|
|
voter->contact,
|
|
|
|
votedigest);
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, buf);
|
2008-05-12 04:14:01 +02:00
|
|
|
}
|
2010-03-01 03:46:50 +01:00
|
|
|
} SMARTLIST_FOREACH_END(e);
|
2008-05-12 04:14:01 +02:00
|
|
|
SMARTLIST_FOREACH(dir_sources, dir_src_ent_t *, e, tor_free(e));
|
|
|
|
smartlist_free(dir_sources);
|
|
|
|
}
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
/* Add the actual router entries. */
|
|
|
|
{
|
2007-08-14 04:23:57 +02:00
|
|
|
int *index; /* index[j] is the current index into votes[j]. */
|
|
|
|
int *size; /* size[j] is the number of routerstatuses in votes[j]. */
|
|
|
|
int *flag_counts; /* The number of voters that list flag[j] for the
|
|
|
|
* currently considered router. */
|
2007-06-04 21:19:01 +02:00
|
|
|
int i;
|
|
|
|
smartlist_t *matching_descs = smartlist_create();
|
|
|
|
smartlist_t *chosen_flags = smartlist_create();
|
|
|
|
smartlist_t *versions = smartlist_create();
|
2008-08-15 01:01:31 +02:00
|
|
|
smartlist_t *exitsummaries = smartlist_create();
|
2008-08-15 01:00:57 +02:00
|
|
|
uint32_t *bandwidths = tor_malloc(sizeof(uint32_t) * smartlist_len(votes));
|
2009-07-31 06:33:53 +02:00
|
|
|
uint32_t *measured_bws = tor_malloc(sizeof(uint32_t) *
|
|
|
|
smartlist_len(votes));
|
2008-08-15 01:00:57 +02:00
|
|
|
int num_bandwidths;
|
2009-07-31 06:33:53 +02:00
|
|
|
int num_mbws;
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
int *n_voter_flags; /* n_voter_flags[j] is the number of flags that
|
|
|
|
* votes[j] knows about. */
|
|
|
|
int *n_flag_voters; /* n_flag_voters[f] is the number of votes that care
|
|
|
|
* about flags[f]. */
|
|
|
|
int **flag_map; /* flag_map[j][b] is an index f such that flag_map[f]
|
|
|
|
* is the same flag as votes[j]->known_flags[b]. */
|
2007-08-14 04:23:57 +02:00
|
|
|
int *named_flag; /* Index of the flag "Named" for votes[j] */
|
2007-10-19 20:56:30 +02:00
|
|
|
int *unnamed_flag; /* Index of the flag "Unnamed" for votes[j] */
|
2007-10-19 22:48:46 +02:00
|
|
|
int chosen_named_idx, chosen_unnamed_idx;
|
|
|
|
|
|
|
|
strmap_t *name_to_id_map = strmap_new();
|
|
|
|
char conflict[DIGEST_LEN];
|
|
|
|
char unknown[DIGEST_LEN];
|
|
|
|
memset(conflict, 0, sizeof(conflict));
|
|
|
|
memset(unknown, 0xff, sizeof(conflict));
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
index = tor_malloc_zero(sizeof(int)*smartlist_len(votes));
|
|
|
|
size = tor_malloc_zero(sizeof(int)*smartlist_len(votes));
|
|
|
|
n_voter_flags = tor_malloc_zero(sizeof(int) * smartlist_len(votes));
|
|
|
|
n_flag_voters = tor_malloc_zero(sizeof(int) * smartlist_len(flags));
|
|
|
|
flag_map = tor_malloc_zero(sizeof(int*) * smartlist_len(votes));
|
2008-04-17 22:23:13 +02:00
|
|
|
named_flag = tor_malloc_zero(sizeof(int) * smartlist_len(votes));
|
|
|
|
unnamed_flag = tor_malloc_zero(sizeof(int) * smartlist_len(votes));
|
2007-06-04 21:54:02 +02:00
|
|
|
for (i = 0; i < smartlist_len(votes); ++i)
|
2007-10-19 20:56:30 +02:00
|
|
|
unnamed_flag[i] = named_flag[i] = -1;
|
2007-10-19 22:48:46 +02:00
|
|
|
chosen_named_idx = smartlist_string_pos(flags, "Named");
|
|
|
|
chosen_unnamed_idx = smartlist_string_pos(flags, "Unnamed");
|
|
|
|
|
|
|
|
/* Build the flag index. */
|
2008-02-05 22:39:29 +01:00
|
|
|
SMARTLIST_FOREACH(votes, networkstatus_t *, v,
|
2007-06-04 21:19:01 +02:00
|
|
|
{
|
2007-06-13 21:06:23 +02:00
|
|
|
flag_map[v_sl_idx] = tor_malloc_zero(
|
|
|
|
sizeof(int)*smartlist_len(v->known_flags));
|
2007-06-08 20:41:09 +02:00
|
|
|
SMARTLIST_FOREACH(v->known_flags, const char *, fl,
|
|
|
|
{
|
|
|
|
int p = smartlist_string_pos(flags, fl);
|
2007-06-04 21:19:01 +02:00
|
|
|
tor_assert(p >= 0);
|
2007-06-08 20:41:09 +02:00
|
|
|
flag_map[v_sl_idx][fl_sl_idx] = p;
|
2007-06-04 21:19:01 +02:00
|
|
|
++n_flag_voters[p];
|
2007-06-08 20:41:09 +02:00
|
|
|
if (!strcmp(fl, "Named"))
|
|
|
|
named_flag[v_sl_idx] = fl_sl_idx;
|
2007-10-19 22:48:46 +02:00
|
|
|
if (!strcmp(fl, "Unnamed"))
|
2007-10-19 20:56:30 +02:00
|
|
|
unnamed_flag[v_sl_idx] = fl_sl_idx;
|
2007-06-08 20:41:09 +02:00
|
|
|
});
|
|
|
|
n_voter_flags[v_sl_idx] = smartlist_len(v->known_flags);
|
2007-06-04 21:19:01 +02:00
|
|
|
size[v_sl_idx] = smartlist_len(v->routerstatus_list);
|
|
|
|
});
|
|
|
|
|
2007-10-19 22:48:46 +02:00
|
|
|
/* Named and Unnamed get treated specially */
|
|
|
|
if (consensus_method >= 2) {
|
2008-02-05 22:39:29 +01:00
|
|
|
SMARTLIST_FOREACH(votes, networkstatus_t *, v,
|
2007-10-19 22:48:46 +02:00
|
|
|
{
|
|
|
|
uint64_t nf;
|
|
|
|
if (named_flag[v_sl_idx]<0)
|
|
|
|
continue;
|
|
|
|
nf = U64_LITERAL(1) << named_flag[v_sl_idx];
|
|
|
|
SMARTLIST_FOREACH(v->routerstatus_list, vote_routerstatus_t *, rs,
|
|
|
|
{
|
|
|
|
if ((rs->flags & nf) != 0) {
|
|
|
|
const char *d = strmap_get_lc(name_to_id_map, rs->status.nickname);
|
|
|
|
if (!d) {
|
|
|
|
/* We have no name officially mapped to this digest. */
|
|
|
|
strmap_set_lc(name_to_id_map, rs->status.nickname,
|
|
|
|
rs->status.identity_digest);
|
|
|
|
} else if (d != conflict &&
|
|
|
|
memcmp(d, rs->status.identity_digest, DIGEST_LEN)) {
|
|
|
|
/* Authorities disagree about this nickname. */
|
|
|
|
strmap_set_lc(name_to_id_map, rs->status.nickname, conflict);
|
|
|
|
} else {
|
|
|
|
/* It's already a conflict, or it's already this ID. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
2008-02-05 22:39:29 +01:00
|
|
|
SMARTLIST_FOREACH(votes, networkstatus_t *, v,
|
2007-10-19 22:48:46 +02:00
|
|
|
{
|
|
|
|
uint64_t uf;
|
|
|
|
if (unnamed_flag[v_sl_idx]<0)
|
|
|
|
continue;
|
|
|
|
uf = U64_LITERAL(1) << unnamed_flag[v_sl_idx];
|
|
|
|
SMARTLIST_FOREACH(v->routerstatus_list, vote_routerstatus_t *, rs,
|
|
|
|
{
|
|
|
|
if ((rs->flags & uf) != 0) {
|
|
|
|
const char *d = strmap_get_lc(name_to_id_map, rs->status.nickname);
|
|
|
|
if (d == conflict || d == unknown) {
|
|
|
|
/* Leave it alone; we know what it is. */
|
|
|
|
} else if (!d) {
|
|
|
|
/* We have no name officially mapped to this digest. */
|
|
|
|
strmap_set_lc(name_to_id_map, rs->status.nickname, unknown);
|
|
|
|
} else if (!memcmp(d, rs->status.identity_digest, DIGEST_LEN)) {
|
|
|
|
/* Authorities disagree about this nickname. */
|
|
|
|
strmap_set_lc(name_to_id_map, rs->status.nickname, conflict);
|
|
|
|
} else {
|
|
|
|
/* It's mapped to a different name. */
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
|
2007-06-04 21:19:01 +02:00
|
|
|
/* Now go through all the votes */
|
|
|
|
flag_counts = tor_malloc(sizeof(int) * smartlist_len(flags));
|
|
|
|
while (1) {
|
|
|
|
vote_routerstatus_t *rs;
|
|
|
|
routerstatus_t rs_out;
|
|
|
|
const char *lowest_id = NULL;
|
|
|
|
const char *chosen_version;
|
2007-06-04 21:54:02 +02:00
|
|
|
const char *chosen_name = NULL;
|
2008-08-15 01:01:31 +02:00
|
|
|
int exitsummary_disagreement = 0;
|
2008-06-13 23:22:49 +02:00
|
|
|
int is_named = 0, is_unnamed = 0, is_running = 0;
|
2010-01-30 02:10:50 +01:00
|
|
|
int is_guard = 0, is_exit = 0;
|
2007-06-04 21:54:02 +02:00
|
|
|
int naming_conflict = 0;
|
2007-06-04 21:19:01 +02:00
|
|
|
int n_listing = 0;
|
|
|
|
int i;
|
2010-03-01 03:46:50 +01:00
|
|
|
char *buf=NULL;
|
2009-08-24 18:51:33 +02:00
|
|
|
char microdesc_digest[DIGEST256_LEN];
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2007-08-14 04:23:57 +02:00
|
|
|
/* Of the next-to-be-considered digest in each voter, which is first? */
|
2008-02-05 22:39:29 +01:00
|
|
|
SMARTLIST_FOREACH(votes, networkstatus_t *, v, {
|
2007-06-04 21:19:01 +02:00
|
|
|
if (index[v_sl_idx] < size[v_sl_idx]) {
|
|
|
|
rs = smartlist_get(v->routerstatus_list, index[v_sl_idx]);
|
|
|
|
if (!lowest_id ||
|
|
|
|
memcmp(rs->status.identity_digest, lowest_id, DIGEST_LEN) < 0)
|
|
|
|
lowest_id = rs->status.identity_digest;
|
|
|
|
}
|
|
|
|
});
|
|
|
|
if (!lowest_id) /* we're out of routers. */
|
|
|
|
break;
|
|
|
|
|
|
|
|
memset(flag_counts, 0, sizeof(int)*smartlist_len(flags));
|
|
|
|
smartlist_clear(matching_descs);
|
|
|
|
smartlist_clear(chosen_flags);
|
|
|
|
smartlist_clear(versions);
|
2008-08-15 01:00:57 +02:00
|
|
|
num_bandwidths = 0;
|
2009-07-31 06:33:53 +02:00
|
|
|
num_mbws = 0;
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
/* Okay, go through all the entries for this digest. */
|
2008-09-10 07:33:49 +02:00
|
|
|
SMARTLIST_FOREACH_BEGIN(votes, networkstatus_t *, v) {
|
2007-06-04 21:19:01 +02:00
|
|
|
if (index[v_sl_idx] >= size[v_sl_idx])
|
|
|
|
continue; /* out of entries. */
|
|
|
|
rs = smartlist_get(v->routerstatus_list, index[v_sl_idx]);
|
|
|
|
if (memcmp(rs->status.identity_digest, lowest_id, DIGEST_LEN))
|
|
|
|
continue; /* doesn't include this router. */
|
2009-05-27 23:55:51 +02:00
|
|
|
/* At this point, we know that we're looking at a routerstatus with
|
2007-06-04 21:19:01 +02:00
|
|
|
* identity "lowest".
|
|
|
|
*/
|
|
|
|
++index[v_sl_idx];
|
|
|
|
++n_listing;
|
|
|
|
|
|
|
|
smartlist_add(matching_descs, rs);
|
|
|
|
if (rs->version && rs->version[0])
|
|
|
|
smartlist_add(versions, rs->version);
|
|
|
|
|
|
|
|
/* Tally up all the flags. */
|
|
|
|
for (i = 0; i < n_voter_flags[v_sl_idx]; ++i) {
|
|
|
|
if (rs->flags & (U64_LITERAL(1) << i))
|
|
|
|
++flag_counts[flag_map[v_sl_idx][i]];
|
|
|
|
}
|
2007-06-04 21:54:02 +02:00
|
|
|
if (rs->flags & (U64_LITERAL(1) << named_flag[v_sl_idx])) {
|
2007-08-14 04:23:57 +02:00
|
|
|
if (chosen_name && strcmp(chosen_name, rs->status.nickname)) {
|
|
|
|
log_notice(LD_DIR, "Conflict on naming for router: %s vs %s",
|
|
|
|
chosen_name, rs->status.nickname);
|
|
|
|
naming_conflict = 1;
|
|
|
|
}
|
2007-06-04 21:54:02 +02:00
|
|
|
chosen_name = rs->status.nickname;
|
|
|
|
}
|
2008-08-15 01:00:57 +02:00
|
|
|
|
|
|
|
/* count bandwidths */
|
2009-07-31 06:33:53 +02:00
|
|
|
if (rs->status.has_measured_bw)
|
|
|
|
measured_bws[num_mbws++] = rs->status.measured_bw;
|
|
|
|
|
2008-08-15 01:00:57 +02:00
|
|
|
if (rs->status.has_bandwidth)
|
|
|
|
bandwidths[num_bandwidths++] = rs->status.bandwidth;
|
2008-09-10 07:33:49 +02:00
|
|
|
} SMARTLIST_FOREACH_END(v);
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
/* We don't include this router at all unless more than half of
|
|
|
|
* the authorities we believe in list it. */
|
|
|
|
if (n_listing <= total_authorities/2)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* Figure out the most popular opinion of what the most recent
|
|
|
|
* routerinfo and its contents are. */
|
2009-08-24 18:51:33 +02:00
|
|
|
memset(microdesc_digest, 0, sizeof(microdesc_digest));
|
|
|
|
rs = compute_routerstatus_consensus(matching_descs, consensus_method,
|
|
|
|
microdesc_digest);
|
2007-06-04 21:19:01 +02:00
|
|
|
/* Copy bits of that into rs_out. */
|
|
|
|
tor_assert(!memcmp(lowest_id, rs->status.identity_digest, DIGEST_LEN));
|
|
|
|
memcpy(rs_out.identity_digest, lowest_id, DIGEST_LEN);
|
|
|
|
memcpy(rs_out.descriptor_digest, rs->status.descriptor_digest,
|
|
|
|
DIGEST_LEN);
|
2007-06-14 00:39:08 +02:00
|
|
|
rs_out.addr = rs->status.addr;
|
2007-06-04 21:19:01 +02:00
|
|
|
rs_out.published_on = rs->status.published_on;
|
|
|
|
rs_out.dir_port = rs->status.dir_port;
|
|
|
|
rs_out.or_port = rs->status.or_port;
|
2008-08-17 10:01:23 +02:00
|
|
|
rs_out.has_bandwidth = 0;
|
|
|
|
rs_out.has_exitsummary = 0;
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2007-06-04 21:54:02 +02:00
|
|
|
if (chosen_name && !naming_conflict) {
|
|
|
|
strlcpy(rs_out.nickname, chosen_name, sizeof(rs_out.nickname));
|
|
|
|
} else {
|
|
|
|
strlcpy(rs_out.nickname, rs->status.nickname, sizeof(rs_out.nickname));
|
|
|
|
}
|
|
|
|
|
2007-10-19 22:48:46 +02:00
|
|
|
if (consensus_method == 1) {
|
|
|
|
is_named = chosen_named_idx >= 0 &&
|
|
|
|
(!naming_conflict && flag_counts[chosen_named_idx]);
|
|
|
|
} else {
|
|
|
|
const char *d = strmap_get_lc(name_to_id_map, rs_out.nickname);
|
|
|
|
if (!d) {
|
|
|
|
is_named = is_unnamed = 0;
|
|
|
|
} else if (!memcmp(d, lowest_id, DIGEST_LEN)) {
|
|
|
|
is_named = 1; is_unnamed = 0;
|
|
|
|
} else {
|
|
|
|
is_named = 0; is_unnamed = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-06-04 21:19:01 +02:00
|
|
|
/* Set the flags. */
|
|
|
|
smartlist_add(chosen_flags, (char*)"s"); /* for the start of the line. */
|
|
|
|
SMARTLIST_FOREACH(flags, const char *, fl,
|
|
|
|
{
|
2007-10-19 22:48:46 +02:00
|
|
|
if (!strcmp(fl, "Named")) {
|
|
|
|
if (is_named)
|
|
|
|
smartlist_add(chosen_flags, (char*)fl);
|
|
|
|
} else if (!strcmp(fl, "Unnamed") && consensus_method >= 2) {
|
|
|
|
if (is_unnamed)
|
2007-06-04 21:54:02 +02:00
|
|
|
smartlist_add(chosen_flags, (char*)fl);
|
|
|
|
} else {
|
2008-06-13 23:22:49 +02:00
|
|
|
if (flag_counts[fl_sl_idx] > n_flag_voters[fl_sl_idx]/2) {
|
2007-10-19 22:48:46 +02:00
|
|
|
smartlist_add(chosen_flags, (char*)fl);
|
2010-01-30 02:10:50 +01:00
|
|
|
if (!strcmp(fl, "Exit"))
|
|
|
|
is_exit = 1;
|
|
|
|
else if (!strcmp(fl, "Guard"))
|
|
|
|
is_guard = 1;
|
|
|
|
else if (!strcmp(fl, "Running"))
|
2008-06-13 23:22:49 +02:00
|
|
|
is_running = 1;
|
|
|
|
}
|
2007-06-04 21:54:02 +02:00
|
|
|
}
|
2007-06-04 21:19:01 +02:00
|
|
|
});
|
|
|
|
|
2008-06-13 23:22:49 +02:00
|
|
|
/* Starting with consensus method 4 we do not list servers
|
|
|
|
* that are not running in a consensus. See Proposal 138 */
|
|
|
|
if (consensus_method >= 4 && !is_running)
|
|
|
|
continue;
|
|
|
|
|
2007-06-04 21:19:01 +02:00
|
|
|
/* Pick the version. */
|
|
|
|
if (smartlist_len(versions)) {
|
|
|
|
sort_version_list(versions, 0);
|
|
|
|
chosen_version = get_most_frequent_member(versions);
|
|
|
|
} else {
|
|
|
|
chosen_version = NULL;
|
|
|
|
}
|
|
|
|
|
2008-08-15 01:00:57 +02:00
|
|
|
/* Pick a bandwidth */
|
2009-07-31 06:33:53 +02:00
|
|
|
if (consensus_method >= 6 && num_mbws > 2) {
|
|
|
|
rs_out.has_bandwidth = 1;
|
|
|
|
rs_out.bandwidth = median_uint32(measured_bws, num_mbws);
|
|
|
|
} else if (consensus_method >= 5 && num_bandwidths > 0) {
|
2008-08-15 01:00:57 +02:00
|
|
|
rs_out.has_bandwidth = 1;
|
|
|
|
rs_out.bandwidth = median_uint32(bandwidths, num_bandwidths);
|
|
|
|
}
|
|
|
|
|
2010-02-23 03:43:13 +01:00
|
|
|
if (consensus_method >= MIN_METHOD_FOR_BW_WEIGHTS) {
|
2010-01-30 02:10:50 +01:00
|
|
|
if (rs_out.has_bandwidth) {
|
|
|
|
T += rs_out.bandwidth;
|
|
|
|
if (is_exit && is_guard)
|
|
|
|
D += rs_out.bandwidth;
|
|
|
|
else if (is_exit)
|
|
|
|
E += rs_out.bandwidth;
|
|
|
|
else if (is_guard)
|
|
|
|
G += rs_out.bandwidth;
|
|
|
|
else
|
|
|
|
M += rs_out.bandwidth;
|
|
|
|
} else {
|
|
|
|
log_warn(LD_BUG, "Missing consensus bandwidth for router %s",
|
|
|
|
rs_out.nickname);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-08-15 01:01:31 +02:00
|
|
|
/* Ok, we already picked a descriptor digest we want to list
|
|
|
|
* previously. Now we want to use the exit policy summary from
|
|
|
|
* that descriptor. If everybody plays nice all the voters who
|
|
|
|
* listed that descriptor will have the same summary. If not then
|
|
|
|
* something is fishy and we'll use the most common one (breaking
|
2009-05-27 23:55:51 +02:00
|
|
|
* ties in favor of lexicographically larger one (only because it
|
2008-08-15 01:01:31 +02:00
|
|
|
* lets me reuse more existing code.
|
|
|
|
*
|
|
|
|
* The other case that can happen is that no authority that voted
|
|
|
|
* for that descriptor has an exit policy summary. That's
|
|
|
|
* probably quite unlikely but can happen. In that case we use
|
|
|
|
* the policy that was most often listed in votes, again breaking
|
|
|
|
* ties like in the previous case.
|
|
|
|
*/
|
|
|
|
if (consensus_method >= 5) {
|
|
|
|
/* Okay, go through all the votes for this router. We prepared
|
|
|
|
* that list previously */
|
|
|
|
const char *chosen_exitsummary = NULL;
|
|
|
|
smartlist_clear(exitsummaries);
|
|
|
|
SMARTLIST_FOREACH(matching_descs, vote_routerstatus_t *, vsr, {
|
|
|
|
/* Check if the vote where this status comes from had the
|
|
|
|
* proper descriptor */
|
2008-08-15 01:09:48 +02:00
|
|
|
tor_assert(!memcmp(rs_out.identity_digest,
|
|
|
|
vsr->status.identity_digest,
|
|
|
|
DIGEST_LEN));
|
2008-08-15 01:01:31 +02:00
|
|
|
if (vsr->status.has_exitsummary &&
|
2008-08-15 01:09:48 +02:00
|
|
|
!memcmp(rs_out.descriptor_digest,
|
|
|
|
vsr->status.descriptor_digest,
|
|
|
|
DIGEST_LEN)) {
|
2008-08-15 01:01:31 +02:00
|
|
|
tor_assert(vsr->status.exitsummary);
|
|
|
|
smartlist_add(exitsummaries, vsr->status.exitsummary);
|
|
|
|
if (!chosen_exitsummary) {
|
|
|
|
chosen_exitsummary = vsr->status.exitsummary;
|
|
|
|
} else if (strcmp(chosen_exitsummary, vsr->status.exitsummary)) {
|
|
|
|
/* Great. There's disagreement among the voters. That
|
|
|
|
* really shouldn't be */
|
|
|
|
exitsummary_disagreement = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
if (exitsummary_disagreement) {
|
|
|
|
char id[HEX_DIGEST_LEN+1];
|
|
|
|
char dd[HEX_DIGEST_LEN+1];
|
|
|
|
base16_encode(id, sizeof(dd), rs_out.identity_digest, DIGEST_LEN);
|
|
|
|
base16_encode(dd, sizeof(dd), rs_out.descriptor_digest, DIGEST_LEN);
|
2009-05-28 17:54:56 +02:00
|
|
|
log_warn(LD_DIR, "The voters disagreed on the exit policy summary "
|
|
|
|
" for router %s with descriptor %s. This really shouldn't"
|
2008-08-15 01:01:31 +02:00
|
|
|
" have happened.", id, dd);
|
|
|
|
|
|
|
|
smartlist_sort_strings(exitsummaries);
|
|
|
|
chosen_exitsummary = get_most_frequent_member(exitsummaries);
|
|
|
|
} else if (!chosen_exitsummary) {
|
|
|
|
char id[HEX_DIGEST_LEN+1];
|
|
|
|
char dd[HEX_DIGEST_LEN+1];
|
|
|
|
base16_encode(id, sizeof(dd), rs_out.identity_digest, DIGEST_LEN);
|
|
|
|
base16_encode(dd, sizeof(dd), rs_out.descriptor_digest, DIGEST_LEN);
|
|
|
|
log_warn(LD_DIR, "Not one of the voters that made us select"
|
|
|
|
"descriptor %s for router %s had an exit policy"
|
|
|
|
"summary", dd, id);
|
|
|
|
|
|
|
|
/* Ok, none of those voting for the digest we chose had an
|
|
|
|
* exit policy for us. Well, that kinda sucks.
|
|
|
|
*/
|
|
|
|
smartlist_clear(exitsummaries);
|
|
|
|
SMARTLIST_FOREACH(matching_descs, vote_routerstatus_t *, vsr, {
|
|
|
|
if (vsr->status.has_exitsummary)
|
|
|
|
smartlist_add(exitsummaries, vsr->status.exitsummary);
|
|
|
|
});
|
|
|
|
smartlist_sort_strings(exitsummaries);
|
|
|
|
chosen_exitsummary = get_most_frequent_member(exitsummaries);
|
|
|
|
|
|
|
|
if (!chosen_exitsummary)
|
|
|
|
log_warn(LD_DIR, "Wow, not one of the voters had an exit "
|
|
|
|
"policy summary for %s. Wow.", id);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (chosen_exitsummary) {
|
|
|
|
rs_out.has_exitsummary = 1;
|
2008-08-15 01:09:48 +02:00
|
|
|
/* yea, discards the const */
|
|
|
|
rs_out.exitsummary = (char *)chosen_exitsummary;
|
2008-08-15 01:01:31 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-03-01 03:46:50 +01:00
|
|
|
{
|
|
|
|
char buf[4096];
|
|
|
|
/* Okay!! Now we can write the descriptor... */
|
|
|
|
/* First line goes into "buf". */
|
|
|
|
routerstatus_format_entry(buf, sizeof(buf), &rs_out, NULL,
|
|
|
|
rs_format);
|
|
|
|
smartlist_add(chunks, tor_strdup(buf));
|
|
|
|
}
|
2009-08-24 18:51:33 +02:00
|
|
|
/* Now an m line, if applicable. */
|
|
|
|
if (flavor == FLAV_MICRODESC &&
|
|
|
|
!tor_digest256_is_zero(microdesc_digest)) {
|
|
|
|
char m[BASE64_DIGEST256_LEN+1], *cp;
|
|
|
|
digest256_to_base64(m, microdesc_digest);
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&cp, "m %s\n", m);
|
2009-08-24 18:51:33 +02:00
|
|
|
smartlist_add(chunks, cp);
|
|
|
|
}
|
|
|
|
/* Next line is all flags. The "\n" is missing. */
|
2007-06-04 21:19:01 +02:00
|
|
|
smartlist_add(chunks,
|
|
|
|
smartlist_join_strings(chosen_flags, " ", 0, NULL));
|
|
|
|
/* Now the version line. */
|
|
|
|
if (chosen_version) {
|
2007-08-14 04:23:57 +02:00
|
|
|
smartlist_add(chunks, tor_strdup("\nv "));
|
|
|
|
smartlist_add(chunks, tor_strdup(chosen_version));
|
2007-06-04 21:19:01 +02:00
|
|
|
}
|
2007-08-14 04:23:57 +02:00
|
|
|
smartlist_add(chunks, tor_strdup("\n"));
|
2008-08-15 01:00:57 +02:00
|
|
|
/* Now the weight line. */
|
|
|
|
if (rs_out.has_bandwidth) {
|
2010-03-01 03:46:50 +01:00
|
|
|
char *cp=NULL;
|
|
|
|
tor_asprintf(&cp, "w Bandwidth=%d\n", rs_out.bandwidth);
|
|
|
|
smartlist_add(chunks, cp);
|
|
|
|
}
|
2009-07-31 06:33:53 +02:00
|
|
|
|
2008-08-15 01:01:31 +02:00
|
|
|
/* Now the exitpolicy summary line. */
|
2009-08-24 18:51:33 +02:00
|
|
|
if (rs_out.has_exitsummary && flavor == FLAV_NS) {
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf, "p %s\n", rs_out.exitsummary);
|
|
|
|
smartlist_add(chunks, buf);
|
|
|
|
}
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
/* And the loop is over and we move on to the next router */
|
|
|
|
}
|
|
|
|
|
|
|
|
tor_free(index);
|
|
|
|
tor_free(size);
|
|
|
|
tor_free(n_voter_flags);
|
|
|
|
tor_free(n_flag_voters);
|
|
|
|
for (i = 0; i < smartlist_len(votes); ++i)
|
|
|
|
tor_free(flag_map[i]);
|
|
|
|
tor_free(flag_map);
|
|
|
|
tor_free(flag_counts);
|
2007-10-19 20:56:30 +02:00
|
|
|
tor_free(named_flag);
|
|
|
|
tor_free(unnamed_flag);
|
2007-10-19 22:48:46 +02:00
|
|
|
strmap_free(name_to_id_map, NULL);
|
2007-06-04 21:19:01 +02:00
|
|
|
smartlist_free(matching_descs);
|
|
|
|
smartlist_free(chosen_flags);
|
|
|
|
smartlist_free(versions);
|
2008-08-15 01:01:31 +02:00
|
|
|
smartlist_free(exitsummaries);
|
2008-09-10 07:33:49 +02:00
|
|
|
tor_free(bandwidths);
|
2009-11-12 07:31:26 +01:00
|
|
|
tor_free(measured_bws);
|
2007-06-04 21:19:01 +02:00
|
|
|
}
|
|
|
|
|
2010-02-23 03:43:13 +01:00
|
|
|
if (consensus_method >= MIN_METHOD_FOR_FOOTER) {
|
2010-02-15 02:49:08 +01:00
|
|
|
/* Starting with consensus method 9, we clearly mark the directory
|
|
|
|
* footer region */
|
|
|
|
smartlist_add(chunks, tor_strdup("directory-footer\n"));
|
|
|
|
}
|
|
|
|
|
2010-02-23 03:43:13 +01:00
|
|
|
if (consensus_method >= MIN_METHOD_FOR_BW_WEIGHTS) {
|
2010-01-30 02:10:50 +01:00
|
|
|
int64_t weight_scale = BW_WEIGHT_SCALE;
|
|
|
|
char *bw_weight_param = NULL;
|
|
|
|
|
|
|
|
// Parse params, extract BW_WEIGHT_SCALE if present
|
|
|
|
// DO NOT use consensus_param_bw_weight_scale() in this code!
|
|
|
|
// The consensus is not formed yet!
|
2010-03-21 06:03:13 +01:00
|
|
|
if (params) {
|
|
|
|
if (strcmpstart(params, "bwweightscale=") == 0)
|
|
|
|
bw_weight_param = params;
|
|
|
|
else
|
|
|
|
bw_weight_param = strstr(params, " bwweightscale=");
|
|
|
|
}
|
2010-01-30 02:10:50 +01:00
|
|
|
|
|
|
|
if (bw_weight_param) {
|
|
|
|
int ok=0;
|
|
|
|
char *eq = strchr(bw_weight_param, '=');
|
|
|
|
if (eq) {
|
|
|
|
weight_scale = tor_parse_long(eq+1, 10, INT32_MIN, INT32_MAX, &ok,
|
|
|
|
NULL);
|
|
|
|
if (!ok) {
|
|
|
|
log_warn(LD_DIR, "Bad element '%s' in bw weight param",
|
|
|
|
escaped(bw_weight_param));
|
|
|
|
weight_scale = BW_WEIGHT_SCALE;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
log_warn(LD_DIR, "Bad element '%s' in bw weight param",
|
|
|
|
escaped(bw_weight_param));
|
|
|
|
weight_scale = BW_WEIGHT_SCALE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
networkstatus_compute_bw_weights_v9(chunks, G, M, E, D, T, weight_scale);
|
|
|
|
}
|
|
|
|
|
2007-06-04 21:19:01 +02:00
|
|
|
/* Add a signature. */
|
2007-06-04 21:54:02 +02:00
|
|
|
{
|
2009-09-23 09:02:32 +02:00
|
|
|
char digest[DIGEST256_LEN];
|
2007-06-04 21:54:02 +02:00
|
|
|
char fingerprint[HEX_DIGEST_LEN+1];
|
2007-06-05 00:29:00 +02:00
|
|
|
char signing_key_fingerprint[HEX_DIGEST_LEN+1];
|
2009-09-23 09:02:32 +02:00
|
|
|
digest_algorithm_t digest_alg =
|
|
|
|
flavor == FLAV_NS ? DIGEST_SHA1 : DIGEST_SHA256;
|
|
|
|
size_t digest_len =
|
|
|
|
flavor == FLAV_NS ? DIGEST_LEN : DIGEST256_LEN;
|
|
|
|
const char *algname = crypto_digest_algorithm_get_name(digest_alg);
|
2010-03-01 03:46:50 +01:00
|
|
|
char *buf = NULL;
|
|
|
|
char sigbuf[4096];
|
2007-06-05 00:29:00 +02:00
|
|
|
|
2007-06-04 21:54:02 +02:00
|
|
|
smartlist_add(chunks, tor_strdup("directory-signature "));
|
|
|
|
|
|
|
|
/* Compute the hash of the chunks. */
|
2009-09-23 09:02:32 +02:00
|
|
|
hash_list_members(digest, digest_len, chunks, digest_alg);
|
2007-06-04 21:54:02 +02:00
|
|
|
|
2007-06-05 00:29:00 +02:00
|
|
|
/* Get the fingerprints */
|
2007-06-04 21:54:02 +02:00
|
|
|
crypto_pk_get_fingerprint(identity_key, fingerprint, 0);
|
2007-06-05 00:29:00 +02:00
|
|
|
crypto_pk_get_fingerprint(signing_key, signing_key_fingerprint, 0);
|
2007-06-04 21:54:02 +02:00
|
|
|
|
|
|
|
/* add the junk that will go at the end of the line. */
|
2009-09-23 09:02:32 +02:00
|
|
|
if (flavor == FLAV_NS) {
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf, "%s %s\n", fingerprint,
|
2009-09-23 09:02:32 +02:00
|
|
|
signing_key_fingerprint);
|
|
|
|
} else {
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf, "%s %s %s\n",
|
2009-09-23 09:02:32 +02:00
|
|
|
algname, fingerprint,
|
|
|
|
signing_key_fingerprint);
|
|
|
|
}
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, buf);
|
2007-06-04 21:54:02 +02:00
|
|
|
/* And the signature. */
|
2010-03-01 03:46:50 +01:00
|
|
|
sigbuf[0] = '\0';
|
|
|
|
if (router_append_dirobj_signature(sigbuf, sizeof(sigbuf),
|
|
|
|
digest, digest_len,
|
2007-08-14 04:23:57 +02:00
|
|
|
signing_key)) {
|
|
|
|
log_warn(LD_BUG, "Couldn't sign consensus networkstatus.");
|
|
|
|
return NULL; /* This leaks, but it should never happen. */
|
|
|
|
}
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, tor_strdup(sigbuf));
|
2008-05-12 04:14:01 +02:00
|
|
|
|
2008-05-12 06:22:01 +02:00
|
|
|
if (legacy_id_key_digest && legacy_signing_key && consensus_method >= 3) {
|
2008-05-12 04:14:01 +02:00
|
|
|
smartlist_add(chunks, tor_strdup("directory-signature "));
|
2008-05-12 06:22:01 +02:00
|
|
|
base16_encode(fingerprint, sizeof(fingerprint),
|
|
|
|
legacy_id_key_digest, DIGEST_LEN);
|
|
|
|
crypto_pk_get_fingerprint(legacy_signing_key,
|
|
|
|
signing_key_fingerprint, 0);
|
2009-09-23 09:02:32 +02:00
|
|
|
if (flavor == FLAV_NS) {
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf, "%s %s\n", fingerprint,
|
2009-09-23 09:02:32 +02:00
|
|
|
signing_key_fingerprint);
|
|
|
|
} else {
|
2010-03-01 03:46:50 +01:00
|
|
|
tor_asprintf(&buf, "%s %s %s\n",
|
2009-09-23 09:02:32 +02:00
|
|
|
algname, fingerprint,
|
|
|
|
signing_key_fingerprint);
|
|
|
|
}
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, buf);
|
|
|
|
sigbuf[0] = '\0';
|
|
|
|
if (router_append_dirobj_signature(sigbuf, sizeof(sigbuf),
|
|
|
|
digest, digest_len,
|
2008-05-12 06:22:01 +02:00
|
|
|
legacy_signing_key)) {
|
2008-05-12 04:14:01 +02:00
|
|
|
log_warn(LD_BUG, "Couldn't sign consensus networkstatus.");
|
|
|
|
return NULL; /* This leaks, but it should never happen. */
|
|
|
|
}
|
2010-03-01 03:46:50 +01:00
|
|
|
smartlist_add(chunks, tor_strdup(sigbuf));
|
2008-05-12 04:14:01 +02:00
|
|
|
}
|
2007-06-04 21:54:02 +02:00
|
|
|
}
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2007-06-04 21:54:02 +02:00
|
|
|
result = smartlist_join_strings(chunks, "", 0, NULL);
|
2007-06-04 21:19:01 +02:00
|
|
|
|
|
|
|
tor_free(client_versions);
|
|
|
|
tor_free(server_versions);
|
2008-09-10 07:33:49 +02:00
|
|
|
SMARTLIST_FOREACH(flags, char *, cp, tor_free(cp));
|
2007-06-04 21:54:02 +02:00
|
|
|
smartlist_free(flags);
|
|
|
|
SMARTLIST_FOREACH(chunks, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(chunks);
|
2007-06-04 21:19:01 +02:00
|
|
|
|
2007-06-08 21:02:39 +02:00
|
|
|
{
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *c;
|
2008-07-24 11:22:27 +02:00
|
|
|
if (!(c = networkstatus_parse_vote_from_string(result, NULL,
|
|
|
|
NS_TYPE_CONSENSUS))) {
|
2010-01-30 02:10:50 +01:00
|
|
|
log_err(LD_BUG, "Generated a networkstatus consensus we couldn't "
|
2007-06-08 21:02:39 +02:00
|
|
|
"parse.");
|
|
|
|
tor_free(result);
|
|
|
|
return NULL;
|
|
|
|
}
|
2010-01-30 00:40:40 +01:00
|
|
|
// Verify balancing parameters
|
2010-02-23 03:43:13 +01:00
|
|
|
if (consensus_method >= MIN_METHOD_FOR_BW_WEIGHTS) {
|
2010-01-30 00:40:40 +01:00
|
|
|
networkstatus_verify_bw_weights(c);
|
|
|
|
}
|
2007-06-08 21:02:39 +02:00
|
|
|
networkstatus_vote_free(c);
|
|
|
|
}
|
|
|
|
|
2007-06-04 21:54:02 +02:00
|
|
|
return result;
|
2007-06-04 21:19:01 +02:00
|
|
|
}
|
2007-06-05 00:29:00 +02:00
|
|
|
|
2007-10-10 21:33:01 +02:00
|
|
|
/** Given a consensus vote <b>target</b> and a set of detached signatures in
|
|
|
|
* <b>sigs</b> that correspond to the same consensus, check whether there are
|
|
|
|
* any new signatures in <b>src_voter_list</b> that should be added to
|
2008-12-22 15:56:16 +01:00
|
|
|
* <b>target</b>. (A signature should be added if we have no signature for that
|
2007-10-10 21:33:01 +02:00
|
|
|
* voter in <b>target</b> yet, or if we have no verifiable signature and the
|
|
|
|
* new signature is verifiable.) Return the number of signatures added or
|
|
|
|
* changed, or -1 if the document signed by <b>sigs</b> isn't the same
|
|
|
|
* document as <b>target</b>. */
|
|
|
|
int
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_add_detached_signatures(networkstatus_t *target,
|
2007-10-19 18:41:32 +02:00
|
|
|
ns_detached_signatures_t *sigs,
|
|
|
|
const char **msg_out)
|
2007-07-26 22:26:59 +02:00
|
|
|
{
|
2007-09-12 19:33:18 +02:00
|
|
|
int r = 0;
|
2009-09-16 23:01:01 +02:00
|
|
|
const char *flavor;
|
|
|
|
smartlist_t *siglist;
|
2007-10-10 21:33:01 +02:00
|
|
|
tor_assert(sigs);
|
2007-07-26 22:26:59 +02:00
|
|
|
tor_assert(target);
|
2008-07-24 11:22:27 +02:00
|
|
|
tor_assert(target->type == NS_TYPE_CONSENSUS);
|
2007-07-26 22:26:59 +02:00
|
|
|
|
2009-09-16 23:01:01 +02:00
|
|
|
flavor = networkstatus_get_flavor_name(target->flavor);
|
|
|
|
|
2007-10-19 18:41:32 +02:00
|
|
|
/* Do the times seem right? */
|
|
|
|
if (target->valid_after != sigs->valid_after) {
|
|
|
|
*msg_out = "Valid-After times do not match "
|
|
|
|
"when adding detached signatures to consensus";
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (target->fresh_until != sigs->fresh_until) {
|
|
|
|
*msg_out = "Fresh-until times do not match "
|
|
|
|
"when adding detached signatures to consensus";
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
if (target->valid_until != sigs->valid_until) {
|
|
|
|
*msg_out = "Valid-until times do not match "
|
|
|
|
"when adding detached signatures to consensus";
|
|
|
|
return -1;
|
|
|
|
}
|
2009-09-16 23:01:01 +02:00
|
|
|
siglist = strmap_get(sigs->signatures, flavor);
|
|
|
|
if (!siglist) {
|
|
|
|
*msg_out = "No signatures for given consensus flavor";
|
2007-10-10 21:33:01 +02:00
|
|
|
return -1;
|
2007-10-19 18:41:32 +02:00
|
|
|
}
|
2007-10-10 21:33:01 +02:00
|
|
|
|
2009-09-16 23:01:01 +02:00
|
|
|
/** Make sure all the digests we know match, and at least one matches. */
|
|
|
|
{
|
|
|
|
digests_t *digests = strmap_get(sigs->digests, flavor);
|
|
|
|
int n_matches = 0;
|
|
|
|
digest_algorithm_t alg;
|
|
|
|
if (!digests) {
|
|
|
|
*msg_out = "No digests for given consensus flavor";
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
for (alg = DIGEST_SHA1; alg < N_DIGEST_ALGORITHMS; ++alg) {
|
|
|
|
if (!tor_mem_is_zero(digests->d[alg], DIGEST256_LEN)) {
|
|
|
|
if (!memcmp(target->digests.d[alg], digests->d[alg], DIGEST256_LEN)) {
|
|
|
|
++n_matches;
|
|
|
|
} else {
|
|
|
|
*msg_out = "Mismatched digest.";
|
|
|
|
return -1;
|
|
|
|
}
|
2008-01-24 21:00:37 +01:00
|
|
|
}
|
2009-09-16 23:01:01 +02:00
|
|
|
}
|
|
|
|
if (!n_matches) {
|
|
|
|
*msg_out = "No regognized digests for given consensus flavor";
|
|
|
|
}
|
|
|
|
}
|
2007-07-26 22:26:59 +02:00
|
|
|
|
2009-09-16 23:01:01 +02:00
|
|
|
/* For each voter in src... */
|
|
|
|
SMARTLIST_FOREACH_BEGIN(siglist, document_signature_t *, sig) {
|
|
|
|
char voter_identity[HEX_DIGEST_LEN+1];
|
|
|
|
networkstatus_voter_info_t *target_voter =
|
|
|
|
networkstatus_get_voter_by_id(target, sig->identity_digest);
|
|
|
|
authority_cert_t *cert = NULL;
|
|
|
|
const char *algorithm;
|
|
|
|
document_signature_t *old_sig = NULL;
|
|
|
|
|
|
|
|
algorithm = crypto_digest_algorithm_get_name(sig->alg);
|
|
|
|
|
|
|
|
base16_encode(voter_identity, sizeof(voter_identity),
|
|
|
|
sig->identity_digest, DIGEST_LEN);
|
|
|
|
log_info(LD_DIR, "Looking at signature from %s using %s", voter_identity,
|
|
|
|
algorithm);
|
|
|
|
/* If the target doesn't know about this voter, then forget it. */
|
|
|
|
if (!target_voter) {
|
|
|
|
log_info(LD_DIR, "We do not know any voter with ID %s", voter_identity);
|
|
|
|
continue;
|
|
|
|
}
|
2007-07-26 22:26:59 +02:00
|
|
|
|
2009-09-16 23:01:01 +02:00
|
|
|
old_sig = voter_get_sig_by_algorithm(target_voter, sig->alg);
|
2008-11-11 17:35:46 +01:00
|
|
|
|
2009-09-16 23:01:01 +02:00
|
|
|
/* If the target already has a good signature from this voter, then skip
|
|
|
|
* this one. */
|
|
|
|
if (old_sig && old_sig->good_signature) {
|
|
|
|
log_info(LD_DIR, "We already have a good signature from %s using %s",
|
|
|
|
voter_identity, algorithm);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Try checking the signature if we haven't already. */
|
|
|
|
if (!sig->good_signature && !sig->bad_signature) {
|
|
|
|
cert = authority_cert_get_by_digests(sig->identity_digest,
|
|
|
|
sig->signing_key_digest);
|
|
|
|
if (cert)
|
|
|
|
networkstatus_check_document_signature(target, sig, cert);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* If this signature is good, or we don't have any signature yet,
|
|
|
|
* then maybe add it. */
|
|
|
|
if (sig->good_signature || !old_sig || old_sig->bad_signature) {
|
|
|
|
log_info(LD_DIR, "Adding signature from %s with %s", voter_identity,
|
|
|
|
algorithm);
|
|
|
|
++r;
|
|
|
|
if (old_sig) {
|
|
|
|
smartlist_remove(target_voter->sigs, old_sig);
|
|
|
|
document_signature_free(old_sig);
|
2007-07-26 22:26:59 +02:00
|
|
|
}
|
2009-09-16 23:01:01 +02:00
|
|
|
smartlist_add(target_voter->sigs, document_signature_dup(sig));
|
|
|
|
} else {
|
|
|
|
log_info(LD_DIR, "Not adding signature from %s", voter_identity);
|
|
|
|
}
|
|
|
|
} SMARTLIST_FOREACH_END(sig);
|
2007-07-26 22:26:59 +02:00
|
|
|
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2009-10-15 22:06:00 +02:00
|
|
|
/** Return a newly allocated string containing all the signatures on
|
|
|
|
* <b>consensus</b> by all voters. If <b>for_detached_signatures</b> is true,
|
|
|
|
* then the signatures will be put in a detached signatures document, so
|
|
|
|
* prefix any non-NS-flavored signatures with "additional-signature" rather
|
|
|
|
* than "directory-signature". */
|
2009-09-22 22:52:51 +02:00
|
|
|
static char *
|
2009-09-23 09:02:32 +02:00
|
|
|
networkstatus_format_signatures(networkstatus_t *consensus,
|
|
|
|
int for_detached_signatures)
|
2009-09-22 22:52:51 +02:00
|
|
|
{
|
|
|
|
smartlist_t *elements;
|
|
|
|
char buf[4096];
|
|
|
|
char *result = NULL;
|
|
|
|
int n_sigs = 0;
|
2009-09-23 09:02:32 +02:00
|
|
|
const consensus_flavor_t flavor = consensus->flavor;
|
|
|
|
const char *flavor_name = networkstatus_get_flavor_name(flavor);
|
|
|
|
const char *keyword;
|
|
|
|
|
|
|
|
if (for_detached_signatures && flavor != FLAV_NS)
|
|
|
|
keyword = "additional-signature";
|
|
|
|
else
|
|
|
|
keyword = "directory-signature";
|
2009-09-22 22:52:51 +02:00
|
|
|
|
|
|
|
elements = smartlist_create();
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH_BEGIN(consensus->voters, networkstatus_voter_info_t *, v) {
|
|
|
|
SMARTLIST_FOREACH_BEGIN(v->sigs, document_signature_t *, sig) {
|
|
|
|
char sk[HEX_DIGEST_LEN+1];
|
|
|
|
char id[HEX_DIGEST_LEN+1];
|
2009-09-23 09:02:32 +02:00
|
|
|
if (!sig->signature || sig->bad_signature)
|
2009-09-22 22:52:51 +02:00
|
|
|
continue;
|
|
|
|
++n_sigs;
|
|
|
|
base16_encode(sk, sizeof(sk), sig->signing_key_digest, DIGEST_LEN);
|
|
|
|
base16_encode(id, sizeof(id), sig->identity_digest, DIGEST_LEN);
|
2009-09-23 09:02:32 +02:00
|
|
|
if (flavor == FLAV_NS) {
|
|
|
|
tor_snprintf(buf, sizeof(buf),
|
|
|
|
"%s %s %s\n-----BEGIN SIGNATURE-----\n",
|
|
|
|
keyword, id, sk);
|
|
|
|
} else {
|
|
|
|
const char *digest_name =
|
|
|
|
crypto_digest_algorithm_get_name(sig->alg);
|
|
|
|
tor_snprintf(buf, sizeof(buf),
|
|
|
|
"%s%s%s %s %s %s\n-----BEGIN SIGNATURE-----\n",
|
|
|
|
keyword,
|
|
|
|
for_detached_signatures ? " " : "",
|
|
|
|
for_detached_signatures ? flavor_name : "",
|
|
|
|
digest_name, id, sk);
|
|
|
|
}
|
2009-09-22 22:52:51 +02:00
|
|
|
smartlist_add(elements, tor_strdup(buf));
|
|
|
|
base64_encode(buf, sizeof(buf), sig->signature, sig->signature_len);
|
|
|
|
strlcat(buf, "-----END SIGNATURE-----\n", sizeof(buf));
|
|
|
|
smartlist_add(elements, tor_strdup(buf));
|
|
|
|
} SMARTLIST_FOREACH_END(sig);
|
|
|
|
} SMARTLIST_FOREACH_END(v);
|
|
|
|
|
|
|
|
result = smartlist_join_strings(elements, "", 0, NULL);
|
|
|
|
SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(elements);
|
|
|
|
if (!n_sigs)
|
|
|
|
tor_free(result);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Return a newly allocated string holding the detached-signatures document
|
2009-09-23 09:02:32 +02:00
|
|
|
* corresponding to the signatures on <b>consensuses</b>, which must contain
|
|
|
|
* exactly one FLAV_NS consensus, and no more than one consensus for each
|
|
|
|
* other flavor. */
|
2007-07-27 20:33:28 +02:00
|
|
|
char *
|
2009-09-23 09:02:32 +02:00
|
|
|
networkstatus_get_detached_signatures(smartlist_t *consensuses)
|
2007-07-27 20:33:28 +02:00
|
|
|
{
|
|
|
|
smartlist_t *elements;
|
|
|
|
char buf[4096];
|
2009-09-23 09:02:32 +02:00
|
|
|
char *result = NULL, *sigs = NULL;
|
|
|
|
networkstatus_t *consensus_ns = NULL;
|
|
|
|
tor_assert(consensuses);
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(consensuses, networkstatus_t *, ns, {
|
|
|
|
tor_assert(ns);
|
|
|
|
tor_assert(ns->type == NS_TYPE_CONSENSUS);
|
|
|
|
if (ns && ns->flavor == FLAV_NS)
|
|
|
|
consensus_ns = ns;
|
|
|
|
});
|
|
|
|
if (!consensus_ns) {
|
|
|
|
log_warn(LD_BUG, "No NS consensus given.");
|
|
|
|
return NULL;
|
|
|
|
}
|
2009-09-16 23:01:01 +02:00
|
|
|
|
2007-07-27 20:33:28 +02:00
|
|
|
elements = smartlist_create();
|
|
|
|
|
|
|
|
{
|
|
|
|
char va_buf[ISO_TIME_LEN+1], fu_buf[ISO_TIME_LEN+1],
|
|
|
|
vu_buf[ISO_TIME_LEN+1];
|
|
|
|
char d[HEX_DIGEST_LEN+1];
|
|
|
|
|
2009-09-23 09:02:32 +02:00
|
|
|
base16_encode(d, sizeof(d),
|
|
|
|
consensus_ns->digests.d[DIGEST_SHA1], DIGEST_LEN);
|
|
|
|
format_iso_time(va_buf, consensus_ns->valid_after);
|
|
|
|
format_iso_time(fu_buf, consensus_ns->fresh_until);
|
|
|
|
format_iso_time(vu_buf, consensus_ns->valid_until);
|
2007-07-27 20:33:28 +02:00
|
|
|
|
|
|
|
tor_snprintf(buf, sizeof(buf),
|
|
|
|
"consensus-digest %s\n"
|
|
|
|
"valid-after %s\n"
|
|
|
|
"fresh-until %s\n"
|
|
|
|
"valid-until %s\n", d, va_buf, fu_buf, vu_buf);
|
|
|
|
smartlist_add(elements, tor_strdup(buf));
|
|
|
|
}
|
|
|
|
|
2009-09-23 09:02:32 +02:00
|
|
|
/* Get all the digests for the non-FLAV_NS consensuses */
|
|
|
|
SMARTLIST_FOREACH_BEGIN(consensuses, networkstatus_t *, ns) {
|
|
|
|
const char *flavor_name = networkstatus_get_flavor_name(ns->flavor);
|
|
|
|
int alg;
|
|
|
|
if (ns->flavor == FLAV_NS)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
/* start with SHA256; we don't include SHA1 for anything but the basic
|
|
|
|
* consensus. */
|
|
|
|
for (alg = DIGEST_SHA256; alg < N_DIGEST_ALGORITHMS; ++alg) {
|
|
|
|
char d[HEX_DIGEST256_LEN+1];
|
|
|
|
const char *alg_name =
|
|
|
|
crypto_digest_algorithm_get_name(alg);
|
|
|
|
if (tor_mem_is_zero(ns->digests.d[alg], DIGEST256_LEN))
|
|
|
|
continue;
|
|
|
|
base16_encode(d, sizeof(d), ns->digests.d[alg], DIGEST256_LEN);
|
|
|
|
tor_snprintf(buf, sizeof(buf), "additional-digest %s %s %s\n",
|
|
|
|
flavor_name, alg_name, d);
|
|
|
|
smartlist_add(elements, tor_strdup(buf));
|
|
|
|
}
|
|
|
|
} SMARTLIST_FOREACH_END(ns);
|
|
|
|
|
|
|
|
/* Now get all the sigs for non-FLAV_NS consensuses */
|
|
|
|
SMARTLIST_FOREACH_BEGIN(consensuses, networkstatus_t *, ns) {
|
|
|
|
char *sigs;
|
|
|
|
if (ns->flavor == FLAV_NS)
|
|
|
|
continue;
|
|
|
|
sigs = networkstatus_format_signatures(ns, 1);
|
|
|
|
if (!sigs) {
|
|
|
|
log_warn(LD_DIR, "Couldn't format signatures");
|
2009-09-22 22:52:51 +02:00
|
|
|
goto err;
|
2009-09-23 09:02:32 +02:00
|
|
|
}
|
2009-09-22 22:52:51 +02:00
|
|
|
smartlist_add(elements, sigs);
|
2009-09-23 09:02:32 +02:00
|
|
|
} SMARTLIST_FOREACH_END(ns);
|
|
|
|
|
|
|
|
/* Now add the FLAV_NS consensus signatrures. */
|
|
|
|
sigs = networkstatus_format_signatures(consensus_ns, 1);
|
|
|
|
if (!sigs)
|
|
|
|
goto err;
|
|
|
|
smartlist_add(elements, sigs);
|
2007-07-27 20:33:28 +02:00
|
|
|
|
|
|
|
result = smartlist_join_strings(elements, "", 0, NULL);
|
2009-09-22 22:52:51 +02:00
|
|
|
err:
|
2007-07-27 20:33:28 +02:00
|
|
|
SMARTLIST_FOREACH(elements, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(elements);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
2009-10-15 22:06:00 +02:00
|
|
|
/** Return a newly allocated string holding a detached-signatures document for
|
|
|
|
* all of the in-progress consensuses in the <b>n_flavors</b>-element array at
|
|
|
|
* <b>pending</b>. */
|
2009-09-23 09:02:32 +02:00
|
|
|
static char *
|
|
|
|
get_detached_signatures_from_pending_consensuses(pending_consensus_t *pending,
|
|
|
|
int n_flavors)
|
|
|
|
{
|
|
|
|
int flav;
|
|
|
|
char *signatures;
|
|
|
|
smartlist_t *c = smartlist_create();
|
|
|
|
for (flav = 0; flav < n_flavors; ++flav) {
|
|
|
|
if (pending[flav].consensus)
|
|
|
|
smartlist_add(c, pending[flav].consensus);
|
|
|
|
}
|
|
|
|
signatures = networkstatus_get_detached_signatures(c);
|
|
|
|
smartlist_free(c);
|
|
|
|
return signatures;
|
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Release all storage held in <b>s</b>. */
|
2007-07-27 20:33:28 +02:00
|
|
|
void
|
|
|
|
ns_detached_signatures_free(ns_detached_signatures_t *s)
|
|
|
|
{
|
2009-09-28 16:37:01 +02:00
|
|
|
if (!s)
|
|
|
|
return;
|
2007-07-27 20:33:28 +02:00
|
|
|
if (s->signatures) {
|
2009-09-16 23:01:01 +02:00
|
|
|
STRMAP_FOREACH(s->signatures, flavor, smartlist_t *, sigs) {
|
|
|
|
SMARTLIST_FOREACH(sigs, document_signature_t *, sig,
|
|
|
|
document_signature_free(sig));
|
|
|
|
smartlist_free(sigs);
|
|
|
|
} STRMAP_FOREACH_END;
|
|
|
|
strmap_free(s->signatures, NULL);
|
|
|
|
strmap_free(s->digests, _tor_free);
|
2007-07-27 20:33:28 +02:00
|
|
|
}
|
2009-09-16 23:01:01 +02:00
|
|
|
|
2007-07-27 20:33:28 +02:00
|
|
|
tor_free(s);
|
|
|
|
}
|
|
|
|
|
2007-07-18 22:46:12 +02:00
|
|
|
/* =====
|
|
|
|
* Certificate functions
|
|
|
|
* ===== */
|
|
|
|
|
2007-06-17 17:10:43 +02:00
|
|
|
/** Allocate and return a new authority_cert_t with the same contents as
|
|
|
|
* <b>cert</b>. */
|
2007-06-08 20:41:09 +02:00
|
|
|
authority_cert_t *
|
|
|
|
authority_cert_dup(authority_cert_t *cert)
|
|
|
|
{
|
|
|
|
authority_cert_t *out = tor_malloc(sizeof(authority_cert_t));
|
|
|
|
tor_assert(cert);
|
|
|
|
|
|
|
|
memcpy(out, cert, sizeof(authority_cert_t));
|
|
|
|
/* Now copy pointed-to things. */
|
|
|
|
out->cache_info.signed_descriptor_body =
|
|
|
|
tor_strndup(cert->cache_info.signed_descriptor_body,
|
|
|
|
cert->cache_info.signed_descriptor_len);
|
|
|
|
out->cache_info.saved_location = SAVED_NOWHERE;
|
|
|
|
out->identity_key = crypto_pk_dup_key(cert->identity_key);
|
|
|
|
out->signing_key = crypto_pk_dup_key(cert->signing_key);
|
|
|
|
|
|
|
|
return out;
|
|
|
|
}
|
2007-06-13 20:16:05 +02:00
|
|
|
|
2007-07-18 22:46:12 +02:00
|
|
|
/* =====
|
|
|
|
* Vote scheduling
|
|
|
|
* ===== */
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Set *<b>timing_out</b> to the intervals at which we would like to vote.
|
|
|
|
* Note that these aren't the intervals we'll use to vote; they're the ones
|
|
|
|
* that we'll vote to use. */
|
2007-07-18 22:46:12 +02:00
|
|
|
void
|
|
|
|
dirvote_get_preferred_voting_intervals(vote_timing_t *timing_out)
|
|
|
|
{
|
2007-08-13 20:09:38 +02:00
|
|
|
or_options_t *options = get_options();
|
|
|
|
|
2007-07-18 22:46:12 +02:00
|
|
|
tor_assert(timing_out);
|
|
|
|
|
2007-08-13 20:09:38 +02:00
|
|
|
timing_out->vote_interval = options->V3AuthVotingInterval;
|
2007-08-14 04:23:57 +02:00
|
|
|
timing_out->n_intervals_valid = options->V3AuthNIntervalsValid;
|
|
|
|
timing_out->vote_delay = options->V3AuthVoteDelay;
|
|
|
|
timing_out->dist_delay = options->V3AuthDistDelay;
|
2007-07-18 22:46:12 +02:00
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Return the start of the next interval of size <b>interval</b> (in seconds)
|
|
|
|
* after <b>now</b>. Midnight always starts a fresh interval, and if the last
|
|
|
|
* interval of a day would be truncated to less than half its size, it is
|
|
|
|
* rolled into the previous interval. */
|
2007-07-18 22:46:12 +02:00
|
|
|
time_t
|
|
|
|
dirvote_get_start_of_next_interval(time_t now, int interval)
|
|
|
|
{
|
|
|
|
struct tm tm;
|
|
|
|
time_t midnight_today;
|
|
|
|
time_t midnight_tomorrow;
|
|
|
|
time_t next;
|
|
|
|
|
|
|
|
tor_gmtime_r(&now, &tm);
|
|
|
|
tm.tm_hour = 0;
|
|
|
|
tm.tm_min = 0;
|
|
|
|
tm.tm_sec = 0;
|
|
|
|
|
|
|
|
midnight_today = tor_timegm(&tm);
|
|
|
|
midnight_tomorrow = midnight_today + (24*60*60);
|
|
|
|
|
|
|
|
next = midnight_today + ((now-midnight_today)/interval + 1)*interval;
|
|
|
|
|
2007-08-14 22:19:40 +02:00
|
|
|
/* Intervals never cross midnight. */
|
2007-07-18 22:46:12 +02:00
|
|
|
if (next > midnight_tomorrow)
|
|
|
|
next = midnight_tomorrow;
|
|
|
|
|
2007-08-14 22:19:40 +02:00
|
|
|
/* If the interval would only last half as long as it's supposed to, then
|
|
|
|
* skip over to the next day. */
|
|
|
|
if (next + interval/2 > midnight_tomorrow)
|
|
|
|
next = midnight_tomorrow;
|
|
|
|
|
2007-07-18 22:46:12 +02:00
|
|
|
return next;
|
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Scheduling information for a voting interval. */
|
2007-07-18 22:46:12 +02:00
|
|
|
static struct {
|
2007-08-22 17:07:44 +02:00
|
|
|
/** When do we generate and distribute our vote for this interval? */
|
2007-07-18 22:46:12 +02:00
|
|
|
time_t voting_starts;
|
2007-10-04 18:21:58 +02:00
|
|
|
/** When do we send an HTTP request for any votes that we haven't
|
|
|
|
* been posted yet?*/
|
2007-09-21 21:11:52 +02:00
|
|
|
time_t fetch_missing_votes;
|
2007-08-22 17:07:44 +02:00
|
|
|
/** When do we give up on getting more votes and generate a consensus? */
|
2007-07-18 22:46:12 +02:00
|
|
|
time_t voting_ends;
|
2007-10-04 18:21:58 +02:00
|
|
|
/** When do we send an HTTP request for any signatures we're expecting to
|
|
|
|
* see on the consensus? */
|
2007-09-21 21:11:52 +02:00
|
|
|
time_t fetch_missing_signatures;
|
2007-08-22 17:07:44 +02:00
|
|
|
/** When do we publish the consensus? */
|
2007-07-18 22:46:12 +02:00
|
|
|
time_t interval_starts;
|
2007-07-30 01:11:44 +02:00
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/* True iff we have generated and distributed our vote. */
|
2007-07-30 01:11:44 +02:00
|
|
|
int have_voted;
|
2007-10-04 18:21:58 +02:00
|
|
|
/* True iff we've requested missing votes. */
|
2007-09-22 08:06:05 +02:00
|
|
|
int have_fetched_missing_votes;
|
2007-08-22 17:07:44 +02:00
|
|
|
/* True iff we have built a consensus and sent the signatures around. */
|
2007-07-30 01:11:44 +02:00
|
|
|
int have_built_consensus;
|
2007-10-04 18:21:58 +02:00
|
|
|
/* True iff we've fetched missing signatures. */
|
2007-09-22 08:06:05 +02:00
|
|
|
int have_fetched_missing_signatures;
|
2007-08-22 17:07:44 +02:00
|
|
|
/* True iff we have published our consensus. */
|
2007-07-30 01:11:44 +02:00
|
|
|
int have_published_consensus;
|
2007-10-15 16:59:48 +02:00
|
|
|
} voting_schedule = {0,0,0,0,0,0,0,0,0,0};
|
2007-07-18 22:46:12 +02:00
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Set voting_schedule to hold the timing for the next vote we should be
|
|
|
|
* doing. */
|
2007-07-18 22:46:12 +02:00
|
|
|
void
|
2007-10-18 16:27:42 +02:00
|
|
|
dirvote_recalculate_timing(or_options_t *options, time_t now)
|
2007-07-18 22:46:12 +02:00
|
|
|
{
|
|
|
|
int interval, vote_delay, dist_delay;
|
|
|
|
time_t start;
|
2007-08-14 22:19:40 +02:00
|
|
|
time_t end;
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *consensus;
|
2007-10-18 16:27:42 +02:00
|
|
|
|
|
|
|
if (!authdir_mode_v3(options))
|
|
|
|
return;
|
|
|
|
|
|
|
|
consensus = networkstatus_get_live_consensus(now);
|
2007-07-18 22:46:12 +02:00
|
|
|
|
2007-07-30 01:11:44 +02:00
|
|
|
memset(&voting_schedule, 0, sizeof(voting_schedule));
|
|
|
|
|
2007-07-18 22:46:12 +02:00
|
|
|
if (consensus) {
|
2008-02-22 20:09:45 +01:00
|
|
|
interval = (int)( consensus->fresh_until - consensus->valid_after );
|
2007-07-18 22:46:12 +02:00
|
|
|
vote_delay = consensus->vote_seconds;
|
2007-07-19 20:46:06 +02:00
|
|
|
dist_delay = consensus->dist_seconds;
|
2007-07-18 22:46:12 +02:00
|
|
|
} else {
|
2008-06-20 19:03:13 +02:00
|
|
|
interval = options->TestingV3AuthInitialVotingInterval;
|
|
|
|
vote_delay = options->TestingV3AuthInitialVoteDelay;
|
|
|
|
dist_delay = options->TestingV3AuthInitialDistDelay;
|
2007-07-18 22:46:12 +02:00
|
|
|
}
|
|
|
|
|
2007-08-14 22:19:40 +02:00
|
|
|
tor_assert(interval > 0);
|
|
|
|
|
|
|
|
if (vote_delay + dist_delay > interval/2)
|
|
|
|
vote_delay = dist_delay = interval / 4;
|
|
|
|
|
2007-07-18 22:46:12 +02:00
|
|
|
start = voting_schedule.interval_starts =
|
|
|
|
dirvote_get_start_of_next_interval(now,interval);
|
2007-08-14 22:19:40 +02:00
|
|
|
end = dirvote_get_start_of_next_interval(start+1, interval);
|
|
|
|
|
|
|
|
tor_assert(end > start);
|
|
|
|
|
2007-09-21 21:11:52 +02:00
|
|
|
voting_schedule.fetch_missing_signatures = start - (dist_delay/2);
|
|
|
|
voting_schedule.voting_ends = start - dist_delay;
|
|
|
|
voting_schedule.fetch_missing_votes = start - dist_delay - (vote_delay/2);
|
|
|
|
voting_schedule.voting_starts = start - dist_delay - vote_delay;
|
2007-10-15 22:37:59 +02:00
|
|
|
|
|
|
|
{
|
|
|
|
char tbuf[ISO_TIME_LEN+1];
|
|
|
|
format_iso_time(tbuf, voting_schedule.interval_starts);
|
|
|
|
log_notice(LD_DIR,"Choosing expected valid-after time as %s: "
|
|
|
|
"consensus_set=%d, interval=%d",
|
|
|
|
tbuf, consensus?1:0, interval);
|
|
|
|
}
|
2007-07-30 01:11:44 +02:00
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Entry point: Take whatever voting actions are pending as of <b>now</b>. */
|
2007-07-30 01:11:44 +02:00
|
|
|
void
|
2007-10-18 16:27:42 +02:00
|
|
|
dirvote_act(or_options_t *options, time_t now)
|
2007-07-30 01:11:44 +02:00
|
|
|
{
|
2007-10-18 16:27:42 +02:00
|
|
|
if (!authdir_mode_v3(options))
|
|
|
|
return;
|
2007-08-15 19:07:27 +02:00
|
|
|
if (!voting_schedule.voting_starts) {
|
|
|
|
char *keys = list_v3_auth_ids();
|
|
|
|
authority_cert_t *c = get_my_v3_authority_cert();
|
2007-09-20 23:46:10 +02:00
|
|
|
log_notice(LD_DIR, "Scheduling voting. Known authority IDs are %s. "
|
2007-08-15 19:07:27 +02:00
|
|
|
"Mine is %s.",
|
|
|
|
keys, hex_str(c->cache_info.identity_digest, DIGEST_LEN));
|
|
|
|
tor_free(keys);
|
2007-10-18 16:27:42 +02:00
|
|
|
dirvote_recalculate_timing(options, now);
|
2007-08-15 19:07:27 +02:00
|
|
|
}
|
2007-07-30 01:11:44 +02:00
|
|
|
if (voting_schedule.voting_starts < now && !voting_schedule.have_voted) {
|
2007-08-14 01:23:06 +02:00
|
|
|
log_notice(LD_DIR, "Time to vote.");
|
2007-07-30 01:11:44 +02:00
|
|
|
dirvote_perform_vote();
|
|
|
|
voting_schedule.have_voted = 1;
|
|
|
|
}
|
2007-09-22 08:06:05 +02:00
|
|
|
if (voting_schedule.fetch_missing_votes < now &&
|
|
|
|
!voting_schedule.have_fetched_missing_votes) {
|
|
|
|
log_notice(LD_DIR, "Time to fetch any votes that we're missing.");
|
|
|
|
dirvote_fetch_missing_votes();
|
|
|
|
voting_schedule.have_fetched_missing_votes = 1;
|
|
|
|
}
|
2007-07-30 01:11:44 +02:00
|
|
|
if (voting_schedule.voting_ends < now &&
|
|
|
|
!voting_schedule.have_built_consensus) {
|
2007-08-14 01:23:06 +02:00
|
|
|
log_notice(LD_DIR, "Time to compute a consensus.");
|
2009-09-22 22:52:51 +02:00
|
|
|
dirvote_compute_consensuses();
|
2007-10-22 18:32:06 +02:00
|
|
|
/* XXXX We will want to try again later if we haven't got enough
|
|
|
|
* votes yet. Implement this if it turns out to ever happen. */
|
2007-07-30 01:11:44 +02:00
|
|
|
voting_schedule.have_built_consensus = 1;
|
|
|
|
}
|
2007-09-22 08:06:05 +02:00
|
|
|
if (voting_schedule.fetch_missing_signatures < now &&
|
|
|
|
!voting_schedule.have_fetched_missing_signatures) {
|
|
|
|
log_notice(LD_DIR, "Time to fetch any signatures that we're missing.");
|
|
|
|
dirvote_fetch_missing_signatures();
|
|
|
|
voting_schedule.have_fetched_missing_signatures = 1;
|
|
|
|
}
|
2007-07-30 01:11:44 +02:00
|
|
|
if (voting_schedule.interval_starts < now &&
|
|
|
|
!voting_schedule.have_published_consensus) {
|
2007-10-15 16:59:48 +02:00
|
|
|
log_notice(LD_DIR, "Time to publish the consensus and discard old votes");
|
2007-07-30 01:11:44 +02:00
|
|
|
dirvote_publish_consensus();
|
2007-10-15 16:59:48 +02:00
|
|
|
dirvote_clear_votes(0);
|
2007-10-15 21:51:14 +02:00
|
|
|
voting_schedule.have_published_consensus = 1;
|
2007-10-22 18:32:06 +02:00
|
|
|
/* XXXX We will want to try again later if we haven't got enough
|
|
|
|
* signatures yet. Implement this if it turns out to ever happen. */
|
2007-10-18 16:27:42 +02:00
|
|
|
dirvote_recalculate_timing(options, now);
|
2007-07-30 01:11:44 +02:00
|
|
|
}
|
2007-07-18 22:46:12 +02:00
|
|
|
}
|
|
|
|
|
2008-02-05 22:39:29 +01:00
|
|
|
/** A vote networkstatus_t and its unparsed body: held around so we can
|
2007-08-22 17:07:44 +02:00
|
|
|
* use it to generate a consensus (at voting_ends) and so we can serve it to
|
|
|
|
* other authorities that might want it. */
|
2007-07-26 00:56:44 +02:00
|
|
|
typedef struct pending_vote_t {
|
|
|
|
cached_dir_t *vote_body;
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *vote;
|
2007-07-26 00:56:44 +02:00
|
|
|
} pending_vote_t;
|
|
|
|
|
2007-10-02 22:19:43 +02:00
|
|
|
/** List of pending_vote_t for the current vote. Before we've used them to
|
|
|
|
* build a consensus, the votes go here. */
|
2007-07-26 00:56:44 +02:00
|
|
|
static smartlist_t *pending_vote_list = NULL;
|
2007-10-02 22:19:43 +02:00
|
|
|
/** List of pending_vote_t for the previous vote. After we've used them to
|
|
|
|
* build a consensus, the votes go here for the next period. */
|
|
|
|
static smartlist_t *previous_vote_list = NULL;
|
2009-09-22 22:52:51 +02:00
|
|
|
|
|
|
|
static pending_consensus_t pending_consensuses[N_CONSENSUS_FLAVORS];
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** The detached signatures for the consensus that we're currently
|
|
|
|
* building. */
|
2007-07-27 20:33:30 +02:00
|
|
|
static char *pending_consensus_signatures = NULL;
|
2009-09-22 22:52:51 +02:00
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** List of ns_detached_signatures_t: hold signatures that get posted to us
|
|
|
|
* before we have generated the consensus on our own. */
|
2007-07-27 20:33:34 +02:00
|
|
|
static smartlist_t *pending_consensus_signature_list = NULL;
|
2007-07-26 00:56:44 +02:00
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Generate a networkstatus vote and post it to all the v3 authorities.
|
|
|
|
* (V3 Authority only) */
|
2007-10-22 19:31:26 +02:00
|
|
|
static int
|
2007-07-26 00:56:44 +02:00
|
|
|
dirvote_perform_vote(void)
|
|
|
|
{
|
2007-10-22 19:31:26 +02:00
|
|
|
crypto_pk_env_t *key = get_my_v3_authority_signing_key();
|
|
|
|
authority_cert_t *cert = get_my_v3_authority_cert();
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *ns;
|
2007-10-22 19:31:26 +02:00
|
|
|
char *contents;
|
2007-07-26 00:56:44 +02:00
|
|
|
pending_vote_t *pending_vote;
|
2008-11-07 14:38:49 +01:00
|
|
|
time_t now = time(NULL);
|
2007-10-22 19:31:26 +02:00
|
|
|
|
2007-08-13 23:01:02 +02:00
|
|
|
int status;
|
2007-07-26 00:56:44 +02:00
|
|
|
const char *msg = "";
|
|
|
|
|
2007-10-22 19:31:26 +02:00
|
|
|
if (!cert || !key) {
|
|
|
|
log_warn(LD_NET, "Didn't find key/certificate to generate v3 vote");
|
|
|
|
return -1;
|
2008-11-07 15:17:46 +01:00
|
|
|
} else if (cert->expires < now) {
|
2008-11-07 14:38:49 +01:00
|
|
|
log_warn(LD_NET, "Can't generate v3 vote with expired certificate");
|
|
|
|
return -1;
|
2007-10-22 19:31:26 +02:00
|
|
|
}
|
|
|
|
if (!(ns = dirserv_generate_networkstatus_vote_obj(key, cert)))
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
contents = format_networkstatus_vote(key, ns);
|
|
|
|
networkstatus_vote_free(ns);
|
|
|
|
if (!contents)
|
|
|
|
return -1;
|
2007-08-13 22:05:25 +02:00
|
|
|
|
2007-10-22 19:31:26 +02:00
|
|
|
pending_vote = dirvote_add_vote(contents, &msg, &status);
|
|
|
|
tor_free(contents);
|
|
|
|
if (!pending_vote) {
|
2007-07-26 00:56:44 +02:00
|
|
|
log_warn(LD_DIR, "Couldn't store my own vote! (I told myself, '%s'.)",
|
|
|
|
msg);
|
2007-10-22 19:31:26 +02:00
|
|
|
return -1;
|
2007-07-26 00:56:44 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_VOTE,
|
|
|
|
ROUTER_PURPOSE_GENERAL,
|
|
|
|
V3_AUTHORITY,
|
|
|
|
pending_vote->vote_body->dir,
|
|
|
|
pending_vote->vote_body->dir_len, 0);
|
2007-08-14 01:23:06 +02:00
|
|
|
log_notice(LD_DIR, "Vote posted.");
|
2007-10-22 19:31:26 +02:00
|
|
|
return 0;
|
2007-07-26 00:56:44 +02:00
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Send an HTTP request to every other v3 authority, for the votes of every
|
|
|
|
* authority for which we haven't received a vote yet in this period. (V3
|
|
|
|
* authority only) */
|
2007-09-22 08:06:05 +02:00
|
|
|
static void
|
|
|
|
dirvote_fetch_missing_votes(void)
|
|
|
|
{
|
|
|
|
smartlist_t *missing_fps = smartlist_create();
|
|
|
|
char *resource;
|
|
|
|
|
|
|
|
SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
|
|
|
|
trusted_dir_server_t *, ds,
|
|
|
|
{
|
2007-09-26 01:35:28 +02:00
|
|
|
if (!(ds->type & V3_AUTHORITY))
|
2007-09-22 08:06:05 +02:00
|
|
|
continue;
|
2007-10-09 21:14:48 +02:00
|
|
|
if (!dirvote_get_vote(ds->v3_identity_digest,
|
|
|
|
DGV_BY_ID|DGV_INCLUDE_PENDING)) {
|
2007-09-22 08:06:05 +02:00
|
|
|
char *cp = tor_malloc(HEX_DIGEST_LEN+1);
|
|
|
|
base16_encode(cp, HEX_DIGEST_LEN+1, ds->v3_identity_digest,
|
|
|
|
DIGEST_LEN);
|
|
|
|
smartlist_add(missing_fps, cp);
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
if (!smartlist_len(missing_fps)) {
|
|
|
|
smartlist_free(missing_fps);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
log_notice(LOG_NOTICE, "We're missing votes from %d authorities. Asking "
|
|
|
|
"every other authority for a copy.", smartlist_len(missing_fps));
|
|
|
|
resource = smartlist_join_strings(missing_fps, "+", 0, NULL);
|
|
|
|
directory_get_from_all_authorities(DIR_PURPOSE_FETCH_STATUS_VOTE,
|
|
|
|
0, resource);
|
|
|
|
tor_free(resource);
|
|
|
|
SMARTLIST_FOREACH(missing_fps, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(missing_fps);
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Send a request to every other authority for its detached signatures,
|
|
|
|
* unless we have signatures from all other v3 authorities already. */
|
2007-09-22 08:06:05 +02:00
|
|
|
static void
|
|
|
|
dirvote_fetch_missing_signatures(void)
|
|
|
|
{
|
2009-09-22 22:52:51 +02:00
|
|
|
int need_any = 0;
|
|
|
|
int i;
|
|
|
|
for (i=0; i < N_CONSENSUS_FLAVORS; ++i) {
|
|
|
|
networkstatus_t *consensus = pending_consensuses[i].consensus;
|
|
|
|
if (!consensus ||
|
|
|
|
networkstatus_check_consensus_signature(consensus, -1) == 1) {
|
|
|
|
/* We have no consensus, or we have one that's signed by everybody. */
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
need_any = 1;
|
|
|
|
}
|
|
|
|
if (!need_any)
|
2007-09-22 08:06:05 +02:00
|
|
|
return;
|
|
|
|
|
|
|
|
directory_get_from_all_authorities(DIR_PURPOSE_FETCH_DETACHED_SIGNATURES,
|
|
|
|
0, NULL);
|
|
|
|
}
|
|
|
|
|
2009-10-15 22:06:00 +02:00
|
|
|
/** Release all storage held by pending consensuses (those waiting for
|
|
|
|
* signatures). */
|
2009-09-22 22:52:51 +02:00
|
|
|
static void
|
|
|
|
dirvote_clear_pending_consensuses(void)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < N_CONSENSUS_FLAVORS; ++i) {
|
|
|
|
pending_consensus_t *pc = &pending_consensuses[i];
|
|
|
|
tor_free(pc->body);
|
2009-12-12 08:07:59 +01:00
|
|
|
|
|
|
|
networkstatus_vote_free(pc->consensus);
|
|
|
|
pc->consensus = NULL;
|
2009-09-22 22:52:51 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Drop all currently pending votes, consensus, and detached signatures. */
|
2007-10-02 22:35:23 +02:00
|
|
|
static void
|
2007-10-02 22:19:43 +02:00
|
|
|
dirvote_clear_votes(int all_votes)
|
2007-07-26 00:56:44 +02:00
|
|
|
{
|
2007-10-02 22:19:43 +02:00
|
|
|
if (!previous_vote_list)
|
|
|
|
previous_vote_list = smartlist_create();
|
|
|
|
if (!pending_vote_list)
|
|
|
|
pending_vote_list = smartlist_create();
|
|
|
|
|
|
|
|
/* All "previous" votes are now junk. */
|
|
|
|
SMARTLIST_FOREACH(previous_vote_list, pending_vote_t *, v, {
|
|
|
|
cached_dir_decref(v->vote_body);
|
|
|
|
v->vote_body = NULL;
|
|
|
|
networkstatus_vote_free(v->vote);
|
|
|
|
tor_free(v);
|
|
|
|
});
|
|
|
|
smartlist_clear(previous_vote_list);
|
|
|
|
|
|
|
|
if (all_votes) {
|
|
|
|
/* If we're dumping all the votes, we delete the pending ones. */
|
2007-07-27 20:33:34 +02:00
|
|
|
SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, {
|
|
|
|
cached_dir_decref(v->vote_body);
|
|
|
|
v->vote_body = NULL;
|
|
|
|
networkstatus_vote_free(v->vote);
|
|
|
|
tor_free(v);
|
|
|
|
});
|
2007-10-02 22:19:43 +02:00
|
|
|
} else {
|
|
|
|
/* Otherwise, we move them into "previous". */
|
|
|
|
smartlist_add_all(previous_vote_list, pending_vote_list);
|
2007-07-27 20:33:34 +02:00
|
|
|
}
|
2007-10-02 22:19:43 +02:00
|
|
|
smartlist_clear(pending_vote_list);
|
|
|
|
|
2007-07-27 20:33:34 +02:00
|
|
|
if (pending_consensus_signature_list) {
|
|
|
|
SMARTLIST_FOREACH(pending_consensus_signature_list, char *, cp,
|
|
|
|
tor_free(cp));
|
|
|
|
smartlist_clear(pending_consensus_signature_list);
|
|
|
|
}
|
2007-08-14 16:30:45 +02:00
|
|
|
tor_free(pending_consensus_signatures);
|
2009-09-22 22:52:51 +02:00
|
|
|
dirvote_clear_pending_consensuses();
|
2007-07-26 00:56:44 +02:00
|
|
|
}
|
|
|
|
|
2007-10-10 21:33:11 +02:00
|
|
|
/** Return a newly allocated string containing the hex-encoded v3 authority
|
|
|
|
identity digest of every recognized v3 authority. */
|
2007-08-15 19:07:27 +02:00
|
|
|
static char *
|
|
|
|
list_v3_auth_ids(void)
|
|
|
|
{
|
|
|
|
smartlist_t *known_v3_keys = smartlist_create();
|
|
|
|
char *keys;
|
|
|
|
SMARTLIST_FOREACH(router_get_trusted_dir_servers(),
|
|
|
|
trusted_dir_server_t *, ds,
|
2007-10-10 21:33:11 +02:00
|
|
|
if ((ds->type & V3_AUTHORITY) &&
|
|
|
|
!tor_digest_is_zero(ds->v3_identity_digest))
|
|
|
|
smartlist_add(known_v3_keys,
|
|
|
|
tor_strdup(hex_str(ds->v3_identity_digest, DIGEST_LEN))));
|
2007-08-15 19:07:27 +02:00
|
|
|
keys = smartlist_join_strings(known_v3_keys, ", ", 0, NULL);
|
|
|
|
SMARTLIST_FOREACH(known_v3_keys, char *, cp, tor_free(cp));
|
|
|
|
smartlist_free(known_v3_keys);
|
|
|
|
return keys;
|
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Called when we have received a networkstatus vote in <b>vote_body</b>.
|
|
|
|
* Parse and validate it, and on success store it as a pending vote (which we
|
|
|
|
* then return). Return NULL on failure. Sets *<b>msg_out</b> and
|
|
|
|
* *<b>status_out</b> to an HTTP response and status code. (V3 authority
|
|
|
|
* only) */
|
2007-07-26 00:56:44 +02:00
|
|
|
pending_vote_t *
|
2007-08-13 23:01:02 +02:00
|
|
|
dirvote_add_vote(const char *vote_body, const char **msg_out, int *status_out)
|
2007-07-26 00:56:44 +02:00
|
|
|
{
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *vote;
|
2007-07-26 00:56:44 +02:00
|
|
|
networkstatus_voter_info_t *vi;
|
|
|
|
trusted_dir_server_t *ds;
|
|
|
|
pending_vote_t *pending_vote = NULL;
|
2007-09-22 08:06:05 +02:00
|
|
|
const char *end_of_vote = NULL;
|
|
|
|
int any_failed = 0;
|
2007-07-26 00:56:44 +02:00
|
|
|
tor_assert(vote_body);
|
|
|
|
tor_assert(msg_out);
|
2007-08-13 23:01:02 +02:00
|
|
|
tor_assert(status_out);
|
2007-07-26 00:56:44 +02:00
|
|
|
|
|
|
|
if (!pending_vote_list)
|
|
|
|
pending_vote_list = smartlist_create();
|
2007-10-09 19:07:13 +02:00
|
|
|
*status_out = 0;
|
2007-07-26 00:56:44 +02:00
|
|
|
*msg_out = NULL;
|
|
|
|
|
2007-09-22 08:06:05 +02:00
|
|
|
again:
|
2008-07-24 11:22:27 +02:00
|
|
|
vote = networkstatus_parse_vote_from_string(vote_body, &end_of_vote,
|
|
|
|
NS_TYPE_VOTE);
|
2007-10-09 21:31:14 +02:00
|
|
|
if (!end_of_vote)
|
|
|
|
end_of_vote = vote_body + strlen(vote_body);
|
2007-07-26 00:56:44 +02:00
|
|
|
if (!vote) {
|
2007-10-09 20:43:05 +02:00
|
|
|
log_warn(LD_DIR, "Couldn't parse vote: length was %d",
|
|
|
|
(int)strlen(vote_body));
|
2007-07-26 00:56:44 +02:00
|
|
|
*msg_out = "Unable to parse vote";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
tor_assert(smartlist_len(vote->voters) == 1);
|
2007-08-15 17:38:58 +02:00
|
|
|
vi = get_voter(vote);
|
2009-09-16 23:01:01 +02:00
|
|
|
{
|
|
|
|
int any_sig_good = 0;
|
|
|
|
SMARTLIST_FOREACH(vi->sigs, document_signature_t *, sig,
|
|
|
|
if (sig->good_signature)
|
|
|
|
any_sig_good = 1);
|
|
|
|
tor_assert(any_sig_good);
|
|
|
|
}
|
2007-07-26 00:56:44 +02:00
|
|
|
ds = trusteddirserver_get_by_v3_auth_digest(vi->identity_digest);
|
2007-10-26 16:57:26 +02:00
|
|
|
if (!ds) {
|
2007-08-15 19:07:27 +02:00
|
|
|
char *keys = list_v3_auth_ids();
|
2007-12-04 16:54:14 +01:00
|
|
|
log_warn(LD_DIR, "Got a vote from an authority (nickname %s, address %s) "
|
|
|
|
"with authority key ID %s. "
|
2007-10-26 16:57:26 +02:00
|
|
|
"This key ID is not recognized. Known v3 key IDs are: %s",
|
2007-12-04 16:54:14 +01:00
|
|
|
vi->nickname, vi->address,
|
2007-10-26 16:57:26 +02:00
|
|
|
hex_str(vi->identity_digest, DIGEST_LEN), keys);
|
2007-08-15 19:07:27 +02:00
|
|
|
tor_free(keys);
|
2007-07-26 00:56:44 +02:00
|
|
|
*msg_out = "Vote not from a recognized v3 authority";
|
|
|
|
goto err;
|
|
|
|
}
|
2007-07-28 02:11:34 +02:00
|
|
|
tor_assert(vote->cert);
|
|
|
|
if (!authority_cert_get_by_digests(vote->cert->cache_info.identity_digest,
|
|
|
|
vote->cert->signing_key_digest)) {
|
|
|
|
/* Hey, it's a new cert! */
|
|
|
|
trusted_dirs_load_certs_from_string(
|
|
|
|
vote->cert->cache_info.signed_descriptor_body,
|
2008-02-21 00:20:36 +01:00
|
|
|
0 /* from_store */, 1 /*flush*/);
|
2007-08-14 15:34:35 +02:00
|
|
|
if (!authority_cert_get_by_digests(vote->cert->cache_info.identity_digest,
|
|
|
|
vote->cert->signing_key_digest)) {
|
|
|
|
log_warn(LD_BUG, "We added a cert, but still couldn't find it.");
|
|
|
|
}
|
2007-07-28 02:11:34 +02:00
|
|
|
}
|
|
|
|
|
2007-09-11 22:17:20 +02:00
|
|
|
/* Is it for the right period? */
|
|
|
|
if (vote->valid_after != voting_schedule.interval_starts) {
|
|
|
|
char tbuf1[ISO_TIME_LEN+1], tbuf2[ISO_TIME_LEN+1];
|
|
|
|
format_iso_time(tbuf1, vote->valid_after);
|
|
|
|
format_iso_time(tbuf2, voting_schedule.interval_starts);
|
2008-01-24 20:48:16 +01:00
|
|
|
log_warn(LD_DIR, "Rejecting vote from %s with valid-after time of %s; "
|
|
|
|
"we were expecting %s", vi->address, tbuf1, tbuf2);
|
2007-09-11 22:17:20 +02:00
|
|
|
*msg_out = "Bad valid-after time";
|
|
|
|
goto err;
|
|
|
|
}
|
2007-07-26 00:56:44 +02:00
|
|
|
|
2008-09-30 01:13:43 +02:00
|
|
|
/* Now see whether we already have a vote from this authority. */
|
2007-07-26 00:56:44 +02:00
|
|
|
SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, {
|
|
|
|
if (! memcmp(v->vote->cert->cache_info.identity_digest,
|
|
|
|
vote->cert->cache_info.identity_digest,
|
|
|
|
DIGEST_LEN)) {
|
2007-08-15 17:38:58 +02:00
|
|
|
networkstatus_voter_info_t *vi_old = get_voter(v->vote);
|
2007-08-13 22:45:36 +02:00
|
|
|
if (!memcmp(vi_old->vote_digest, vi->vote_digest, DIGEST_LEN)) {
|
|
|
|
/* Ah, it's the same vote. Not a problem. */
|
|
|
|
log_info(LD_DIR, "Discarding a vote we already have.");
|
2007-10-09 19:07:13 +02:00
|
|
|
if (*status_out < 200)
|
|
|
|
*status_out = 200;
|
|
|
|
goto discard;
|
2007-08-13 22:45:36 +02:00
|
|
|
} else if (v->vote->published < vote->published) {
|
|
|
|
log_notice(LD_DIR, "Replacing an older pending vote from this "
|
|
|
|
"directory.");
|
2007-07-26 00:56:44 +02:00
|
|
|
cached_dir_decref(v->vote_body);
|
|
|
|
networkstatus_vote_free(v->vote);
|
2007-10-09 21:31:14 +02:00
|
|
|
v->vote_body = new_cached_dir(tor_strndup(vote_body,
|
|
|
|
end_of_vote-vote_body),
|
2007-07-26 00:56:50 +02:00
|
|
|
vote->published);
|
2007-07-26 00:56:44 +02:00
|
|
|
v->vote = vote;
|
2007-09-26 01:57:12 +02:00
|
|
|
if (end_of_vote &&
|
|
|
|
!strcmpstart(end_of_vote, "network-status-version"))
|
|
|
|
goto again;
|
|
|
|
|
2007-10-09 19:07:13 +02:00
|
|
|
if (*status_out < 200)
|
2007-09-26 01:57:12 +02:00
|
|
|
*status_out = 200;
|
2007-10-09 19:07:13 +02:00
|
|
|
if (!*msg_out)
|
|
|
|
*msg_out = "OK";
|
2007-07-26 00:56:44 +02:00
|
|
|
return v;
|
|
|
|
} else {
|
|
|
|
*msg_out = "Already have a newer pending vote";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
}
|
2010-04-20 08:48:35 +02:00
|
|
|
});
|
2007-07-26 00:56:44 +02:00
|
|
|
|
|
|
|
pending_vote = tor_malloc_zero(sizeof(pending_vote_t));
|
2007-10-09 21:31:14 +02:00
|
|
|
pending_vote->vote_body = new_cached_dir(tor_strndup(vote_body,
|
|
|
|
end_of_vote-vote_body),
|
2007-07-26 00:56:50 +02:00
|
|
|
vote->published);
|
2007-07-26 00:56:44 +02:00
|
|
|
pending_vote->vote = vote;
|
|
|
|
smartlist_add(pending_vote_list, pending_vote);
|
2007-09-22 08:06:05 +02:00
|
|
|
|
2007-10-09 21:31:14 +02:00
|
|
|
if (!strcmpstart(end_of_vote, "network-status-version ")) {
|
|
|
|
vote_body = end_of_vote;
|
2007-09-22 08:06:05 +02:00
|
|
|
goto again;
|
2007-10-09 21:31:14 +02:00
|
|
|
}
|
2007-09-22 08:06:05 +02:00
|
|
|
|
2007-10-09 19:07:13 +02:00
|
|
|
goto done;
|
2007-09-22 08:06:05 +02:00
|
|
|
|
2007-07-26 00:56:44 +02:00
|
|
|
err:
|
2007-09-22 08:06:05 +02:00
|
|
|
any_failed = 1;
|
2007-07-26 00:56:44 +02:00
|
|
|
if (!*msg_out)
|
|
|
|
*msg_out = "Error adding vote";
|
2007-10-09 19:07:13 +02:00
|
|
|
if (*status_out < 400)
|
2007-08-13 23:01:02 +02:00
|
|
|
*status_out = 400;
|
2007-09-22 08:06:05 +02:00
|
|
|
|
2007-10-09 19:07:13 +02:00
|
|
|
discard:
|
2009-12-12 08:07:59 +01:00
|
|
|
networkstatus_vote_free(vote);
|
2007-10-09 19:07:13 +02:00
|
|
|
|
2007-10-09 21:31:14 +02:00
|
|
|
if (end_of_vote && !strcmpstart(end_of_vote, "network-status-version ")) {
|
|
|
|
vote_body = end_of_vote;
|
2007-09-22 08:06:05 +02:00
|
|
|
goto again;
|
2007-10-09 21:31:14 +02:00
|
|
|
}
|
2007-10-09 19:07:13 +02:00
|
|
|
|
|
|
|
done:
|
|
|
|
|
|
|
|
if (*status_out < 200)
|
|
|
|
*status_out = 200;
|
2007-10-16 17:34:14 +02:00
|
|
|
if (!*msg_out) {
|
|
|
|
if (!any_failed && !pending_vote) {
|
|
|
|
*msg_out = "Duplicate discarded";
|
|
|
|
} else {
|
|
|
|
*msg_out = "ok";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-09 19:07:13 +02:00
|
|
|
return any_failed ? NULL : pending_vote;
|
2007-07-26 00:56:44 +02:00
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Try to compute a v3 networkstatus consensus from the currently pending
|
|
|
|
* votes. Return 0 on success, -1 on failure. Store the consensus in
|
|
|
|
* pending_consensus: it won't be ready to be published until we have
|
2008-09-30 01:13:43 +02:00
|
|
|
* everybody else's signatures collected too. (V3 Authority only) */
|
2007-10-02 22:35:23 +02:00
|
|
|
static int
|
2009-09-22 22:52:51 +02:00
|
|
|
dirvote_compute_consensuses(void)
|
2007-07-26 00:56:44 +02:00
|
|
|
{
|
|
|
|
/* Have we got enough votes to try? */
|
2009-10-27 03:27:54 +01:00
|
|
|
int n_votes, n_voters, n_vote_running = 0;
|
2008-09-30 01:13:43 +02:00
|
|
|
smartlist_t *votes = NULL, *votestrings = NULL;
|
|
|
|
char *consensus_body = NULL, *signatures = NULL, *votefile;
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *consensus = NULL;
|
2007-07-26 00:56:44 +02:00
|
|
|
authority_cert_t *my_cert;
|
2009-09-22 22:52:51 +02:00
|
|
|
pending_consensus_t pending[N_CONSENSUS_FLAVORS];
|
|
|
|
int flav;
|
|
|
|
|
|
|
|
memset(pending, 0, sizeof(pending));
|
2007-07-26 00:56:44 +02:00
|
|
|
|
|
|
|
if (!pending_vote_list)
|
|
|
|
pending_vote_list = smartlist_create();
|
|
|
|
|
|
|
|
n_voters = get_n_authorities(V3_AUTHORITY);
|
|
|
|
n_votes = smartlist_len(pending_vote_list);
|
2007-08-14 04:23:57 +02:00
|
|
|
if (n_votes <= n_voters/2) {
|
2008-02-06 13:46:46 +01:00
|
|
|
log_warn(LD_DIR, "We don't have enough votes to generate a consensus: "
|
|
|
|
"%d of %d", n_votes, n_voters/2);
|
2007-08-14 04:23:57 +02:00
|
|
|
goto err;
|
|
|
|
}
|
2009-10-27 03:27:54 +01:00
|
|
|
tor_assert(pending_vote_list);
|
|
|
|
SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, {
|
|
|
|
if (smartlist_string_isin(v->vote->known_flags, "Running"))
|
|
|
|
n_vote_running++;
|
|
|
|
});
|
|
|
|
if (!n_vote_running) {
|
|
|
|
/* See task 1066. */
|
|
|
|
log_warn(LD_DIR, "Nobody has voted on the Running flag. Generating "
|
|
|
|
"and publishing a consensus without Running nodes "
|
|
|
|
"would make many clients stop working. Not "
|
|
|
|
"generating a consensus!");
|
|
|
|
goto err;
|
|
|
|
}
|
2007-07-26 00:56:44 +02:00
|
|
|
|
|
|
|
if (!(my_cert = get_my_v3_authority_cert())) {
|
|
|
|
log_warn(LD_DIR, "Can't generate consensus without a certificate.");
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
votes = smartlist_create();
|
2008-09-30 01:13:43 +02:00
|
|
|
votestrings = smartlist_create();
|
2007-07-26 00:56:44 +02:00
|
|
|
SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v,
|
2008-09-30 01:13:43 +02:00
|
|
|
{
|
|
|
|
sized_chunk_t *c = tor_malloc(sizeof(sized_chunk_t));
|
|
|
|
c->bytes = v->vote_body->dir;
|
|
|
|
c->len = v->vote_body->dir_len;
|
|
|
|
smartlist_add(votestrings, c); /* collect strings to write to disk */
|
|
|
|
|
|
|
|
smartlist_add(votes, v->vote); /* collect votes to compute consensus */
|
|
|
|
});
|
|
|
|
|
|
|
|
votefile = get_datadir_fname("v3-status-votes");
|
|
|
|
write_chunks_to_file(votefile, votestrings, 0);
|
|
|
|
tor_free(votefile);
|
|
|
|
SMARTLIST_FOREACH(votestrings, sized_chunk_t *, c, tor_free(c));
|
|
|
|
smartlist_free(votestrings);
|
2007-07-26 00:56:44 +02:00
|
|
|
|
2008-05-12 06:22:01 +02:00
|
|
|
{
|
|
|
|
char legacy_dbuf[DIGEST_LEN];
|
|
|
|
crypto_pk_env_t *legacy_sign=NULL;
|
|
|
|
char *legacy_id_digest = NULL;
|
2009-09-22 22:52:51 +02:00
|
|
|
int n_generated = 0;
|
2008-05-12 06:22:01 +02:00
|
|
|
if (get_options()->V3AuthUseLegacyKey) {
|
|
|
|
authority_cert_t *cert = get_my_v3_legacy_cert();
|
|
|
|
legacy_sign = get_my_v3_legacy_signing_key();
|
|
|
|
if (cert) {
|
|
|
|
crypto_pk_get_digest(cert->identity_key, legacy_dbuf);
|
|
|
|
legacy_id_digest = legacy_dbuf;
|
|
|
|
}
|
|
|
|
}
|
2009-09-22 22:52:51 +02:00
|
|
|
|
|
|
|
for (flav = 0; flav < N_CONSENSUS_FLAVORS; ++flav) {
|
|
|
|
const char *flavor_name = networkstatus_get_flavor_name(flav);
|
|
|
|
consensus_body = networkstatus_compute_consensus(
|
2007-07-26 00:56:44 +02:00
|
|
|
votes, n_voters,
|
|
|
|
my_cert->identity_key,
|
2009-08-24 18:51:33 +02:00
|
|
|
get_my_v3_authority_signing_key(), legacy_id_digest, legacy_sign,
|
2009-09-22 22:52:51 +02:00
|
|
|
flav);
|
|
|
|
|
|
|
|
if (!consensus_body) {
|
|
|
|
log_warn(LD_DIR, "Couldn't generate a %s consensus at all!",
|
|
|
|
flavor_name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
consensus = networkstatus_parse_vote_from_string(consensus_body, NULL,
|
|
|
|
NS_TYPE_CONSENSUS);
|
|
|
|
if (!consensus) {
|
|
|
|
log_warn(LD_DIR, "Couldn't parse %s consensus we generated!",
|
|
|
|
flavor_name);
|
|
|
|
tor_free(consensus_body);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* 'Check' our own signature, to mark it valid. */
|
|
|
|
networkstatus_check_consensus_signature(consensus, -1);
|
|
|
|
|
|
|
|
pending[flav].body = consensus_body;
|
|
|
|
pending[flav].consensus = consensus;
|
|
|
|
n_generated++;
|
|
|
|
consensus_body = NULL;
|
|
|
|
consensus = NULL;
|
|
|
|
}
|
|
|
|
if (!n_generated) {
|
|
|
|
log_warn(LD_DIR, "Couldn't generate any consensus flavors at all.");
|
|
|
|
goto err;
|
|
|
|
}
|
2007-07-26 22:26:59 +02:00
|
|
|
}
|
2007-08-14 18:39:18 +02:00
|
|
|
|
2009-09-23 09:02:32 +02:00
|
|
|
signatures = get_detached_signatures_from_pending_consensuses(
|
|
|
|
pending, N_CONSENSUS_FLAVORS);
|
2009-09-22 22:52:51 +02:00
|
|
|
|
2007-07-27 20:33:30 +02:00
|
|
|
if (!signatures) {
|
|
|
|
log_warn(LD_DIR, "Couldn't extract signatures.");
|
|
|
|
goto err;
|
|
|
|
}
|
2007-07-26 22:26:59 +02:00
|
|
|
|
2009-09-22 22:52:51 +02:00
|
|
|
dirvote_clear_pending_consensuses();
|
|
|
|
memcpy(pending_consensuses, pending, sizeof(pending));
|
|
|
|
|
2007-07-27 20:33:30 +02:00
|
|
|
tor_free(pending_consensus_signatures);
|
|
|
|
pending_consensus_signatures = signatures;
|
2007-07-26 00:56:44 +02:00
|
|
|
|
2007-07-30 01:11:44 +02:00
|
|
|
if (pending_consensus_signature_list) {
|
2007-08-14 04:23:57 +02:00
|
|
|
int n_sigs = 0;
|
2007-07-30 01:11:44 +02:00
|
|
|
/* we may have gotten signatures for this consensus before we built
|
|
|
|
* it ourself. Add them now. */
|
|
|
|
SMARTLIST_FOREACH(pending_consensus_signature_list, char *, sig,
|
|
|
|
{
|
|
|
|
const char *msg = NULL;
|
2009-09-22 22:52:51 +02:00
|
|
|
int r = dirvote_add_signatures_to_all_pending_consensuses(sig, &msg);
|
2008-01-09 02:06:19 +01:00
|
|
|
if (r >= 0)
|
|
|
|
n_sigs += r;
|
2008-01-24 21:00:37 +01:00
|
|
|
else
|
|
|
|
log_warn(LD_DIR,
|
|
|
|
"Could not add queued signature to new consensus: %s",
|
|
|
|
msg);
|
2007-07-30 01:11:44 +02:00
|
|
|
tor_free(sig);
|
|
|
|
});
|
2007-08-14 04:23:57 +02:00
|
|
|
if (n_sigs)
|
|
|
|
log_notice(LD_DIR, "Added %d pending signatures while building "
|
|
|
|
"consensus.", n_sigs);
|
2007-07-30 01:11:44 +02:00
|
|
|
smartlist_clear(pending_consensus_signature_list);
|
|
|
|
}
|
|
|
|
|
2007-08-14 16:30:45 +02:00
|
|
|
log_notice(LD_DIR, "Consensus computed; uploading signature(s)");
|
|
|
|
|
|
|
|
directory_post_to_dirservers(DIR_PURPOSE_UPLOAD_SIGNATURES,
|
|
|
|
ROUTER_PURPOSE_GENERAL,
|
|
|
|
V3_AUTHORITY,
|
|
|
|
pending_consensus_signatures,
|
|
|
|
strlen(pending_consensus_signatures), 0);
|
|
|
|
log_notice(LD_DIR, "Signature(s) posted.");
|
|
|
|
|
2007-07-26 00:56:44 +02:00
|
|
|
return 0;
|
|
|
|
err:
|
2009-12-12 08:07:59 +01:00
|
|
|
smartlist_free(votes);
|
2007-07-26 22:26:59 +02:00
|
|
|
tor_free(consensus_body);
|
2007-07-27 20:33:30 +02:00
|
|
|
tor_free(signatures);
|
2007-07-26 22:26:59 +02:00
|
|
|
networkstatus_vote_free(consensus);
|
|
|
|
|
2007-07-26 00:56:44 +02:00
|
|
|
return -1;
|
|
|
|
}
|
2007-07-26 00:56:50 +02:00
|
|
|
|
2008-01-09 02:06:19 +01:00
|
|
|
/** Helper: we just got the <b>detached_signatures_body</b> sent to us as
|
2009-09-22 22:52:51 +02:00
|
|
|
* signatures on the currently pending consensus. Add them to <b>pc</b>
|
2007-08-22 17:07:44 +02:00
|
|
|
* as appropriate. Return the number of signatures added. (?) */
|
2007-07-27 20:33:34 +02:00
|
|
|
static int
|
|
|
|
dirvote_add_signatures_to_pending_consensus(
|
2009-09-22 22:52:51 +02:00
|
|
|
pending_consensus_t *pc,
|
|
|
|
ns_detached_signatures_t *sigs,
|
2007-07-27 20:33:34 +02:00
|
|
|
const char **msg_out)
|
|
|
|
{
|
2009-09-22 22:52:51 +02:00
|
|
|
const char *flavor_name;
|
2007-09-12 19:33:18 +02:00
|
|
|
int r = -1;
|
2007-07-27 20:33:34 +02:00
|
|
|
|
|
|
|
/* Only call if we have a pending consensus right now. */
|
2009-09-22 22:52:51 +02:00
|
|
|
tor_assert(pc->consensus);
|
|
|
|
tor_assert(pc->body);
|
2007-07-27 20:33:34 +02:00
|
|
|
tor_assert(pending_consensus_signatures);
|
|
|
|
|
2009-09-22 22:52:51 +02:00
|
|
|
flavor_name = networkstatus_get_flavor_name(pc->consensus->flavor);
|
2007-07-27 20:33:34 +02:00
|
|
|
*msg_out = NULL;
|
|
|
|
|
2009-09-16 23:01:01 +02:00
|
|
|
{
|
2009-09-22 22:52:51 +02:00
|
|
|
smartlist_t *sig_list = strmap_get(sigs->signatures, flavor_name);
|
|
|
|
log_info(LD_DIR, "Have %d signatures for adding to %s consensus.",
|
|
|
|
sig_list ? smartlist_len(sig_list) : 0, flavor_name);
|
2009-09-16 23:01:01 +02:00
|
|
|
}
|
2009-09-22 22:52:51 +02:00
|
|
|
r = networkstatus_add_detached_signatures(pc->consensus, sigs, msg_out);
|
2008-01-24 21:00:37 +01:00
|
|
|
log_info(LD_DIR,"Added %d signatures to consensus.", r);
|
2007-08-15 18:12:40 +02:00
|
|
|
|
2008-11-11 17:52:07 +01:00
|
|
|
if (r >= 1) {
|
2009-09-22 22:52:51 +02:00
|
|
|
char *new_signatures =
|
2009-09-23 09:02:32 +02:00
|
|
|
networkstatus_format_signatures(pc->consensus, 0);
|
2008-02-20 17:57:39 +01:00
|
|
|
char *dst, *dst_end;
|
2008-11-11 18:14:12 +01:00
|
|
|
size_t new_consensus_len;
|
2009-09-22 22:52:51 +02:00
|
|
|
if (!new_signatures) {
|
2008-11-11 18:14:12 +01:00
|
|
|
*msg_out = "No signatures to add";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
new_consensus_len =
|
2009-09-22 22:52:51 +02:00
|
|
|
strlen(pc->body) + strlen(new_signatures) + 1;
|
|
|
|
pc->body = tor_realloc(pc->body, new_consensus_len);
|
|
|
|
dst_end = pc->body + new_consensus_len;
|
|
|
|
dst = strstr(pc->body, "directory-signature ");
|
2007-08-15 18:12:40 +02:00
|
|
|
tor_assert(dst);
|
2009-09-22 22:52:51 +02:00
|
|
|
strlcpy(dst, new_signatures, dst_end-dst);
|
2007-08-15 18:12:40 +02:00
|
|
|
|
2007-10-22 18:32:06 +02:00
|
|
|
/* We remove this block once it has failed to crash for a while. But
|
|
|
|
* unless it shows up in profiles, we're probably better leaving it in,
|
|
|
|
* just in case we break detached signature processing at some point. */
|
2007-08-15 18:12:40 +02:00
|
|
|
{
|
2008-02-05 22:39:29 +01:00
|
|
|
networkstatus_t *v = networkstatus_parse_vote_from_string(
|
2009-09-22 22:52:51 +02:00
|
|
|
pc->body, NULL,
|
2008-07-24 11:22:27 +02:00
|
|
|
NS_TYPE_CONSENSUS);
|
2007-08-15 18:12:40 +02:00
|
|
|
tor_assert(v);
|
|
|
|
networkstatus_vote_free(v);
|
|
|
|
}
|
2007-10-10 01:02:02 +02:00
|
|
|
*msg_out = "Signatures added";
|
2008-12-02 20:13:23 +01:00
|
|
|
} else if (r == 0) {
|
|
|
|
*msg_out = "Signatures ignored";
|
2007-10-10 01:02:02 +02:00
|
|
|
} else {
|
2007-10-19 18:41:32 +02:00
|
|
|
goto err;
|
2007-08-15 18:12:40 +02:00
|
|
|
}
|
2007-07-27 20:33:34 +02:00
|
|
|
|
2009-09-22 22:52:51 +02:00
|
|
|
goto done;
|
|
|
|
err:
|
|
|
|
if (!*msg_out)
|
|
|
|
*msg_out = "Unrecognized error while adding detached signatures.";
|
|
|
|
done:
|
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int
|
|
|
|
dirvote_add_signatures_to_all_pending_consensuses(
|
|
|
|
const char *detached_signatures_body,
|
|
|
|
const char **msg_out)
|
|
|
|
{
|
|
|
|
int r=0, i, n_added = 0, errors = 0;
|
|
|
|
ns_detached_signatures_t *sigs;
|
|
|
|
tor_assert(detached_signatures_body);
|
|
|
|
tor_assert(msg_out);
|
2009-09-23 09:02:32 +02:00
|
|
|
tor_assert(pending_consensus_signatures);
|
2009-09-22 22:52:51 +02:00
|
|
|
|
|
|
|
if (!(sigs = networkstatus_parse_detached_signatures(
|
|
|
|
detached_signatures_body, NULL))) {
|
|
|
|
*msg_out = "Couldn't parse detached signatures.";
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < N_CONSENSUS_FLAVORS; ++i) {
|
|
|
|
int res;
|
|
|
|
pending_consensus_t *pc = &pending_consensuses[i];
|
|
|
|
if (!pc->consensus)
|
|
|
|
continue;
|
|
|
|
res = dirvote_add_signatures_to_pending_consensus(pc, sigs, msg_out);
|
|
|
|
if (res < 0)
|
|
|
|
errors++;
|
|
|
|
else
|
|
|
|
n_added += res;
|
|
|
|
}
|
|
|
|
|
2009-11-17 20:24:59 +01:00
|
|
|
if (errors && !n_added) {
|
2009-09-22 22:52:51 +02:00
|
|
|
r = -1;
|
|
|
|
goto err;
|
|
|
|
}
|
|
|
|
|
2009-09-23 09:02:32 +02:00
|
|
|
if (n_added && pending_consensuses[FLAV_NS].consensus) {
|
|
|
|
char *new_detached =
|
|
|
|
get_detached_signatures_from_pending_consensuses(
|
|
|
|
pending_consensuses, N_CONSENSUS_FLAVORS);
|
2009-09-22 22:52:51 +02:00
|
|
|
if (new_detached) {
|
|
|
|
tor_free(pending_consensus_signatures);
|
|
|
|
pending_consensus_signatures = new_detached;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
r = n_added;
|
2007-07-27 20:33:34 +02:00
|
|
|
goto done;
|
|
|
|
err:
|
2008-12-02 20:13:23 +01:00
|
|
|
if (!*msg_out)
|
2007-07-27 20:33:34 +02:00
|
|
|
*msg_out = "Unrecognized error while adding detached signatures.";
|
|
|
|
done:
|
2009-12-12 08:07:59 +01:00
|
|
|
ns_detached_signatures_free(sigs);
|
2009-09-22 22:52:51 +02:00
|
|
|
/* XXXX NM Check how return is used. We can now have an error *and*
|
|
|
|
signatures added. */
|
2007-07-27 20:33:34 +02:00
|
|
|
return r;
|
|
|
|
}
|
|
|
|
|
2009-05-27 23:55:51 +02:00
|
|
|
/** Helper: we just got the <b>detached_signatures_body</b> sent to us as
|
2007-08-22 17:07:44 +02:00
|
|
|
* signatures on the currently pending consensus. Add them to the pending
|
|
|
|
* consensus (if we have one); otherwise queue them until we have a
|
2007-10-10 01:02:02 +02:00
|
|
|
* consensus. Return negative on failure, nonnegative on success. */
|
2007-07-27 20:33:34 +02:00
|
|
|
int
|
2007-10-10 01:02:02 +02:00
|
|
|
dirvote_add_signatures(const char *detached_signatures_body,
|
2008-01-23 09:38:05 +01:00
|
|
|
const char *source,
|
2007-10-10 01:02:02 +02:00
|
|
|
const char **msg)
|
2007-07-27 20:33:34 +02:00
|
|
|
{
|
2009-09-22 22:52:51 +02:00
|
|
|
if (pending_consensuses[FLAV_NS].consensus) {
|
2008-01-23 09:45:14 +01:00
|
|
|
log_notice(LD_DIR, "Got a signature from %s. "
|
|
|
|
"Adding it to the pending consensus.", source);
|
2009-09-22 22:52:51 +02:00
|
|
|
return dirvote_add_signatures_to_all_pending_consensuses(
|
2007-10-10 01:02:02 +02:00
|
|
|
detached_signatures_body, msg);
|
2007-07-27 20:33:34 +02:00
|
|
|
} else {
|
2008-01-23 09:45:14 +01:00
|
|
|
log_notice(LD_DIR, "Got a signature from %s. "
|
2009-05-27 23:55:51 +02:00
|
|
|
"Queuing it for the next consensus.", source);
|
2007-07-27 20:33:34 +02:00
|
|
|
if (!pending_consensus_signature_list)
|
|
|
|
pending_consensus_signature_list = smartlist_create();
|
|
|
|
smartlist_add(pending_consensus_signature_list,
|
|
|
|
tor_strdup(detached_signatures_body));
|
2007-10-10 01:02:02 +02:00
|
|
|
*msg = "Signature queued";
|
2007-07-27 20:33:34 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Replace the consensus that we're currently serving with the one that we've
|
|
|
|
* been building. (V3 Authority only) */
|
2007-10-02 22:35:23 +02:00
|
|
|
static int
|
2007-07-30 01:11:44 +02:00
|
|
|
dirvote_publish_consensus(void)
|
|
|
|
{
|
2009-10-13 23:06:01 +02:00
|
|
|
int i;
|
2007-07-30 01:11:44 +02:00
|
|
|
|
2009-10-13 23:06:01 +02:00
|
|
|
/* Now remember all the other consensuses as if we were a directory cache. */
|
|
|
|
for (i = 0; i < N_CONSENSUS_FLAVORS; ++i) {
|
|
|
|
pending_consensus_t *pending = &pending_consensuses[i];
|
|
|
|
const char *name;
|
|
|
|
name = networkstatus_get_flavor_name(i);
|
|
|
|
tor_assert(name);
|
|
|
|
if (!pending->consensus ||
|
|
|
|
networkstatus_check_consensus_signature(pending->consensus, 1)<0) {
|
|
|
|
log_warn(LD_DIR, "Not enough info to publish pending %s consensus",name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (networkstatus_set_current_consensus(pending->body, name, 0))
|
|
|
|
log_warn(LD_DIR, "Error publishing %s consensus", name);
|
|
|
|
else
|
|
|
|
log_notice(LD_DIR, "Published %s consensus", name);
|
|
|
|
}
|
2007-08-14 16:30:45 +02:00
|
|
|
|
2007-07-30 01:11:44 +02:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-07-27 20:33:30 +02:00
|
|
|
/** Release all static storage held in dirvote.c */
|
|
|
|
void
|
|
|
|
dirvote_free_all(void)
|
|
|
|
{
|
2007-10-02 22:19:43 +02:00
|
|
|
dirvote_clear_votes(1);
|
|
|
|
/* now empty as a result of clear_pending_votes. */
|
|
|
|
smartlist_free(pending_vote_list);
|
|
|
|
pending_vote_list = NULL;
|
|
|
|
smartlist_free(previous_vote_list);
|
|
|
|
previous_vote_list = NULL;
|
|
|
|
|
2009-09-22 22:52:51 +02:00
|
|
|
dirvote_clear_pending_consensuses();
|
2007-07-27 20:33:30 +02:00
|
|
|
tor_free(pending_consensus_signatures);
|
2007-07-27 20:33:34 +02:00
|
|
|
if (pending_consensus_signature_list) {
|
|
|
|
/* now empty as a result of clear_pending_votes. */
|
|
|
|
smartlist_free(pending_consensus_signature_list);
|
|
|
|
pending_consensus_signature_list = NULL;
|
|
|
|
}
|
2007-07-27 20:33:30 +02:00
|
|
|
}
|
2007-07-30 01:18:06 +02:00
|
|
|
|
2007-08-15 21:55:52 +02:00
|
|
|
/* ====
|
|
|
|
* Access to pending items.
|
|
|
|
* ==== */
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Return the body of the consensus that we're currently trying to build. */
|
2007-08-15 21:55:52 +02:00
|
|
|
const char *
|
2009-09-22 22:52:51 +02:00
|
|
|
dirvote_get_pending_consensus(consensus_flavor_t flav)
|
2007-08-15 21:55:52 +02:00
|
|
|
{
|
2009-09-22 22:52:51 +02:00
|
|
|
tor_assert(((int)flav) >= 0 && flav < N_CONSENSUS_FLAVORS);
|
|
|
|
return pending_consensuses[flav].body;
|
2007-08-15 21:55:52 +02:00
|
|
|
}
|
|
|
|
|
2007-08-22 17:07:44 +02:00
|
|
|
/** Return the signatures that we know for the consensus that we're currently
|
2009-06-20 09:21:52 +02:00
|
|
|
* trying to build. */
|
2007-08-15 21:55:52 +02:00
|
|
|
const char *
|
|
|
|
dirvote_get_pending_detached_signatures(void)
|
|
|
|
{
|
|
|
|
return pending_consensus_signatures;
|
|
|
|
}
|
|
|
|
|
2007-10-04 18:21:58 +02:00
|
|
|
/** Return a given vote specified by <b>fp</b>. If <b>by_id</b>, return the
|
|
|
|
* vote for the authority with the v3 authority identity key digest <b>fp</b>;
|
|
|
|
* if <b>by_id</b> is false, return the vote whose digest is <b>fp</b>. If
|
|
|
|
* <b>fp</b> is NULL, return our own vote. If <b>include_previous</b> is
|
|
|
|
* false, do not consider any votes for a consensus that's already been built.
|
|
|
|
* If <b>include_pending</b> is false, do not consider any votes for the
|
|
|
|
* consensus that's in progress. May return NULL if we have no vote for the
|
|
|
|
* authority in question. */
|
2007-08-15 21:55:52 +02:00
|
|
|
const cached_dir_t *
|
2007-10-09 21:14:48 +02:00
|
|
|
dirvote_get_vote(const char *fp, int flags)
|
2007-08-15 21:55:52 +02:00
|
|
|
{
|
2007-10-09 21:14:48 +02:00
|
|
|
int by_id = flags & DGV_BY_ID;
|
|
|
|
const int include_pending = flags & DGV_INCLUDE_PENDING;
|
|
|
|
const int include_previous = flags & DGV_INCLUDE_PREVIOUS;
|
|
|
|
|
2007-10-02 22:19:43 +02:00
|
|
|
if (!pending_vote_list && !previous_vote_list)
|
2007-08-15 21:55:52 +02:00
|
|
|
return NULL;
|
2007-10-02 22:19:43 +02:00
|
|
|
if (fp == NULL) {
|
2007-08-15 21:55:52 +02:00
|
|
|
authority_cert_t *c = get_my_v3_authority_cert();
|
2007-10-02 22:19:43 +02:00
|
|
|
if (c) {
|
|
|
|
fp = c->cache_info.identity_digest;
|
|
|
|
by_id = 1;
|
|
|
|
} else
|
2007-08-15 21:55:52 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2007-10-02 22:19:43 +02:00
|
|
|
if (by_id) {
|
|
|
|
if (pending_vote_list && include_pending) {
|
|
|
|
SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, pv,
|
|
|
|
if (!memcmp(get_voter(pv->vote)->identity_digest, fp, DIGEST_LEN))
|
|
|
|
return pv->vote_body);
|
|
|
|
}
|
|
|
|
if (previous_vote_list && include_previous) {
|
|
|
|
SMARTLIST_FOREACH(previous_vote_list, pending_vote_t *, pv,
|
|
|
|
if (!memcmp(get_voter(pv->vote)->identity_digest, fp, DIGEST_LEN))
|
|
|
|
return pv->vote_body);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (pending_vote_list && include_pending) {
|
|
|
|
SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, pv,
|
2009-09-16 23:01:01 +02:00
|
|
|
if (!memcmp(pv->vote->digests.d[DIGEST_SHA1], fp, DIGEST_LEN))
|
2007-10-02 22:19:43 +02:00
|
|
|
return pv->vote_body);
|
|
|
|
}
|
|
|
|
if (previous_vote_list && include_previous) {
|
|
|
|
SMARTLIST_FOREACH(previous_vote_list, pending_vote_t *, pv,
|
2009-09-16 23:01:01 +02:00
|
|
|
if (!memcmp(pv->vote->digests.d[DIGEST_SHA1], fp, DIGEST_LEN))
|
2007-10-02 22:19:43 +02:00
|
|
|
return pv->vote_body);
|
|
|
|
}
|
|
|
|
}
|
2007-08-15 21:55:52 +02:00
|
|
|
return NULL;
|
|
|
|
}
|
2008-06-18 22:14:25 +02:00
|
|
|
|
2009-08-24 18:51:33 +02:00
|
|
|
/** Construct and return a new microdescriptor from a routerinfo <b>ri</b>.
|
|
|
|
*
|
|
|
|
* XXX Right now, there is only one way to generate microdescriptors from
|
|
|
|
* router descriptors. This may change in future consensus methods. If so,
|
|
|
|
* we'll need an internal way to remember which method we used, and ask for a
|
|
|
|
* particular method.
|
|
|
|
**/
|
|
|
|
microdesc_t *
|
|
|
|
dirvote_create_microdescriptor(const routerinfo_t *ri)
|
2009-08-20 02:06:59 +02:00
|
|
|
{
|
2009-08-24 18:51:33 +02:00
|
|
|
microdesc_t *result = NULL;
|
2009-08-20 02:06:59 +02:00
|
|
|
char *key = NULL, *summary = NULL, *family = NULL;
|
2009-08-24 18:51:33 +02:00
|
|
|
char buf[1024];
|
2009-08-20 02:06:59 +02:00
|
|
|
size_t keylen;
|
2009-08-24 18:51:33 +02:00
|
|
|
char *out = buf, *end = buf+sizeof(buf);
|
2009-08-20 02:06:59 +02:00
|
|
|
|
|
|
|
if (crypto_pk_write_public_key_to_string(ri->onion_pkey, &key, &keylen)<0)
|
|
|
|
goto done;
|
|
|
|
summary = policy_summarize(ri->exit_policy);
|
|
|
|
if (ri->declared_family)
|
|
|
|
family = smartlist_join_strings(ri->declared_family, " ", 0, NULL);
|
|
|
|
|
|
|
|
if (tor_snprintf(out, end-out, "onion-key\n%s", key)<0)
|
|
|
|
goto done;
|
|
|
|
out += strlen(out);
|
|
|
|
if (family) {
|
|
|
|
if (tor_snprintf(out, end-out, "family %s\n", family)<0)
|
|
|
|
goto done;
|
|
|
|
out += strlen(out);
|
|
|
|
}
|
|
|
|
if (summary && strcmp(summary, "reject 1-65535")) {
|
|
|
|
if (tor_snprintf(out, end-out, "p %s\n", summary)<0)
|
|
|
|
goto done;
|
|
|
|
out += strlen(out);
|
|
|
|
}
|
2009-08-24 18:51:33 +02:00
|
|
|
*out = '\0'; /* Make sure it's nul-terminated. This should be a no-op */
|
|
|
|
|
|
|
|
{
|
|
|
|
smartlist_t *lst = microdescs_parse_from_string(buf, out, 0, 1);
|
|
|
|
if (smartlist_len(lst) != 1) {
|
|
|
|
log_warn(LD_DIR, "We generated a microdescriptor we couldn't parse.");
|
|
|
|
SMARTLIST_FOREACH(lst, microdesc_t *, md, microdesc_free(md));
|
|
|
|
smartlist_free(lst);
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
result = smartlist_get(lst, 0);
|
|
|
|
smartlist_free(lst);
|
|
|
|
}
|
2009-08-20 02:06:59 +02:00
|
|
|
|
|
|
|
done:
|
|
|
|
tor_free(key);
|
|
|
|
tor_free(summary);
|
|
|
|
tor_free(family);
|
|
|
|
return result;
|
|
|
|
}
|
|
|
|
|
|
|
|
/** Cached space-separated string to hold */
|
|
|
|
static char *microdesc_consensus_methods = NULL;
|
|
|
|
|
2009-10-15 22:06:00 +02:00
|
|
|
/** Format the appropriate vote line to describe the microdescriptor <b>md</b>
|
|
|
|
* in a consensus vote document. Write it into the <b>out_len</b>-byte buffer
|
|
|
|
* in <b>out</b>. Return -1 on failure and the number of characters written
|
|
|
|
* on success. */
|
2009-10-19 01:30:46 +02:00
|
|
|
ssize_t
|
2009-08-24 18:51:33 +02:00
|
|
|
dirvote_format_microdesc_vote_line(char *out, size_t out_len,
|
|
|
|
const microdesc_t *md)
|
2009-08-20 02:06:59 +02:00
|
|
|
{
|
2009-10-20 05:19:42 +02:00
|
|
|
char d64[BASE64_DIGEST256_LEN+1];
|
2009-08-20 02:06:59 +02:00
|
|
|
if (!microdesc_consensus_methods) {
|
|
|
|
microdesc_consensus_methods =
|
2009-08-24 18:51:33 +02:00
|
|
|
make_consensus_method_list(MIN_METHOD_FOR_MICRODESC,
|
2009-08-20 02:06:59 +02:00
|
|
|
MAX_SUPPORTED_CONSENSUS_METHOD,
|
|
|
|
",");
|
|
|
|
tor_assert(microdesc_consensus_methods);
|
|
|
|
}
|
2009-08-24 18:51:33 +02:00
|
|
|
if (digest256_to_base64(d64, md->digest)<0)
|
2009-08-20 02:06:59 +02:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
if (tor_snprintf(out, out_len, "m %s sha256=%s\n",
|
|
|
|
microdesc_consensus_methods, d64)<0)
|
|
|
|
return -1;
|
|
|
|
|
|
|
|
return strlen(out);
|
|
|
|
}
|
|
|
|
|
2009-10-15 22:06:00 +02:00
|
|
|
/** If <b>vrs</b> has a hash made for the consensus method <b>method</b> with
|
|
|
|
* the digest algorithm <b>alg</b>, decode it and copy it into
|
|
|
|
* <b>digest256_out</b> and return 0. Otherwise return -1. */
|
2009-08-24 18:51:33 +02:00
|
|
|
int
|
|
|
|
vote_routerstatus_find_microdesc_hash(char *digest256_out,
|
|
|
|
const vote_routerstatus_t *vrs,
|
2009-10-15 22:06:00 +02:00
|
|
|
int method,
|
|
|
|
digest_algorithm_t alg)
|
2009-08-24 18:51:33 +02:00
|
|
|
{
|
|
|
|
/* XXXX only returns the sha256 method. */
|
|
|
|
const vote_microdesc_hash_t *h;
|
|
|
|
char mstr[64];
|
|
|
|
size_t mlen;
|
2009-10-15 22:06:00 +02:00
|
|
|
char dstr[64];
|
2009-08-24 18:51:33 +02:00
|
|
|
|
|
|
|
tor_snprintf(mstr, sizeof(mstr), "%d", method);
|
|
|
|
mlen = strlen(mstr);
|
2009-10-15 22:06:00 +02:00
|
|
|
tor_snprintf(dstr, sizeof(dstr), " %s=",
|
|
|
|
crypto_digest_algorithm_get_name(alg));
|
2009-08-24 18:51:33 +02:00
|
|
|
|
|
|
|
for (h = vrs->microdesc; h; h = h->next) {
|
|
|
|
const char *cp = h->microdesc_hash_line;
|
|
|
|
size_t num_len;
|
|
|
|
/* cp looks like \d+(,\d+)* (digesttype=val )+ . Let's hunt for mstr in
|
|
|
|
* the first part. */
|
|
|
|
while (1) {
|
|
|
|
num_len = strspn(cp, "1234567890");
|
|
|
|
if (num_len == mlen && !memcmp(mstr, cp, mlen)) {
|
|
|
|
/* This is the line. */
|
|
|
|
char buf[BASE64_DIGEST256_LEN+1];
|
|
|
|
/* XXXX ignores extraneous stuff if the digest is too long. This
|
|
|
|
* seems harmless enough, right? */
|
2009-10-15 22:06:00 +02:00
|
|
|
cp = strstr(cp, dstr);
|
2009-08-24 18:51:33 +02:00
|
|
|
if (!cp)
|
|
|
|
return -1;
|
2009-10-15 22:06:00 +02:00
|
|
|
cp += strlen(dstr);
|
2009-08-24 18:51:33 +02:00
|
|
|
strlcpy(buf, cp, sizeof(buf));
|
|
|
|
return digest256_from_base64(digest256_out, buf);
|
|
|
|
}
|
|
|
|
if (num_len == 0 || cp[num_len] != ',')
|
|
|
|
break;
|
|
|
|
cp += num_len + 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
|