mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-11-20 10:12:15 +01:00
Merge branch 'bug7149' into maint-0.2.3
This commit is contained in:
commit
b6931b0105
7
changes/dirserv-BUGGY-a
Normal file
7
changes/dirserv-BUGGY-a
Normal file
@ -0,0 +1,7 @@
|
||||
o Minor bugfixes:
|
||||
|
||||
- Don't serve or accept v2 hidden service descriptors over a
|
||||
relay's DirPort. It's never correct to do so, and disabling it
|
||||
might make it more annoying to exploit any bugs that turn up in the
|
||||
descriptor-parsing code. Fixes bug 7149.
|
||||
|
@ -3178,6 +3178,7 @@ directory_handle_command_get(dir_connection_t *conn, const char *headers,
|
||||
}
|
||||
|
||||
if (options->HidServDirectoryV2 &&
|
||||
connection_dir_is_encrypted(conn) &&
|
||||
!strcmpstart(url,"/tor/rendezvous2/")) {
|
||||
/* Handle v2 rendezvous descriptor fetch request. */
|
||||
const char *descp;
|
||||
@ -3364,6 +3365,7 @@ directory_handle_command_post(dir_connection_t *conn, const char *headers,
|
||||
|
||||
/* Handle v2 rendezvous service publish request. */
|
||||
if (options->HidServDirectoryV2 &&
|
||||
connection_dir_is_encrypted(conn) &&
|
||||
!strcmpstart(url,"/tor/rendezvous2/publish")) {
|
||||
switch (rend_cache_store_v2_desc_as_dir(body)) {
|
||||
case -2:
|
||||
|
Loading…
Reference in New Issue
Block a user