June 2017 - tor-commits - lists.torproject.org

[tor/maint-0.3.1] Set published_out for consensus cache entries in spooled_resource_estimate_size().
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 07f2940b4519d801eb10b9f5e49790aced1f6322 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Fri Jun 23 23:55:54 2017 +0000 Set published_out for consensus cache entries in spooled_resource_estimate_size(). This patch ensures that the published_out output parameter is set to the current consensus cache entry's "valid after" field. See: https://bugs.torproject.org/22702 --- src/or/consdiffmgr.c | 18 ++++++++++++++++++ src/or/consdiffmgr.h | 3 +++ src/or/dirserv.c | 6 ++++++ 3 files changed, 27 insertions(+) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 2af1047..4036f66 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1840,3 +1840,21 @@ consensus_cache_entry_get_valid_until(const consensus_cache_entry_t *ent, return 0; } +/** Read the valid after timestamp from the cached object ent into + * *out and return 0, or return -1 if no such time was recorded. */ +int +consensus_cache_entry_get_valid_after(const consensus_cache_entry_t *ent, + time_t *out) +{ + tor_assert(ent); + tor_assert(out); + + const char *s; + s = consensus_cache_entry_get_value(ent, LABEL_VALID_AFTER); + + if (s == NULL || parse_iso_time_nospace(s, out) < 0) + return -1; + else + return 0; +} + diff --git a/src/or/consdiffmgr.h b/src/or/consdiffmgr.h index fe4f9ee..079f9fe 100644 --- a/src/or/consdiffmgr.h +++ b/src/or/consdiffmgr.h @@ -44,6 +44,9 @@ int consensus_cache_entry_get_fresh_until( int consensus_cache_entry_get_valid_until( const struct consensus_cache_entry_t *ent, time_t *out); +int consensus_cache_entry_get_valid_after( + const struct consensus_cache_entry_t *ent, + time_t *out); void consdiffmgr_rescan(void); int consdiffmgr_cleanup(void); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 408f58b..4954471 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -14,6 +14,7 @@ #include "connection.h" #include "connection_or.h" #include "conscache.h" +#include "consdiffmgr.h" #include "control.h" #include "directory.h" #include "dirserv.h" @@ -3518,6 +3519,11 @@ spooled_resource_estimate_size(const spooled_resource_t *spooled, } else { cached_dir_t *cached; if (spooled->consensus_cache_entry) { + if (published_out) { + consensus_cache_entry_get_valid_after( + spooled->consensus_cache_entry, published_out); + } + return spooled->cce_len; } if (spooled->cached_dir_ref) {

1 0

[tor/master] Return "304 not modified" if a client already have the most recent consensus.
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 0a4af86335f1f72982bbc7e57578f07630986999 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Tue Jun 27 17:16:44 2017 +0000 Return "304 not modified" if a client already have the most recent consensus. This makes our directory code check if a client is trying to fetch a document that matches a digest from our latest consensus document. See: https://bugs.torproject.org/22702 --- src/or/directory.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/or/directory.c b/src/or/directory.c index b680b13..6ce739b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3883,6 +3883,30 @@ find_best_compression_method(unsigned compression_methods, int stream) return NO_METHOD; } +/** Check if any of the digests in digests matches the latest consensus + * flavor (given in flavor) that we have available. */ +static int +digest_list_contains_best_consensus(consensus_flavor_t flavor, + const smartlist_t *digests) +{ + const networkstatus_t *ns = NULL; + + if (digests == NULL) + return 0; + + ns = networkstatus_get_latest_consensus_by_flavor(flavor); + + if (ns == NULL) + return 0; + + SMARTLIST_FOREACH_BEGIN(digests, const uint8_t *, digest) { + if (tor_memeq(ns->digest_sha3_as_signed, digest, DIGEST256_LEN)) + return 1; + } SMARTLIST_FOREACH_END(digest); + + return 0; +} + /** Check if the given compression method is allowed for a connection that is * supposed to be anonymous. Returns 1 if the compression method is allowed, * otherwise 0. */ @@ -4052,6 +4076,13 @@ handle_get_current_consensus(dir_connection_t *conn, goto done; } + if (digest_list_contains_best_consensus(req.flav, + req.diff_from_digests)) { + write_http_status_line(conn, 304, "Not modified"); + geoip_note_ns_response(GEOIP_REJECT_NOT_MODIFIED); + goto done; + } + struct consensus_cache_entry_t *cached_consensus = NULL; compress_method_t compression_used = NO_METHOD;

1 0

[tor/maint-0.3.1] Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 2cd49d9ea6f8bad20215ad17d5057a8eea8e39e8 Merge: 32eba3d 09ae4fc Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 27 18:28:34 2017 -0400 Merge branch 'ahf_bugs_22702_squashed' into maint-0.3.1 changes/bug22702 | 5 +++++ src/or/consdiffmgr.c | 18 ++++++++++++++++++ src/or/consdiffmgr.h | 3 +++ src/or/directory.c | 31 +++++++++++++++++++++++++++++++ src/or/dirserv.c | 6 ++++++ 5 files changed, 63 insertions(+)

1 0

[tor/maint-0.3.1] Add changes file for bug #22702.
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 09ae4fc583daa8f1a4783a983ae0f5e3d743c2b2 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Tue Jun 27 22:21:43 2017 +0000 Add changes file for bug #22702. See: https://bugs.torproject.org/22702 --- changes/bug22702 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug22702 b/changes/bug22702 new file mode 100644 index 0000000..a2044c7 --- /dev/null +++ b/changes/bug22702 @@ -0,0 +1,5 @@ + o Major bugfixes (directory protocol): + - Ensure that we sent "304 Not modified" as HTTP status code when a + client is attempting to fetch a consensus or consensus diff that + matches the latest consensus we have available. Fixes bug 22702; + bugfix on 0.3.1.1-alpha.

1 0

[tor/master] Set published_out for consensus cache entries in spooled_resource_estimate_size().
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 07f2940b4519d801eb10b9f5e49790aced1f6322 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Fri Jun 23 23:55:54 2017 +0000 Set published_out for consensus cache entries in spooled_resource_estimate_size(). This patch ensures that the published_out output parameter is set to the current consensus cache entry's "valid after" field. See: https://bugs.torproject.org/22702 --- src/or/consdiffmgr.c | 18 ++++++++++++++++++ src/or/consdiffmgr.h | 3 +++ src/or/dirserv.c | 6 ++++++ 3 files changed, 27 insertions(+) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 2af1047..4036f66 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1840,3 +1840,21 @@ consensus_cache_entry_get_valid_until(const consensus_cache_entry_t *ent, return 0; } +/** Read the valid after timestamp from the cached object ent into + * *out and return 0, or return -1 if no such time was recorded. */ +int +consensus_cache_entry_get_valid_after(const consensus_cache_entry_t *ent, + time_t *out) +{ + tor_assert(ent); + tor_assert(out); + + const char *s; + s = consensus_cache_entry_get_value(ent, LABEL_VALID_AFTER); + + if (s == NULL || parse_iso_time_nospace(s, out) < 0) + return -1; + else + return 0; +} + diff --git a/src/or/consdiffmgr.h b/src/or/consdiffmgr.h index fe4f9ee..079f9fe 100644 --- a/src/or/consdiffmgr.h +++ b/src/or/consdiffmgr.h @@ -44,6 +44,9 @@ int consensus_cache_entry_get_fresh_until( int consensus_cache_entry_get_valid_until( const struct consensus_cache_entry_t *ent, time_t *out); +int consensus_cache_entry_get_valid_after( + const struct consensus_cache_entry_t *ent, + time_t *out); void consdiffmgr_rescan(void); int consdiffmgr_cleanup(void); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 408f58b..4954471 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -14,6 +14,7 @@ #include "connection.h" #include "connection_or.h" #include "conscache.h" +#include "consdiffmgr.h" #include "control.h" #include "directory.h" #include "dirserv.h" @@ -3518,6 +3519,11 @@ spooled_resource_estimate_size(const spooled_resource_t *spooled, } else { cached_dir_t *cached; if (spooled->consensus_cache_entry) { + if (published_out) { + consensus_cache_entry_get_valid_after( + spooled->consensus_cache_entry, published_out); + } + return spooled->cce_len; } if (spooled->cached_dir_ref) {

1 0

[tor/release-0.3.1] Add changes file for bug #22702.
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 09ae4fc583daa8f1a4783a983ae0f5e3d743c2b2 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Tue Jun 27 22:21:43 2017 +0000 Add changes file for bug #22702. See: https://bugs.torproject.org/22702 --- changes/bug22702 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug22702 b/changes/bug22702 new file mode 100644 index 0000000..a2044c7 --- /dev/null +++ b/changes/bug22702 @@ -0,0 +1,5 @@ + o Major bugfixes (directory protocol): + - Ensure that we sent "304 Not modified" as HTTP status code when a + client is attempting to fetch a consensus or consensus diff that + matches the latest consensus we have available. Fixes bug 22702; + bugfix on 0.3.1.1-alpha.

1 0

[tor/release-0.3.1] Return "304 not modified" if a client already have the most recent consensus.
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 0a4af86335f1f72982bbc7e57578f07630986999 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Tue Jun 27 17:16:44 2017 +0000 Return "304 not modified" if a client already have the most recent consensus. This makes our directory code check if a client is trying to fetch a document that matches a digest from our latest consensus document. See: https://bugs.torproject.org/22702 --- src/or/directory.c | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/src/or/directory.c b/src/or/directory.c index b680b13..6ce739b 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3883,6 +3883,30 @@ find_best_compression_method(unsigned compression_methods, int stream) return NO_METHOD; } +/** Check if any of the digests in digests matches the latest consensus + * flavor (given in flavor) that we have available. */ +static int +digest_list_contains_best_consensus(consensus_flavor_t flavor, + const smartlist_t *digests) +{ + const networkstatus_t *ns = NULL; + + if (digests == NULL) + return 0; + + ns = networkstatus_get_latest_consensus_by_flavor(flavor); + + if (ns == NULL) + return 0; + + SMARTLIST_FOREACH_BEGIN(digests, const uint8_t *, digest) { + if (tor_memeq(ns->digest_sha3_as_signed, digest, DIGEST256_LEN)) + return 1; + } SMARTLIST_FOREACH_END(digest); + + return 0; +} + /** Check if the given compression method is allowed for a connection that is * supposed to be anonymous. Returns 1 if the compression method is allowed, * otherwise 0. */ @@ -4052,6 +4076,13 @@ handle_get_current_consensus(dir_connection_t *conn, goto done; } + if (digest_list_contains_best_consensus(req.flav, + req.diff_from_digests)) { + write_http_status_line(conn, 304, "Not modified"); + geoip_note_ns_response(GEOIP_REJECT_NOT_MODIFIED); + goto done; + } + struct consensus_cache_entry_t *cached_consensus = NULL; compress_method_t compression_used = NO_METHOD;

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 559195ea82bf1c0610898fd96cd5a835b2e4f9a7 Merge: 733ce55 2cd49d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 27 18:28:38 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22702 | 5 +++++ src/or/consdiffmgr.c | 18 ++++++++++++++++++ src/or/consdiffmgr.h | 3 +++ src/or/directory.c | 31 +++++++++++++++++++++++++++++++ src/or/dirserv.c | 6 ++++++ 5 files changed, 63 insertions(+)

1 0

[tor/release-0.3.1] Set published_out for consensus cache entries in spooled_resource_estimate_size().
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 07f2940b4519d801eb10b9f5e49790aced1f6322 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Fri Jun 23 23:55:54 2017 +0000 Set published_out for consensus cache entries in spooled_resource_estimate_size(). This patch ensures that the published_out output parameter is set to the current consensus cache entry's "valid after" field. See: https://bugs.torproject.org/22702 --- src/or/consdiffmgr.c | 18 ++++++++++++++++++ src/or/consdiffmgr.h | 3 +++ src/or/dirserv.c | 6 ++++++ 3 files changed, 27 insertions(+) diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 2af1047..4036f66 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -1840,3 +1840,21 @@ consensus_cache_entry_get_valid_until(const consensus_cache_entry_t *ent, return 0; } +/** Read the valid after timestamp from the cached object ent into + * *out and return 0, or return -1 if no such time was recorded. */ +int +consensus_cache_entry_get_valid_after(const consensus_cache_entry_t *ent, + time_t *out) +{ + tor_assert(ent); + tor_assert(out); + + const char *s; + s = consensus_cache_entry_get_value(ent, LABEL_VALID_AFTER); + + if (s == NULL || parse_iso_time_nospace(s, out) < 0) + return -1; + else + return 0; +} + diff --git a/src/or/consdiffmgr.h b/src/or/consdiffmgr.h index fe4f9ee..079f9fe 100644 --- a/src/or/consdiffmgr.h +++ b/src/or/consdiffmgr.h @@ -44,6 +44,9 @@ int consensus_cache_entry_get_fresh_until( int consensus_cache_entry_get_valid_until( const struct consensus_cache_entry_t *ent, time_t *out); +int consensus_cache_entry_get_valid_after( + const struct consensus_cache_entry_t *ent, + time_t *out); void consdiffmgr_rescan(void); int consdiffmgr_cleanup(void); diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 408f58b..4954471 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -14,6 +14,7 @@ #include "connection.h" #include "connection_or.h" #include "conscache.h" +#include "consdiffmgr.h" #include "control.h" #include "directory.h" #include "dirserv.h" @@ -3518,6 +3519,11 @@ spooled_resource_estimate_size(const spooled_resource_t *spooled, } else { cached_dir_t *cached; if (spooled->consensus_cache_entry) { + if (published_out) { + consensus_cache_entry_get_valid_after( + spooled->consensus_cache_entry, published_out); + } + return spooled->cce_len; } if (spooled->cached_dir_ref) {

1 0

[tor/master] Add changes file for bug #22702.
by nickm＠torproject.org 27 Jun '17

27 Jun '17

commit 09ae4fc583daa8f1a4783a983ae0f5e3d743c2b2 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Tue Jun 27 22:21:43 2017 +0000 Add changes file for bug #22702. See: https://bugs.torproject.org/22702 --- changes/bug22702 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/changes/bug22702 b/changes/bug22702 new file mode 100644 index 0000000..a2044c7 --- /dev/null +++ b/changes/bug22702 @@ -0,0 +1,5 @@ + o Major bugfixes (directory protocol): + - Ensure that we sent "304 Not modified" as HTTP status code when a + client is attempting to fetch a consensus or consensus diff that + matches the latest consensus we have available. Fixes bug 22702; + bugfix on 0.3.1.1-alpha.

1 0