]>
git.ipfire.org Git - thirdparty/tor.git/log
teor [Thu, 22 Aug 2019 14:06:55 +0000 (00:06 +1000)]
changes: file for 21003
Log IPv6 addresses as well as IPv4 addresses, when describing
routerinfos, routerstatuses, and nodes.
Closes ticket 21003.
teor [Thu, 22 Aug 2019 13:51:53 +0000 (23:51 +1000)]
test/nodelist: Add unit tests for describe.c
Part of 21003.
teor [Mon, 19 Aug 2019 06:36:20 +0000 (16:36 +1000)]
nodelist: Clear buffers and detect more caller errors in describe.c
Part of 21003.
teor [Mon, 19 Aug 2019 06:35:24 +0000 (16:35 +1000)]
nodelist: Add support for multiple addresses in describe.c
Also prepare for unit tests.
Part of 21003.
teor [Mon, 19 Aug 2019 06:30:15 +0000 (16:30 +1000)]
nodelist: Remove support for is_named in describe.c
The Named flag is deprecated. Removing support from the formatting code
simplifies the unit tests.
Part of 21003.
teor [Mon, 19 Aug 2019 06:26:28 +0000 (16:26 +1000)]
nodelist: Move router_get_verbose_nickname() declaration
The declaration was in nodelist/routerinfo.h, but the implementation
was in nodelist/describe.h.
Part of 21003.
teor [Mon, 19 Aug 2019 06:36:58 +0000 (16:36 +1000)]
test/nodelist: Fix a typo
Roger Dingledine [Thu, 15 Aug 2019 06:32:00 +0000 (02:32 -0400)]
fix typo in keypin journal log entry (for dir auths)
teor [Mon, 12 Aug 2019 03:10:30 +0000 (13:10 +1000)]
Merge branch 'maint-0.4.1'
teor [Mon, 12 Aug 2019 03:10:14 +0000 (13:10 +1000)]
Merge branch 'maint-0.4.0' into maint-0.4.1
teor [Mon, 12 Aug 2019 03:10:05 +0000 (13:10 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Sun, 11 Aug 2019 23:55:29 +0000 (09:55 +1000)]
Merge remote-tracking branch 'tor-github/pr/1049' into maint-0.4.0
teor [Sun, 11 Aug 2019 23:54:35 +0000 (09:54 +1000)]
Merge remote-tracking branch 'tor-github/pr/1077' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:53:59 +0000 (09:53 +1000)]
Merge remote-tracking branch 'tor-github/pr/1066' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:52:56 +0000 (09:52 +1000)]
Merge remote-tracking branch 'tor-github/pr/1065' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:51:35 +0000 (09:51 +1000)]
Merge remote-tracking branch 'tor-github/pr/1056' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:51:00 +0000 (09:51 +1000)]
Merge remote-tracking branch 'tor-github/pr/1039' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:50:42 +0000 (09:50 +1000)]
Merge remote-tracking branch 'tor-github/pr/1034' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:49:53 +0000 (09:49 +1000)]
Merge remote-tracking branch 'tor-github/pr/1020' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:45:32 +0000 (09:45 +1000)]
Merge remote-tracking branch 'tor-github/pr/987' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:44:46 +0000 (09:44 +1000)]
Merge remote-tracking branch 'tor-github/pr/952' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:43:37 +0000 (09:43 +1000)]
Merge remote-tracking branch 'tor-github/pr/951' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:42:15 +0000 (09:42 +1000)]
Merge remote-tracking branch 'tor-github/pr/937' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:41:14 +0000 (09:41 +1000)]
Merge remote-tracking branch 'tor-github/pr/926' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:40:08 +0000 (09:40 +1000)]
Merge remote-tracking branch 'tor-github/pr/911' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:38:46 +0000 (09:38 +1000)]
Merge remote-tracking branch 'tor-github/pr/848' into maint-0.3.5
teor [Sun, 11 Aug 2019 23:36:14 +0000 (09:36 +1000)]
Merge remote-tracking branch 'tor-github/pr/741' into maint-0.3.5
teor [Fri, 9 Aug 2019 21:26:37 +0000 (07:26 +1000)]
Merge branch 'maint-0.4.1'
teor [Fri, 9 Aug 2019 21:26:30 +0000 (07:26 +1000)]
Merge branch 'maint-0.4.0' into maint-0.4.1
teor [Fri, 9 Aug 2019 21:26:21 +0000 (07:26 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Fri, 9 Aug 2019 21:25:57 +0000 (07:25 +1000)]
Merge branch 'maint-0.2.9' into maint-0.3.5
Delete src/or/buffers.c which was fixup'ed in 0.2.9 but moved in 0.3.5.
The 0.2.9 fix is not required for the 0.3.5 patch.
Resolves merge conflict caused by 30041.
teor [Fri, 9 Aug 2019 21:21:56 +0000 (07:21 +1000)]
Merge remote-tracking branch 'tor-github/pr/1078' into maint-0.2.9
teor [Fri, 9 Aug 2019 21:21:43 +0000 (07:21 +1000)]
Merge remote-tracking branch 'tor-github/pr/1052' into maint-0.2.9
teor [Fri, 9 Aug 2019 21:21:31 +0000 (07:21 +1000)]
Merge remote-tracking branch 'tor-github/pr/1229' into maint-0.2.9
Nick Mathewson [Tue, 9 Apr 2019 17:14:28 +0000 (13:14 -0400)]
Modify "Protect buffers against INT_MAX datalen overflows." for 0.2.9
teor [Fri, 9 Aug 2019 04:05:46 +0000 (14:05 +1000)]
Merge remote-tracking branch 'tor-github/pr/1081' into maint-0.4.0
teor [Fri, 9 Aug 2019 04:05:26 +0000 (14:05 +1000)]
Merge remote-tracking branch 'tor-github/pr/1080' into maint-0.3.5
teor [Fri, 9 Aug 2019 04:01:50 +0000 (14:01 +1000)]
Merge remote-tracking branch 'tor-github/pr/1054' into maint-0.3.5
teor [Fri, 9 Aug 2019 04:00:01 +0000 (14:00 +1000)]
Merge remote-tracking branch 'tor-github/pr/920' into maint-0.3.5
George Kadianakis [Tue, 12 Mar 2019 18:11:51 +0000 (20:11 +0200)]
Fix #28525 changes file that is breaking CI.
George Kadianakis [Tue, 12 Mar 2019 18:11:51 +0000 (20:11 +0200)]
Fix #28525 changes file that is breaking CI.
teor [Fri, 9 Aug 2019 03:53:52 +0000 (13:53 +1000)]
Merge remote-tracking branch 'tor-github/pr/763' into maint-0.3.5
teor [Fri, 9 Aug 2019 03:53:34 +0000 (13:53 +1000)]
Merge remote-tracking branch 'tor-github/pr/762' into maint-0.2.9
teor [Fri, 9 Aug 2019 03:50:59 +0000 (13:50 +1000)]
Merge remote-tracking branch 'tor-github/pr/958' into maint-0.3.5
teor [Fri, 9 Aug 2019 03:50:42 +0000 (13:50 +1000)]
Merge remote-tracking branch 'tor-github/pr/957' into maint-0.2.9
teor [Thu, 8 Aug 2019 23:51:50 +0000 (09:51 +1000)]
Merge branch 'bug31343_31374_041' into bug31343_31374_master
teor [Thu, 8 Aug 2019 23:51:44 +0000 (09:51 +1000)]
Merge branch 'bug31343_31374_040' into bug31343_31374_041
teor [Thu, 8 Aug 2019 23:51:40 +0000 (09:51 +1000)]
Merge branch 'bug31343_31374_035' into bug31343_31374_040
teor [Thu, 8 Aug 2019 23:51:35 +0000 (09:51 +1000)]
Merge branch 'bug31343_31374_029' into bug31343_31374_035
teor [Thu, 8 Aug 2019 23:50:50 +0000 (09:50 +1000)]
Merge remote-tracking branch 'tor-github/pr/1211' into test31343_040
teor [Thu, 8 Aug 2019 23:49:35 +0000 (09:49 +1000)]
Merge remote-tracking branch 'tor-github/pr/1222' into combined31343_31374_035
teor [Thu, 8 Aug 2019 23:49:27 +0000 (09:49 +1000)]
Merge remote-tracking branch 'tor-github/pr/1210' into combined31343_31374_035
teor [Thu, 8 Aug 2019 23:48:41 +0000 (09:48 +1000)]
Merge remote-tracking branch 'tor-github/pr/1221' into combined31343_31374_029
teor [Thu, 8 Aug 2019 23:48:28 +0000 (09:48 +1000)]
Merge remote-tracking branch 'tor-github/pr/1209' into combined31343_31374_029
Nick Mathewson [Thu, 8 Aug 2019 19:25:00 +0000 (15:25 -0400)]
Merge branch 'maint-0.4.1'
Nick Mathewson [Thu, 8 Aug 2019 19:24:52 +0000 (15:24 -0400)]
Merge branch 'ticket31374_035' into maint-0.4.1
David Goulet [Thu, 8 Aug 2019 16:30:23 +0000 (12:30 -0400)]
Merge branch 'tor-github/pr/1183'
David Goulet [Thu, 8 Aug 2019 16:26:59 +0000 (12:26 -0400)]
Merge branch 'tor-github/pr/1172'
Nick Mathewson [Thu, 8 Aug 2019 15:46:24 +0000 (11:46 -0400)]
Merge branch 'ticket31374_029' into ticket31374_035
Nick Mathewson [Thu, 8 Aug 2019 15:43:42 +0000 (11:43 -0400)]
Fix a warning about casting the results of GetProcAddress.
Fixes bug 31374; bugfix on 0.2.9.1-alpha.
Nick Mathewson [Thu, 8 Aug 2019 15:24:08 +0000 (11:24 -0400)]
Merge branch 'maint-0.4.1'
Nick Mathewson [Thu, 8 Aug 2019 15:23:59 +0000 (11:23 -0400)]
Merge branch 'ticket31343_040' into maint-0.4.1
Nick Mathewson [Thu, 8 Aug 2019 13:40:04 +0000 (09:40 -0400)]
Merge branch 'ticket31343_035' into ticket31343_040
Nick Mathewson [Thu, 8 Aug 2019 13:39:48 +0000 (09:39 -0400)]
Merge branch 'ticket31343_029' into ticket31343_035
Nick Mathewson [Thu, 8 Aug 2019 13:38:03 +0000 (09:38 -0400)]
Fix another time_t/long warning for 31343.
Nick Mathewson [Thu, 8 Aug 2019 13:17:23 +0000 (09:17 -0400)]
Merge branch 'ticket31343_029' into ticket31343_035
Nick Mathewson [Thu, 8 Aug 2019 13:15:42 +0000 (09:15 -0400)]
Restore proper behavior of netinfo skew check
My previous fix removed a comparison, which would have caused us to
warn about every skew instead of skews of over an hour.
teor [Thu, 8 Aug 2019 01:20:07 +0000 (11:20 +1000)]
Merge branch 'maint-0.4.1'
teor [Thu, 8 Aug 2019 01:19:58 +0000 (11:19 +1000)]
Merge branch 'maint-0.4.0' into maint-0.4.1
teor [Thu, 8 Aug 2019 01:19:38 +0000 (11:19 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Thu, 8 Aug 2019 01:17:46 +0000 (11:17 +1000)]
Merge remote-tracking branch 'tor-github/pr/1044' into maint-0.3.5
Merge changed chutney and stem script lines from 29280 with changed
stem script lines from 30591.
teor [Thu, 8 Aug 2019 01:11:42 +0000 (11:11 +1000)]
Merge branch 'maint-0.4.1'
teor [Thu, 8 Aug 2019 01:11:35 +0000 (11:11 +1000)]
Merge branch 'maint-0.4.0' into maint-0.4.1
teor [Thu, 8 Aug 2019 01:11:27 +0000 (11:11 +1000)]
Merge branch 'maint-0.3.5' into maint-0.4.0
teor [Thu, 8 Aug 2019 01:10:15 +0000 (11:10 +1000)]
Merge branch 'maint-0.2.9' into maint-0.3.5
Merge rust additions in 0.3.5 with sudo deletions in 0.2.9.
teor [Thu, 8 Aug 2019 01:07:34 +0000 (11:07 +1000)]
Merge remote-tracking branch 'tor-github/pr/1157' into maint-0.4.0
teor [Thu, 8 Aug 2019 01:07:11 +0000 (11:07 +1000)]
Merge remote-tracking branch 'tor-github/pr/1156' into maint-0.3.5
teor [Thu, 8 Aug 2019 00:55:24 +0000 (10:55 +1000)]
Merge remote-tracking branch 'tor-github/pr/1155' into maint-0.2.9
teor [Thu, 8 Aug 2019 00:54:12 +0000 (10:54 +1000)]
Merge remote-tracking branch 'tor-github/pr/991' into maint-0.2.9
Nick Mathewson [Wed, 7 Aug 2019 13:49:49 +0000 (09:49 -0400)]
Merge remote-tracking branch 'tor-github/pr/1208'
Nick Mathewson [Tue, 6 Aug 2019 17:13:36 +0000 (13:13 -0400)]
changes file for ticket 31320
Nick Mathewson [Tue, 6 Aug 2019 17:12:42 +0000 (13:12 -0400)]
Merge remote-tracking branch 'tor-github/pr/1203'
Nick Mathewson [Tue, 6 Aug 2019 15:18:40 +0000 (11:18 -0400)]
Merge branch 'ticket31343_035' into ticket31343_040
Nick Mathewson [Tue, 6 Aug 2019 15:15:20 +0000 (11:15 -0400)]
Merge branch 'ticket31343_029' into ticket31343_035
Nick Mathewson [Tue, 6 Aug 2019 15:11:06 +0000 (11:11 -0400)]
Avoid using labs() on time_t in channeltls.c
On some windows builds, time_t is 64 bits but long is not. This is
causing appveyor builds to fail.
Also, one of our uses of labs() on time_t was logically incorrect:
it was telling us to accept NETINFO cells up to three minutes
_before_ the message they were responding to, which doesn't make
sense.
This patch adds a time_abs() function that we should eventually move
to intmath.h or something. For now, though, it will make merges
easier to have it file-local in channeltls.c.
Fixes bug 31343; bugfix on 0.2.4.4-alpha.
Nick Mathewson [Tue, 6 Aug 2019 13:19:11 +0000 (09:19 -0400)]
Merge branch 'maint-0.4.1'
Nick Mathewson [Tue, 6 Aug 2019 13:19:05 +0000 (09:19 -0400)]
Merge branch 'ticket31311_041' into maint-0.4.1
David Goulet [Tue, 6 Aug 2019 12:01:26 +0000 (08:01 -0400)]
practracker: Make it happy after rebase
Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet [Tue, 2 Jul 2019 11:36:36 +0000 (07:36 -0400)]
hs-v3: Rename HS DoS default defines
Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet [Thu, 27 Jun 2019 18:06:42 +0000 (14:06 -0400)]
test: Series of fixes for hs_dos.c unit tests
Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet [Thu, 27 Jun 2019 17:32:58 +0000 (13:32 -0400)]
dos: Update HS intro circuits if parameters change
In case the consensus parameters for the rate/burst changes, we need to update
all already established introduction circuits to the newest value.
This commit introduces a "get all intro circ" function from the HS circuitmap
(v2 and v3) so it can be used by the HS DoS module to go over all circuits and
adjust the INTRODUCE2 token bucket parameters.
Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet [Thu, 27 Jun 2019 16:58:43 +0000 (12:58 -0400)]
hs-v3: Add enable/disable HS DoS introduce parameter
Following prop305 values.
Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet [Tue, 11 Jun 2019 12:28:13 +0000 (08:28 -0400)]
hs-v3: Add consensus parameters for DoS defenses
Part of #15516
Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet [Thu, 30 May 2019 12:55:40 +0000 (08:55 -0400)]
test: Add hs_dos.c unit tests
Currently test the only available function which is hs_dos_can_send_intro2()
within the HS anti-DoS subsystem.
Closes #15516
Signed-off-by: David Goulet <dgoulet@torproject.org>
David Goulet [Wed, 29 May 2019 18:05:16 +0000 (14:05 -0400)]
hs: Limit the amount of relayed INTRODUCE2
This commit add the hs_dos.{c|h} file that has the purpose of having the
anti-DoS code for onion services.
At this commit, it only has one which is a function that decides if an
INTRODUCE2 can be sent on the given introduction service circuit (S<->IP)
using a simple token bucket.
The rate per second is 25 and allowed burst to 200.
Basic defenses on #15516.
Signed-off-by: David Goulet <dgoulet@torproject.org>
George Kadianakis [Tue, 6 Aug 2019 11:51:47 +0000 (14:51 +0300)]
Merge branch 'tor-github/pr/1195'
David Goulet [Tue, 6 Aug 2019 11:42:20 +0000 (07:42 -0400)]
Merge branch 'tor-github/pr/1193'
Ali Raheem [Mon, 5 Aug 2019 18:24:42 +0000 (19:24 +0100)]
#31320 Add IPv6 examples
George Kadianakis [Fri, 2 Aug 2019 09:35:38 +0000 (12:35 +0300)]
Rename handle_relay_command to handle_relay_cell_command .
As per David's review.
George Kadianakis [Tue, 23 Jul 2019 10:52:36 +0000 (13:52 +0300)]
Test that regular cells get ignored in padding circuits.