mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 12:22:14 +02:00
Code

Several attempts to diagnose ticket 25686

Browse Source 
There are a few reasons that relays might be uploading desciptors
without saying X-Desc-Gen-Reason:
  1. They are running an old version of our software, before 0.3.2.stable.
  2. They are not running our software, but they are claiming they
     are.
  3. They are uploading through a proxy that strips X-Desc-Gen-Reason.
  4. They somehow had a bug in their software.

According to the 25686 data, 1 is the most common reason.  This
ticket is an attempt to diagnose case 4, or prove that case 4
doesn't actually happen.
This commit is contained in:
Nick Mathewson 2018-06-11 16:14:57 -04:00
parent dd63033fcb
commit faf4580061
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug25686_diagnostic Normal file
View File

@ -0,0 +1,4 @@
o Minor features (relay, diagnostic):
- Add several checks to detect whether Tor relays are uploading their
descriptors without specifying why they regenerated. Diagnostic for
ticket 25686.

5
src/or/directory.c
View File

@ -1810,9 +1810,10 @@ directory_send_command(dir_connection_t *conn,
tor_assert(payload);
httpcommand = "POST";
url = tor_strdup("/tor/");
if (why) {
smartlist_add_asprintf(headers, "X-Desc-Gen-Reason: %s\r\n", why);
if (!why) {
why = "for no reason at all";
}
smartlist_add_asprintf(headers, "X-Desc-Gen-Reason: %s\r\n", why);
break;
}
case DIR_PURPOSE_UPLOAD_VOTE:

8
src/or/router.c
View File

@ -1866,7 +1866,7 @@ static routerinfo_t *desc_routerinfo = NULL;
static extrainfo_t *desc_extrainfo = NULL;
/** Why did we most recently decide to regenerate our descriptor? Used to
* tell the authorities why we're sending it to them. */
static const char *desc_gen_reason = NULL;
static const char *desc_gen_reason = "uninitialized reason";
/** Since when has our descriptor been "clean"? 0 if we need to regenerate it
* now. */
static time_t desc_clean_since = 0;
@ -2454,6 +2454,9 @@ router_rebuild_descriptor(int force)
desc_clean_since = time(NULL);
desc_needs_upload = 1;
desc_gen_reason = desc_dirty_reason;
if (BUG(desc_gen_reason == NULL)) {
desc_gen_reason = "descriptor was marked dirty earlier, for no reason.";
}
desc_dirty_reason = NULL;
control_event_my_descriptor_changed();
return 0;
@ -2510,6 +2513,9 @@ void
mark_my_descriptor_dirty(const char *reason)
{
const or_options_t *options = get_options();
if (BUG(reason == NULL)) {
reason = "marked descriptor dirty for unspecified reason";
}
if (server_mode(options) && options->PublishServerDescriptor_)
log_info(LD_OR, "Decided to publish new relay descriptor: %s", reason);
desc_clean_since = 0;