August 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 700f5bcc43fb959927dd1cae4e2943d115144850 Merge: ac721bd3b 87aacbfbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 09:38:26 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.3] rust/protover: don't accept whitespace in ProtoSet::from_str()
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 7b7dd9ae1c429248fdb7d6062f1af4c360527f00 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Aug 17 03:22:47 2018 +0000 rust/protover: don't accept whitespace in ProtoSet::from_str() It's impossible for spaces to get here, since spaces are used as separators between individual protocol entries higher up. And it shouldn't ignore whitespace that isn't a literal space character, because that would differ from the C implementation. These were added in 9925d2e68709aa7346f4c5bc98ea1349df6741f3. Fixes #27177. Bugfix on 0.3.3.5-rc. --- changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changes/bug27177 b/changes/bug27177 new file mode 100644 index 000000000..b03bbc96e --- /dev/null +++ b/changes/bug27177 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - Protover parsing was accepting the presence of whitespace in version + strings, which the C implementation would choke on, e.g. "Desc=1\t,2". + Fixes bug 27177; bugfix on 0.3.3.5-rc. diff --git a/src/rust/protover/protoset.rs b/src/rust/protover/protoset.rs index 4afc50edf..bb6794b6a 100644 --- a/src/rust/protover/protoset.rs +++ b/src/rust/protover/protoset.rs @@ -340,11 +340,9 @@ impl FromStr for ProtoSet { /// ``` fn from_str(version_string: &str) -> Result<Self, Self::Err> { let mut pairs: Vec<(Version, Version)> = Vec::new(); - let pieces: ::std::str::Split<char> = version_string.trim().split(','); - - for piece in pieces { - let p: &str = piece.trim(); + let pieces: ::std::str::Split<char> = version_string.split(','); + for p in pieces { if p.is_empty() { continue; } else if p.contains('-') { @@ -369,7 +367,7 @@ impl FromStr for ProtoSet { pairs.push((v, v)); } } - // If we were passed in an empty string, or a bunch of whitespace, or + // If we were passed in an empty string, or // simply a comma, or a pile of commas, then return an empty ProtoSet. if pairs.len() == 0 { return Ok(ProtoSet::default()); @@ -549,6 +547,13 @@ mod test { } #[test] + fn test_versions_from_str_whitespace() { + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,2\n")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1\r,2")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,\t2")); + } + + #[test] fn test_versions_from_str_overlap() { assert_eq!(Err(ProtoverError::Overlap), ProtoSet::from_str("1-3,2-4")); }

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 700f5bcc43fb959927dd1cae4e2943d115144850 Merge: ac721bd3b 87aacbfbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 09:38:26 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.3] Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 87aacbfbba2e2fee67de218b721c0bdb9a0ae73a Merge: cc93f175e 7b7dd9ae1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 09:38:08 2018 -0400 Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3 changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.4] Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 87aacbfbba2e2fee67de218b721c0bdb9a0ae73a Merge: cc93f175e 7b7dd9ae1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 09:38:08 2018 -0400 Merge remote-tracking branch 'onionk/rust-protospace' into maint-0.3.3 changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.4] rust/protover: don't accept whitespace in ProtoSet::from_str()
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 7b7dd9ae1c429248fdb7d6062f1af4c360527f00 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Aug 17 03:22:47 2018 +0000 rust/protover: don't accept whitespace in ProtoSet::from_str() It's impossible for spaces to get here, since spaces are used as separators between individual protocol entries higher up. And it shouldn't ignore whitespace that isn't a literal space character, because that would differ from the C implementation. These were added in 9925d2e68709aa7346f4c5bc98ea1349df6741f3. Fixes #27177. Bugfix on 0.3.3.5-rc. --- changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changes/bug27177 b/changes/bug27177 new file mode 100644 index 000000000..b03bbc96e --- /dev/null +++ b/changes/bug27177 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - Protover parsing was accepting the presence of whitespace in version + strings, which the C implementation would choke on, e.g. "Desc=1\t,2". + Fixes bug 27177; bugfix on 0.3.3.5-rc. diff --git a/src/rust/protover/protoset.rs b/src/rust/protover/protoset.rs index 4afc50edf..bb6794b6a 100644 --- a/src/rust/protover/protoset.rs +++ b/src/rust/protover/protoset.rs @@ -340,11 +340,9 @@ impl FromStr for ProtoSet { /// ``` fn from_str(version_string: &str) -> Result<Self, Self::Err> { let mut pairs: Vec<(Version, Version)> = Vec::new(); - let pieces: ::std::str::Split<char> = version_string.trim().split(','); - - for piece in pieces { - let p: &str = piece.trim(); + let pieces: ::std::str::Split<char> = version_string.split(','); + for p in pieces { if p.is_empty() { continue; } else if p.contains('-') { @@ -369,7 +367,7 @@ impl FromStr for ProtoSet { pairs.push((v, v)); } } - // If we were passed in an empty string, or a bunch of whitespace, or + // If we were passed in an empty string, or // simply a comma, or a pile of commas, then return an empty ProtoSet. if pairs.len() == 0 { return Ok(ProtoSet::default()); @@ -549,6 +547,13 @@ mod test { } #[test] + fn test_versions_from_str_whitespace() { + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,2\n")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1\r,2")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,\t2")); + } + + #[test] fn test_versions_from_str_overlap() { assert_eq!(Err(ProtoverError::Overlap), ProtoSet::from_str("1-3,2-4")); }

1 0

[tor/release-0.3.3] Merge branch 'maint-0.3.3' into release-0.3.3
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 4f2ef558e726ddad988430c666831793cbcbe544 Merge: 5c1ea692e 87aacbfbb Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 09:38:26 2018 -0400 Merge branch 'maint-0.3.3' into release-0.3.3 changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/release-0.3.4] Merge branch 'maint-0.3.4' into release-0.3.4
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit 71e563f268a0bae3eb7886cefcef4c6accef285b Merge: b81ce1fbc 700f5bcc4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 09:38:26 2018 -0400 Merge branch 'maint-0.3.4' into release-0.3.4 changes/bug27177 | 4 ++++ src/rust/protover/protoset.rs | 15 ++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)

1 0

[tor/maint-0.3.3] rust/protover: fix hyphen parsing bug in ProtoSet::from_str()
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit cc93f175ed6f7495b4d50cdaad0527f718da77f5 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Tue Aug 7 00:45:33 2018 +0000 rust/protover: fix hyphen parsing bug in ProtoSet::from_str() It was parsing "1-2-3" as if it were 1-2, ignoring the 2nd hyphen and everything after. Introduced in d1820c1516a31a149fc51a9e5126bf899e4c4e08. Fixes #27164; bugfix on 0.3.3.1-alpha. --- changes/bug27164 | 4 ++++ src/rust/protover/protoset.rs | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/changes/bug27164 b/changes/bug27164 new file mode 100644 index 000000000..d04d2f28f --- /dev/null +++ b/changes/bug27164 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - Protover parsing was ignoring a 2nd hyphen and everything after it, + accepting entries like "Link=1-5-foo". Fixes bug 27164; bugfix on + 0.3.3.1-alpha. diff --git a/src/rust/protover/protoset.rs b/src/rust/protover/protoset.rs index 4afc50edf..61b21ede9 100644 --- a/src/rust/protover/protoset.rs +++ b/src/rust/protover/protoset.rs @@ -348,7 +348,7 @@ impl FromStr for ProtoSet { if p.is_empty() { continue; } else if p.contains('-') { - let mut pair = p.split('-'); + let mut pair = p.splitn(2, '-'); let low = pair.next().ok_or(ProtoverError::Unparseable)?; let high = pair.next().ok_or(ProtoverError::Unparseable)?; @@ -539,6 +539,18 @@ mod test { } #[test] + fn test_versions_from_str_hyphens() { + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("--1")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("-1-2")); + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1--2")); + } + + #[test] + fn test_versions_from_str_triple() { + assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1-2-3")); + } + + #[test] fn test_versions_from_str_1exclam() { assert_eq!(Err(ProtoverError::Unparseable), ProtoSet::from_str("1,!")); }

1 0

[tor/maint-0.3.4] Merge branch 'maint-0.3.3' into maint-0.3.4
by nickm＠torproject.org 17 Aug '18

17 Aug '18

commit ac721bd3b4223586b004df5f8be1b05069bf6855 Merge: b49355915 cc93f175e Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Aug 17 09:29:46 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27164 | 4 ++++ src/rust/protover/protoset.rs | 14 +++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-)

1 0