summaryrefslogtreecommitdiff
path: root/src/or
AgeCommit message (Collapse)Author
2017-08-21Add unittest for #23233.George Kadianakis
This will fail currently since the bug is not fixed yet.
2017-08-08Fix a memory leak in consdiffmgr.cNick Mathewson
Fixes bug 23139; bugfix on 0.3.1.1-alpha.
2017-08-03Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-08-03Merge branch 'bug23081_025' into maint-0.3.1Nick Mathewson
2017-08-03In ntmain, call set_main_thread() before running the loop.Nick Mathewson
Patch from Vort; fixes bug 23081; bugfix on fd992deeea76972 in 0.2.1.16-rc when set_main_thread() was introduced. See the changes file for a list of all the symptoms this bug has been causing when running Tor as a Windows Service.
2017-08-01hs: Cleanup logging statement in hs_intropoint.cDavid Goulet
One log statement was a warning and has been forgotten. It is triggered for a successful attempt at introducting from a client. It has been reported here: https://lists.torproject.org/pipermail/tor-relays/2017-August/012689.html Three other log_warn() statement changed to protocol warning because they are errors that basically can come from the network and thus triggered by anyone. Fixes #23078. Signed-off-by: David Goulet <dgoulet@torproject.org>
2017-08-01Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9Nick Mathewson
2017-08-01Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-08-01Merge remote-tracking branch 'public/bug18100_029' into maint-0.2.9Nick Mathewson
2017-07-28Merge branch 'bug23053_029' into maint-0.3.1Nick Mathewson
2017-07-28Fix a small memory leak when parsing unix: ports twiceNick Mathewson
Fixes bug 23053; CID 1415725.
2017-07-27Merge branch 'multi-priority_squashed' into maint-0.3.1Nick Mathewson
2017-07-27Fix the cpuworker.c documentation to mention all the kinds of workNick Mathewson
2017-07-27Always start with one additional worker threadNick Mathewson
Now that half the threads are permissive and half are strict, we need to make sure we have at least two threads, so that we'll have at least one of each kind.
2017-07-27Queue consensus diffs at LOW priority.Nick Mathewson
Fixes bug 22883.
2017-07-12New configuration option MaxConsensusAgeForDiffsNick Mathewson
Relay operators (especially bridge operators) can use this to lower or raise the number of consensuses that they're willing to hold for diff generation purposes. This enables a workaround for bug 22883.
2017-07-12Merge branch 'bug22349_029' into maint-0.3.1Nick Mathewson
2017-07-05Fix a wide line from 22207Nick Mathewson
2017-07-05Merge remote-tracking branch 'karsten/task-22207' into maint-0.3.1Nick Mathewson
2017-06-29Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-29Merge branch 'trove-2017-006' into maint-0.3.0Nick Mathewson
2017-06-29Merge remote-tracking branch 'public/bug22670_031' into maint-0.3.1Nick Mathewson
2017-06-29Consider the exit family when applying guard restrictions.Nick Mathewson
When the new path selection logic went into place, I accidentally dropped the code that considered the _family_ of the exit node when deciding if the guard was usable, and we didn't catch that during code review. This patch makes the guard_restriction_t code consider the exit family as well, and adds some (hopefully redundant) checks for the case where we lack a node_t for a guard but we have a bridge_info_t for it. Fixes bug 22753; bugfix on 0.3.0.1-alpha. Tracked as TROVE-2016-006 and CVE-2017-0377.
2017-06-28Replace crash on missing handle in consdiffmgr with nonfatal assertNick Mathewson
Attempts to mitigate 22752.
2017-06-28Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21507-029' into maint-0.2.9Nick Mathewson
2017-06-28Merge remote-tracking branch 'teor/bug21576_029_v2' into maint-0.2.9Nick Mathewson
2017-06-28whitespace fixNick Mathewson
2017-06-28Merge remote-tracking branch 'asn/bug21969_bridges_030' into maint-0.3.0Nick Mathewson
2017-06-27Return "304 not modified" if a client already have the most recent consensus.Alexander Færøy
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
2017-06-27Set published_out for consensus cache entries in ↵Alexander Færøy
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
2017-06-27Mark descriptors as undownloadable when dirserv_add_() rejects themNick Mathewson
As of ac2f6b608a18a8595f62384788196d7c3f2875fd in 0.2.1.19-alpha, Sebastian fixed bug 888 by marking descriptors as "impossible" by digest if they got rejected during the router_load_routers_from_string() phase. This fix stopped clients and relays from downloading the same thing over and over. But we never made the same change for descriptors rejected during dirserv_add_{descriptor,extrainfo}. Instead, we tried to notice in advance that we'd reject them with dirserv_would_reject(). This notice-in-advance check stopped working once we added key-pinning and didn't make a corresponding key-pinning change to dirserv_would_reject() [since a routerstatus_t doesn't include an ed25519 key]. So as a fix, let's make the dirserv_add_*() functions mark digests as undownloadable when they are rejected. Fixes bug 22349; I am calling this a fix on 0.2.1.19-alpha, though you could also argue for it being a fix on 0.2.7.2-alpha.
2017-06-27Merge branch 'maint-0.2.4' into maint-0.2.5Nick Mathewson
2017-06-27Merge branch 'maint-0.2.9' into maint-0.3.0Nick Mathewson
2017-06-27Merge branch 'maint-0.2.8' into maint-0.2.9Nick Mathewson
2017-06-27Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-27Merge branch 'maint-0.2.7-redux' into maint-0.2.8Nick Mathewson
2017-06-27Merge branch 'maint-0.2.6' into maint-0.2.7-reduxNick Mathewson
2017-06-27Merge branch 'maint-0.2.5' into maint-0.2.6Nick Mathewson
2017-06-27Fix an errant memset() into the middle of a struct in cell_pack().Nick Mathewson
This mistake causes two possible bugs. I believe they are both harmless IRL. BUG 1: memory stomping When we call the memset, we are overwriting two 0 bytes past the end of packed_cell_t.body. But I think that's harmless in practice, because the definition of packed_cell_t is: // ... typedef struct packed_cell_t { TOR_SIMPLEQ_ENTRY(packed_cell_t) next; char body[CELL_MAX_NETWORK_SIZE]; uint32_t inserted_time; } packed_cell_t; So we will overwrite either two bytes of inserted_time, or two bytes of padding, depending on how the platform handles alignment. If we're overwriting padding, that's safe. If we are overwriting the inserted_time field, that's also safe: In every case where we call cell_pack() from connection_or.c, we ignore the inserted_time field. When we call cell_pack() from relay.c, we don't set or use inserted_time until right after we have called cell_pack(). SO I believe we're safe in that case too. BUG 2: memory exposure The original reason for this memset was to avoid the possibility of accidentally leaking uninitialized ram to the network. Now remember, if wide_circ_ids is false on a connection, we shouldn't actually be sending more than 512 bytes of packed_cell_t.body, so these two bytes can only leak to the network if there is another bug somewhere else in the code that sends more data than is correct. Fortunately, in relay.c, where we allocate packed_cell_t in packed_cell_new() , we allocate it with tor_malloc_zero(), which clears the RAM, right before we call cell_pack. So those packed_cell_t.body bytes can't leak any information. That leaves the two calls to cell_pack() in connection_or.c, which use stack-alocated packed_cell_t instances. In or_handshake_state_record_cell(), we pass the cell's contents to crypto_digest_add_bytes(). When we do so, we get the number of bytes to pass using the same setting of wide_circ_ids as we passed to cell_pack(). So I believe that's safe. In connection_or_write_cell_to_buf(), we also use the same setting of wide_circ_ids in both calls. So I believe that's safe too. I introduced this bug with 1c0e87f6d8c7a0abdadf1b5cd9082c10abc7f4e2 back in 0.2.4.11-alpha; it is bug 22737 and CID 1401591
2017-06-27Merge branch 'bug22719_031' into maint-0.3.1Nick Mathewson
2017-06-26Patch for 22720 from huyvq: exit(1) more oftenNick Mathewson
See changes file for full details.
2017-06-26Merge branch 'bug22212_squashed' into maint-0.3.1Nick Mathewson
2017-06-26Demote a log message due to libevent delays.Mike Perry
This is a side-effect of being single-threaded. The worst cases of this are actually Bug #16585.
2017-06-26Try a little harder to make sure we never call tor_compress_process wrong.Nick Mathewson
2017-06-22Merge branch 'maint-0.3.0' into maint-0.3.1Nick Mathewson
2017-06-22Combine our "don't do this if no consensus" entryguards checksNick Mathewson
Suggested by asn on 22400 review.
2017-06-21Merge branch 'bug22356_029' into maint-0.3.1Nick Mathewson