nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

rust/protover: Fix protocol version support error handling

Browse Source 
Make Rust protocol version support checks consistent with the
undocumented error behaviour of the corresponding C code.

Fixes bug 34251; bugfix on 0.3.3.5-rc.
This commit is contained in:
teor 2020-05-18 21:50:35 +10:00
parent f05c144d7c
commit 3efe53562f
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug34251 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (rust, protocol versions):
- Make Rust protocol version support checks consistent with the
undocumented error behaviour of the corresponding C code.
Fixes bug 34251; bugfix on 0.3.3.5-rc.

9
src/core/or/protover.c
View File

@ -326,6 +326,9 @@ protover_is_supported_here(protocol_type_t pr, uint32_t ver)
/** /**
* Return true iff "list" encodes a protocol list that includes support for * Return true iff "list" encodes a protocol list that includes support for
* the indicated protocol and version. * the indicated protocol and version.
*
* If the protocol list is unparseable, treat it as if it defines no
* protocols, and return 0.
*/ */
int int
protocol_list_supports_protocol(const char *list, protocol_type_t tp, protocol_list_supports_protocol(const char *list, protocol_type_t tp,
@ -348,6 +351,9 @@ protocol_list_supports_protocol(const char *list, protocol_type_t tp,
/** /**
* Return true iff "list" encodes a protocol list that includes support for * Return true iff "list" encodes a protocol list that includes support for
* the indicated protocol and version, or some later version. * the indicated protocol and version, or some later version.
*
* If the protocol list is unparseable, treat it as if it defines no
* protocols, and return 0.
*/ */
int int
protocol_list_supports_protocol_or_later(const char *list, protocol_list_supports_protocol_or_later(const char *list,
@ -740,6 +746,9 @@ protover_compute_vote(const smartlist_t *list_of_proto_strings,
* one that we support, and false otherwise. If <b>missing_out</b> is * one that we support, and false otherwise. If <b>missing_out</b> is
* provided, set it to the list of protocols we do not support. * provided, set it to the list of protocols we do not support.
* *
* If the protocol version string is unparseable, treat it as if it defines no
* protocols, and return 1.
*
* NOTE: This is quadratic, but we don't do it much: only a few times per * NOTE: This is quadratic, but we don't do it much: only a few times per
* consensus. Checking signatures should be way more expensive than this * consensus. Checking signatures should be way more expensive than this
* ever would be. * ever would be.

10
src/rust/protover/ffi.rs
View File

@ -84,7 +84,7 @@ pub extern "C" fn protocol_list_supports_protocol(
version: uint32_t, version: uint32_t,
) -> c_int { ) -> c_int {
if c_protocol_list.is_null() { if c_protocol_list.is_null() {
return 1; return 0;
} }
// Require an unsafe block to read the version from a C string. The pointer // Require an unsafe block to read the version from a C string. The pointer
@ -93,7 +93,7 @@ pub extern "C" fn protocol_list_supports_protocol(
let protocol_list = match c_str.to_str() { let protocol_list = match c_str.to_str() {
Ok(n) => n, Ok(n) => n,
Err(_) => return 1, Err(_) => return 0,
}; };
let proto_entry: UnvalidatedProtoEntry = match protocol_list.parse() { let proto_entry: UnvalidatedProtoEntry = match protocol_list.parse() {
Ok(n) => n, Ok(n) => n,
@ -140,7 +140,7 @@ pub extern "C" fn protocol_list_supports_protocol_or_later(
version: uint32_t, version: uint32_t,
) -> c_int { ) -> c_int {
if c_protocol_list.is_null() { if c_protocol_list.is_null() {
return 1; return 0;
} }
// Require an unsafe block to read the version from a C string. The pointer // Require an unsafe block to read the version from a C string. The pointer
@ -149,7 +149,7 @@ pub extern "C" fn protocol_list_supports_protocol_or_later(
let protocol_list = match c_str.to_str() { let protocol_list = match c_str.to_str() {
Ok(n) => n, Ok(n) => n,
Err(_) => return 1, Err(_) => return 0,
}; };
let protocol = match translate_to_rust(c_protocol) { let protocol = match translate_to_rust(c_protocol) {
@ -159,7 +159,7 @@ pub extern "C" fn protocol_list_supports_protocol_or_later(
let proto_entry: UnvalidatedProtoEntry = match protocol_list.parse() { let proto_entry: UnvalidatedProtoEntry = match protocol_list.parse() {
Ok(n) => n, Ok(n) => n,
Err(_) => return 1, Err(_) => return 0,
}; };
if proto_entry.supports_protocol_or_later(&protocol.into(), &version) { if proto_entry.supports_protocol_or_later(&protocol.into(), &version) {