[or-cvs] r11122: Fix consensus signatures: regenerate the entire signature li (in tor/trunk: . src/or)
nickm at seul.org
nickm at seul.org
Wed Aug 15 16:12:41 UTC 2007
Author: nickm
Date: 2007-08-15 12:12:40 -0400 (Wed, 15 Aug 2007)
New Revision: 11122
Modified:
tor/trunk/
tor/trunk/src/or/dirvote.c
tor/trunk/src/or/or.h
tor/trunk/src/or/test.c
Log:
r14043 at Kushana: nickm | 2007-08-15 12:12:25 -0400
Fix consensus signatures: regenerate the entire signature list when we get a new signature, rather than just appending the new signature. This lets us tentatively accept weird signatures, since we can replace them with better ones later.
Property changes on: tor/trunk
___________________________________________________________________
svk:merge ticket from /tor/trunk [r14043] on c95137ef-5f19-0410-b913-86e773d04f59
Modified: tor/trunk/src/or/dirvote.c
===================================================================
--- tor/trunk/src/or/dirvote.c 2007-08-15 15:38:58 UTC (rev 11121)
+++ tor/trunk/src/or/dirvote.c 2007-08-15 16:12:40 UTC (rev 11122)
@@ -783,13 +783,15 @@
static int
networkstatus_add_signatures_impl(networkstatus_vote_t *target,
smartlist_t *src_voter_list,
- char **new_signatures_out)
+ char **new_signatures_out,
+ int *regenerate_out)
{
smartlist_t *added_signatures, *sigs;
int r;
tor_assert(target);
tor_assert(!target->is_vote);
tor_assert(new_signatures_out);
+ tor_assert(regenerate_out);
added_signatures = smartlist_create();
@@ -816,12 +818,11 @@
networkstatus_check_voter_signature(target, src_voter, cert);
}
}
- /* XXXX020 We want to add signatures for which we don't have the cert,
- * pending the arrival of the cert information. But this means we need
- * to replace them if a better one comes along, and that's not
- * implemented yet. */
- /* If this signature is good, then add it. */
- if (src_voter->good_signature) {
+ /* If this signature is good, or we don't have ay signature yet,
+ * then add it. */
+ if (src_voter->good_signature || !target_voter->signature) {
+ if (target_voter->signature)
+ *regenerate_out = 1;
tor_free(target_voter->signature);
target_voter->signature =
tor_memdup(src_voter->signature, src_voter->signature_len);
@@ -864,7 +865,8 @@
int
networkstatus_add_consensus_signatures(networkstatus_vote_t *target,
networkstatus_vote_t *src,
- char **new_signatures_out)
+ char **new_signatures_out,
+ int *regenerate_out)
{
tor_assert(src);
tor_assert(! src->is_vote);
@@ -879,14 +881,16 @@
return 0;
return networkstatus_add_signatures_impl(target, src->voters,
- new_signatures_out);
+ new_signatures_out,
+ regenerate_out);
}
/** DOCDOC */
int
networkstatus_add_detached_signatures(networkstatus_vote_t *target,
ns_detached_signatures_t *sigs,
- char **new_signatures_out)
+ char **new_signatures_out,
+ int *regenerate_out)
{
tor_assert(sigs);
@@ -898,7 +902,8 @@
return -1;
return networkstatus_add_signatures_impl(target, sigs->signatures,
- new_signatures_out);
+ new_signatures_out,
+ regenerate_out);
}
/** DOCDOC */
@@ -1420,7 +1425,7 @@
const char **msg_out)
{
ns_detached_signatures_t *sigs = NULL;
- int r = -1;
+ int r = -1, regenerate=0;
char *new_signatures = NULL;
size_t siglen;
@@ -1442,8 +1447,43 @@
r = networkstatus_add_detached_signatures(pending_consensus,
sigs,
- &new_signatures);
+ &new_signatures,
+ ®enerate);
+
+ // XXXX020 originally, this test was regenerate && r >= 0). But one
+ // code path is simpler than 2.
if (new_signatures && (siglen = strlen(new_signatures)) && r >= 0) {
+ /* XXXX This should really be its own function. */
+ char *new_detached =
+ networkstatus_get_detached_signatures(pending_consensus);
+ const char *src;
+ char *dst;
+ size_t new_consensus_len =
+ strlen(pending_consensus_body) + strlen(new_detached) + 1;
+ pending_consensus_body = tor_realloc(pending_consensus_body,
+ new_consensus_len);
+ dst = strstr(pending_consensus_body, "directory-signature ");
+ tor_assert(dst);
+ src = strstr(new_detached, "directory-signature ");
+ tor_assert(src);
+ strlcpy(dst, src, new_consensus_len - (dst-pending_consensus_body));
+
+ /* XXXX020 remove this once it fails to crash. */
+ {
+ ns_detached_signatures_t *sigs =
+ networkstatus_parse_detached_signatures(new_detached, NULL);
+ networkstatus_vote_t *v = networkstatus_parse_vote_from_string(
+ pending_consensus_body, 0);
+ tor_assert(sigs);
+ ns_detached_signatures_free(sigs);
+ tor_assert(v);
+ networkstatus_vote_free(v);
+ }
+ tor_free(pending_consensus_signatures);
+ pending_consensus_signatures = new_detached;
+ }
+#if 0
+ else if (new_signatures && (siglen = strlen(new_signatures)) && r >= 0) {
size_t siglen = strlen(new_signatures);
size_t len = strlen(pending_consensus_body);
pending_consensus_body = tor_realloc(pending_consensus_body,
@@ -1457,6 +1497,7 @@
log_info(LD_DIR, "Added %d new signatures to the pending consensus.", r);
}
+#endif
*msg_out = "ok";
goto done;
Modified: tor/trunk/src/or/or.h
===================================================================
--- tor/trunk/src/or/or.h 2007-08-15 15:38:58 UTC (rev 11121)
+++ tor/trunk/src/or/or.h 2007-08-15 16:12:40 UTC (rev 11122)
@@ -2845,10 +2845,12 @@
int networkstatus_check_consensus_signature(networkstatus_vote_t *consensus);
int networkstatus_add_consensus_signatures(networkstatus_vote_t *target,
networkstatus_vote_t *src,
- char **new_signatures_out);
+ char **new_signatures_out,
+ int *regenerate_out);
int networkstatus_add_detached_signatures(networkstatus_vote_t *target,
ns_detached_signatures_t *sigs,
- char **new_signatures_out);
+ char **new_signatures_out,
+ int *regenerate_out);
char *networkstatus_get_detached_signatures(networkstatus_vote_t *consensus);
void ns_detached_signatures_free(ns_detached_signatures_t *s);
Modified: tor/trunk/src/or/test.c
===================================================================
--- tor/trunk/src/or/test.c 2007-08-15 15:38:58 UTC (rev 11121)
+++ tor/trunk/src/or/test.c 2007-08-15 16:12:40 UTC (rev 11122)
@@ -2769,6 +2769,7 @@
char *detached_text1, *addition1, *detached_text2, *addition2;
ns_detached_signatures_t *dsig1, *dsig2;
size_t sz;
+ int regen;
/* Compute the other two signed consensuses. */
smartlist_shuffle(votes);
consensus_text2 = networkstatus_compute_consensus(votes, 3,
@@ -2812,7 +2813,8 @@
/* Try adding it to con2. */
detached_text2 = networkstatus_get_detached_signatures(con2);
addition1 = NULL;
- test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, &addition1));
+ test_eq(1, networkstatus_add_detached_signatures(con2, dsig1, &addition1,
+ ®en));
sz = strlen(detached_text2)+strlen(addition1)+1;
detached_text2 = tor_realloc(detached_text2, sz);
strlcat(detached_text2, addition1, sz);
@@ -2830,10 +2832,12 @@
test_eq(2, smartlist_len(dsig2->signatures));
/* Try adding to con2 twice; verify that nothing changes. */
- test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, &addition2));
+ test_eq(0, networkstatus_add_detached_signatures(con2, dsig1, &addition2,
+ ®en));
/* Add to con. */
- test_eq(2, networkstatus_add_detached_signatures(con, dsig2, &addition2));
+ test_eq(2, networkstatus_add_detached_signatures(con, dsig2, &addition2,
+ ®en));
/* Check signatures */
test_assert(!networkstatus_check_voter_signature(con,
smartlist_get(con->voters, 0),
More information about the tor-commits
mailing list