Nick Mathewson
cb083b5d3e
Merge remote-tracking branch 'asn-github/t-25432'
2018-03-28 14:43:33 -04:00
Nick Mathewson
794a25f8c1
Merge branch 'maint-0.3.3'
2018-03-28 14:23:06 -04:00
Nick Mathewson
e0bbef48bf
Merge remote-tracking branch 'dgoulet/bug24767_033_03' into maint-0.3.3
2018-03-28 14:21:04 -04:00
Nick Mathewson
6317aa2cc0
Merge branch 'maint-0.3.3'
2018-03-28 07:50:47 -04:00
Nick Mathewson
d4bf1f6c8e
Add a paranoia check in string_is_valid_nonrfc_hostname()
...
The earlier checks in this function should ensure that components is
always nonempty. But in case somebody messes with them in the
future, let's add an extra check to make sure we aren't crashing.
2018-03-28 07:48:18 -04:00
Nick Mathewson
b504c854d3
Rename string_is_valid_hostname -> string_is_valid_nonrfc_hostname
...
Per discussion on 25055.
2018-03-28 07:42:27 -04:00
rl1987
09351c34e9
Don't strlen before checking for NULL
2018-03-28 07:39:03 -04:00
rl1987
a28e350cff
Tweak loop condition
2018-03-28 07:39:03 -04:00
rl1987
6b6d003f43
Don't explode on NULL or empty string
2018-03-28 07:39:03 -04:00
rl1987
d891010fdd
Allow alphanumeric TLDs in test for now
2018-03-28 07:39:03 -04:00
rl1987
ee1fca727c
Simplify hostname validation code
2018-03-28 07:39:03 -04:00
rl1987
dbb7c8e6fd
Validate hostnames with punycode TLDs correctly
2018-03-28 07:39:03 -04:00
rl1987
4413e52f9e
Improve handling of trailing dot
2018-03-28 07:39:03 -04:00
rl1987
db850fec3a
Test TLD validation
2018-03-28 07:39:03 -04:00
rl1987
6335db9fce
Refrain from including <ctype.h>
2018-03-28 07:39:03 -04:00
rl1987
12afd8bfed
Also test bracket-less IPv6 string validation
2018-03-28 07:39:03 -04:00
rl1987
5986589b48
Call strlen() once
2018-03-28 07:39:03 -04:00
rl1987
b0ba4aa7e9
Fix bracketed IPv6 string validation
2018-03-28 07:39:03 -04:00
rl1987
1af016e96e
Do not consider IP strings valid DNS names. Fixes #25055
2018-03-28 07:39:03 -04:00
rl1987
0e453929d2
Allow IPv6 address strings to be used as hostnames in SOCKS5 requests
2018-03-28 07:39:03 -04:00
Nick Mathewson
fa6eaab83e
Merge branch 'maint-0.3.3'
2018-03-27 18:25:52 -04:00
Taylor Yu
471f28a2a8
Fix CID 1430932
...
Coverity found a null pointer reference in nodelist_add_microdesc().
This is almost certainly impossible assuming that the routerstatus_t
returned by router_get_consensus_status_by_descriptor_digest() always
corresponds to an entry in the nodelist. Fixes bug 25629.
2018-03-27 16:11:29 -05:00
George Kadianakis
ab16f1e2a1
test: Add unittest for the OR connection failure cache
...
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-03-27 12:43:39 -04:00
David Goulet
f29d158330
relay: Avoid connecting to down relays
...
If we failed to connect at the TCP level to a relay, note it down and refuse
to connect again for another 60 seconds.
Fixes #24767
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-03-27 12:42:31 -04:00
Nick Mathewson
979c7e5c83
Merge branch 'maint-0.3.3'
2018-03-27 07:05:15 -04:00
Nick Mathewson
46c2b0ca22
Merge branch 'bug25213_033' into maint-0.3.3
2018-03-27 07:04:33 -04:00
Nick Mathewson
0eed0899cd
Merge branch 'bug24658-rm-curve25519-header' into bug24658-merge
2018-03-26 20:12:59 -04:00
Nick Mathewson
d96dc2060a
Merge branch 'maint-0.3.3'
2018-03-26 19:47:48 -04:00
Nick Mathewson
841ed9dbb9
Merge remote-tracking branch 'dgoulet/bug24904_033_01' into maint-0.3.3
2018-03-26 19:47:44 -04:00
Nick Mathewson
5278d72f97
Merge branch 'maint-0.3.3'
2018-03-26 10:32:53 -04:00
Nick Mathewson
ca2d9cbb93
Merge branch 'bug24903_029' into maint-0.3.3
2018-03-26 10:32:49 -04:00
Nick Mathewson
c68bfc556c
Merge branch 'maint-0.3.3'
2018-03-26 10:29:29 -04:00
Nick Mathewson
33606405e3
Merge branch 'maint-0.3.2' into maint-0.3.3
2018-03-26 10:29:29 -04:00
Nick Mathewson
b5a6c03998
Merge branch 'maint-0.3.1' into maint-0.3.2
2018-03-26 10:29:29 -04:00
Nick Mathewson
068d092749
Merge branch 'maint-0.2.9' into maint-0.3.1
2018-03-26 10:29:29 -04:00
Nick Mathewson
969a38a375
Fix a unit test which was broken by the previous commit
...
This test was expecting Tor to find and use routerinfos, but hadn't
cleared the UseMicrodescriptors flag. Part of the fix for 25213.
2018-03-26 09:57:39 -04:00
Nick Mathewson
d1874b4339
Make extend_info_from_node() more picky about node contents
...
This update is needed to make it consistent with the behavior of
node_awaiting_ipv6(), which doesn't believe in the addresses from
routerinfos unless it actually plans to use those routerinfos.
Fixes bug 25213; bugfix on b66b62fb75
in 0.3.3.1-alpha,
which tightened up the definition of node_awaiting_ipv6().
2018-03-26 09:56:12 -04:00
Nick Mathewson
33a80921a2
When extending a circuit's path length, clear onehop_tunnel.
...
There was a nonfatal assertion in pathbias_should_count that would
trigger if onehop_tunnel was set, but the desired_path_length was
greater than 1. This patch fixes that. Fixes bug 24903; bugfix on
0.2.5.2-alpha.
2018-03-26 09:17:50 -04:00
Nick Mathewson
d749f6b5f6
Merge branch 'maint-0.3.3'
2018-03-23 17:49:29 -04:00
Nick Mathewson
eacfd29112
Fix windows compilation warnings in hs_service.c
...
These were breaking jenkins builds. Bugfix on 5804ccc9070dc54;
bug not in any released Tor.
2018-03-23 17:47:56 -04:00
Nick Mathewson
bb9012c818
test: more data on geoip load failure.
2018-03-23 11:48:15 -04:00
Nick Mathewson
e263317e07
Merge remote-tracking branch 'fristonio/ticket-24740'
2018-03-23 11:22:58 -04:00
Nick Mathewson
11114c7e83
Merge branch 'maint-0.3.3'
2018-03-23 11:19:19 -04:00
Isis Lovecruft
657d5cbbbc
tests: Automatically detect Rust crates to test and also pass --verbose.
...
* FIXES #25560 : https://bugs.torproject.org/25560 .
2018-03-23 11:13:04 -04:00
David Goulet
236c92a0a7
chan: Use channel_is_client() in channel_do_open_actions()
...
Make sure we actually only report client channel to the geoip cache instead of
looking if it is a known relay. Looking if it is a known relay can be
unreliable because they come and go from the consensus.
Fixes #24904
Signed-off-by: David Goulet <dgoulet@torproject.org>
2018-03-23 10:11:37 -04:00
Isis Lovecruft
fae5254783
hs: Fix two typos in an inline comment.
...
* FIXES #25602 : https://bugs.torproject.org/25602
2018-03-22 22:33:34 +00:00
Nick Mathewson
24abcf9771
Merge branch 'bug25399_squashed'
2018-03-22 08:49:43 -04:00
Alex Xu (Hello71)
946ed24ca5
Do not page-align mmap length. #25399
2018-03-22 08:47:37 -04:00
Nick Mathewson
d9ba7db38b
Merge remote-tracking branch 'public/geoip_testing'
2018-03-22 08:43:28 -04:00
Nick Mathewson
f8e53a545a
Update tor_log to libc 0.2.39 as well.
2018-03-21 17:14:15 -04:00