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

[tor/master] Add log message for Tor being non-exit by default
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 2c093c96b202a628aeb225792e0c7d95732e96ef Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Sep 13 21:50:06 2018 -0400 Add log message for Tor being non-exit by default --- src/core/or/policies.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/core/or/policies.c b/src/core/or/policies.c index 5413ad0eb..61d3a90ff 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -1155,6 +1155,17 @@ validate_addr_policies(const or_options_t *options, char **msg) REJECT("Error in ExitPolicy entry."); } + static int warned_about_nonexit = 0; + + if (!warned_about_nonexit && options->ExitPolicy == NULL && + options->ExitRelay == -1 && options->ReducedExitPolicy == 0) { + warned_about_nonexit = 1; + log_notice(LD_CONFIG, "By default, Tor does not run as an exit relay. " + "The reason is to prevent your relay from appearing as the " + "source of abusive traffic. If you want to be an exit relay, " + "set ExitRelay to 1."); + } + /* The rest of these calls *append* to addr_policy. So don't actually * use the results for anything other than checking if they parse! */ if (parse_addr_policy(options->DirPolicy, &addr_policy, -1))

1 0

[tor/maint-0.3.3] rust/protover: validate unknown protocol names use only allowed characters
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 7c26f88fd7bde6844f36f4810675688542c313bf Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Sep 13 16:33:58 2018 +0000 rust/protover: validate unknown protocol names use only allowed characters --- changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/changes/bug27687 b/changes/bug27687 new file mode 100644 index 000000000..8b7903b63 --- /dev/null +++ b/changes/bug27687 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - protover parsed and accepted unknown protocol names containing invalid + characters outside the range [A-Za-z0-9-]. Fixes bug 27687; bugfix on + 0.3.3.1-alpha. diff --git a/src/rust/protover/errors.rs b/src/rust/protover/errors.rs index 56473d12e..d9dc73381 100644 --- a/src/rust/protover/errors.rs +++ b/src/rust/protover/errors.rs @@ -18,6 +18,7 @@ pub enum ProtoverError { ExceedsExpansionLimit, UnknownProtocol, ExceedsNameLimit, + InvalidProtocol, } /// Descriptive error messages for `ProtoverError` variants. @@ -38,6 +39,8 @@ impl Display for ProtoverError { => write!(f, "A protocol in the protover string we attempted to parse is unknown."), ProtoverError::ExceedsNameLimit => write!(f, "An unrecognised protocol name was too long."), + ProtoverError::InvalidProtocol + => write!(f, "A protocol name includes invalid characters."), } } } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 12ede53e5..b3563b063 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -113,11 +113,17 @@ impl fmt::Display for UnknownProtocol { } } +fn is_valid_proto(s: &str) -> bool { + s.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') +} + impl FromStr for UnknownProtocol { type Err = ProtoverError; fn from_str(s: &str) -> Result<Self, Self::Err> { - if s.len() <= MAX_PROTOCOL_NAME_LENGTH { + if !is_valid_proto(s) { + Err(ProtoverError::InvalidProtocol) + } else if s.len() <= MAX_PROTOCOL_NAME_LENGTH { Ok(UnknownProtocol(s.to_string())) } else { Err(ProtoverError::ExceedsNameLimit) @@ -129,6 +135,9 @@ impl UnknownProtocol { /// Create an `UnknownProtocol`, ignoring whether or not it /// exceeds MAX_PROTOCOL_NAME_LENGTH. fn from_str_any_len(s: &str) -> Result<Self, ProtoverError> { + if !is_valid_proto(s) { + return Err(ProtoverError::InvalidProtocol); + } Ok(UnknownProtocol(s.to_string())) } } @@ -777,6 +786,29 @@ mod test { use super::*; + macro_rules! parse_proto { + ($e:expr) => {{ + let proto: Result<UnknownProtocol, _> = $e.parse(); + let proto2 = UnknownProtocol::from_str_any_len($e); + assert_eq!(proto, proto2); + proto + }}; + } + + #[test] + fn test_protocol_from_str() { + assert!(parse_proto!("Cons").is_ok()); + assert!(parse_proto!("123").is_ok()); + assert!(parse_proto!("1-2-3").is_ok()); + + let err = Err(ProtoverError::InvalidProtocol); + assert_eq!(err, parse_proto!("a_b_c")); + assert_eq!(err, parse_proto!("a b")); + assert_eq!(err, parse_proto!("a,")); + assert_eq!(err, parse_proto!("b.")); + assert_eq!(err, parse_proto!("é")); + } + macro_rules! assert_protoentry_is_parseable { ($e:expr) => ( let protoentry: Result<ProtoEntry, ProtoverError> = $e.parse();

1 0

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

14 Sep '18

commit 82b128277203b86f35739a424787bbb268a6cdeb Merge: 3ddfd5ff2 7c26f88fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:25:34 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.4] rust/protover: validate unknown protocol names use only allowed characters
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 7c26f88fd7bde6844f36f4810675688542c313bf Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Sep 13 16:33:58 2018 +0000 rust/protover: validate unknown protocol names use only allowed characters --- changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/changes/bug27687 b/changes/bug27687 new file mode 100644 index 000000000..8b7903b63 --- /dev/null +++ b/changes/bug27687 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - protover parsed and accepted unknown protocol names containing invalid + characters outside the range [A-Za-z0-9-]. Fixes bug 27687; bugfix on + 0.3.3.1-alpha. diff --git a/src/rust/protover/errors.rs b/src/rust/protover/errors.rs index 56473d12e..d9dc73381 100644 --- a/src/rust/protover/errors.rs +++ b/src/rust/protover/errors.rs @@ -18,6 +18,7 @@ pub enum ProtoverError { ExceedsExpansionLimit, UnknownProtocol, ExceedsNameLimit, + InvalidProtocol, } /// Descriptive error messages for `ProtoverError` variants. @@ -38,6 +39,8 @@ impl Display for ProtoverError { => write!(f, "A protocol in the protover string we attempted to parse is unknown."), ProtoverError::ExceedsNameLimit => write!(f, "An unrecognised protocol name was too long."), + ProtoverError::InvalidProtocol + => write!(f, "A protocol name includes invalid characters."), } } } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 12ede53e5..b3563b063 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -113,11 +113,17 @@ impl fmt::Display for UnknownProtocol { } } +fn is_valid_proto(s: &str) -> bool { + s.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') +} + impl FromStr for UnknownProtocol { type Err = ProtoverError; fn from_str(s: &str) -> Result<Self, Self::Err> { - if s.len() <= MAX_PROTOCOL_NAME_LENGTH { + if !is_valid_proto(s) { + Err(ProtoverError::InvalidProtocol) + } else if s.len() <= MAX_PROTOCOL_NAME_LENGTH { Ok(UnknownProtocol(s.to_string())) } else { Err(ProtoverError::ExceedsNameLimit) @@ -129,6 +135,9 @@ impl UnknownProtocol { /// Create an `UnknownProtocol`, ignoring whether or not it /// exceeds MAX_PROTOCOL_NAME_LENGTH. fn from_str_any_len(s: &str) -> Result<Self, ProtoverError> { + if !is_valid_proto(s) { + return Err(ProtoverError::InvalidProtocol); + } Ok(UnknownProtocol(s.to_string())) } } @@ -777,6 +786,29 @@ mod test { use super::*; + macro_rules! parse_proto { + ($e:expr) => {{ + let proto: Result<UnknownProtocol, _> = $e.parse(); + let proto2 = UnknownProtocol::from_str_any_len($e); + assert_eq!(proto, proto2); + proto + }}; + } + + #[test] + fn test_protocol_from_str() { + assert!(parse_proto!("Cons").is_ok()); + assert!(parse_proto!("123").is_ok()); + assert!(parse_proto!("1-2-3").is_ok()); + + let err = Err(ProtoverError::InvalidProtocol); + assert_eq!(err, parse_proto!("a_b_c")); + assert_eq!(err, parse_proto!("a b")); + assert_eq!(err, parse_proto!("a,")); + assert_eq!(err, parse_proto!("b.")); + assert_eq!(err, parse_proto!("é")); + } + macro_rules! assert_protoentry_is_parseable { ($e:expr) => ( let protoentry: Result<ProtoEntry, ProtoverError> = $e.parse();

1 0

[tor/master] rust/protover: validate unknown protocol names use only allowed characters
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 7c26f88fd7bde6844f36f4810675688542c313bf Author: cypherpunks <cypherpunks(a)torproject.org> Date: Thu Sep 13 16:33:58 2018 +0000 rust/protover: validate unknown protocol names use only allowed characters --- changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/changes/bug27687 b/changes/bug27687 new file mode 100644 index 000000000..8b7903b63 --- /dev/null +++ b/changes/bug27687 @@ -0,0 +1,4 @@ + o Minor bugfixes (rust): + - protover parsed and accepted unknown protocol names containing invalid + characters outside the range [A-Za-z0-9-]. Fixes bug 27687; bugfix on + 0.3.3.1-alpha. diff --git a/src/rust/protover/errors.rs b/src/rust/protover/errors.rs index 56473d12e..d9dc73381 100644 --- a/src/rust/protover/errors.rs +++ b/src/rust/protover/errors.rs @@ -18,6 +18,7 @@ pub enum ProtoverError { ExceedsExpansionLimit, UnknownProtocol, ExceedsNameLimit, + InvalidProtocol, } /// Descriptive error messages for `ProtoverError` variants. @@ -38,6 +39,8 @@ impl Display for ProtoverError { => write!(f, "A protocol in the protover string we attempted to parse is unknown."), ProtoverError::ExceedsNameLimit => write!(f, "An unrecognised protocol name was too long."), + ProtoverError::InvalidProtocol + => write!(f, "A protocol name includes invalid characters."), } } } diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 12ede53e5..b3563b063 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -113,11 +113,17 @@ impl fmt::Display for UnknownProtocol { } } +fn is_valid_proto(s: &str) -> bool { + s.chars().all(|c| c.is_ascii_alphanumeric() || c == '-') +} + impl FromStr for UnknownProtocol { type Err = ProtoverError; fn from_str(s: &str) -> Result<Self, Self::Err> { - if s.len() <= MAX_PROTOCOL_NAME_LENGTH { + if !is_valid_proto(s) { + Err(ProtoverError::InvalidProtocol) + } else if s.len() <= MAX_PROTOCOL_NAME_LENGTH { Ok(UnknownProtocol(s.to_string())) } else { Err(ProtoverError::ExceedsNameLimit) @@ -129,6 +135,9 @@ impl UnknownProtocol { /// Create an `UnknownProtocol`, ignoring whether or not it /// exceeds MAX_PROTOCOL_NAME_LENGTH. fn from_str_any_len(s: &str) -> Result<Self, ProtoverError> { + if !is_valid_proto(s) { + return Err(ProtoverError::InvalidProtocol); + } Ok(UnknownProtocol(s.to_string())) } } @@ -777,6 +786,29 @@ mod test { use super::*; + macro_rules! parse_proto { + ($e:expr) => {{ + let proto: Result<UnknownProtocol, _> = $e.parse(); + let proto2 = UnknownProtocol::from_str_any_len($e); + assert_eq!(proto, proto2); + proto + }}; + } + + #[test] + fn test_protocol_from_str() { + assert!(parse_proto!("Cons").is_ok()); + assert!(parse_proto!("123").is_ok()); + assert!(parse_proto!("1-2-3").is_ok()); + + let err = Err(ProtoverError::InvalidProtocol); + assert_eq!(err, parse_proto!("a_b_c")); + assert_eq!(err, parse_proto!("a b")); + assert_eq!(err, parse_proto!("a,")); + assert_eq!(err, parse_proto!("b.")); + assert_eq!(err, parse_proto!("é")); + } + macro_rules! assert_protoentry_is_parseable { ($e:expr) => ( let protoentry: Result<ProtoEntry, ProtoverError> = $e.parse();

1 0

[tor/master] Merge branch 'rust-protokeyword1' into rust-protokeyword1-034
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 574d59c6405e6c8a4baee77e90afac8c9e89a3db Merge: 3ddfd5ff2 7c26f88fd Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Sep 14 02:26:31 2018 +0000 Merge branch 'rust-protokeyword1' into rust-protokeyword1-034 changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'rust-protokeyword1-034' into rust-protokeyword1-035
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit bf9dc697fa39b2a3fea8bd57ba16797144ec47c5 Merge: d8280216c 574d59c64 Author: cypherpunks <cypherpunks(a)torproject.org> Date: Fri Sep 14 02:33:59 2018 +0000 Merge branch 'rust-protokeyword1-034' into rust-protokeyword1-035 changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 4 ++++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) diff --cc src/rust/protover/errors.rs index 71fbc53e1,d9dc73381..f26a48b01 --- a/src/rust/protover/errors.rs +++ b/src/rust/protover/errors.rs @@@ -24,30 -25,22 +25,33 @@@ pub enum ProtoverError impl Display for ProtoverError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match *self { - ProtoverError::Overlap - => write!(f, "Two or more (low, high) protover ranges would overlap once expanded."), - ProtoverError::LowGreaterThanHigh - => write!(f, "The low in a (low, high) protover range was greater than high."), - ProtoverError::Unparseable - => write!(f, "The protover string was unparseable."), - ProtoverError::ExceedsMax - => write!(f, "The high in a (low, high) protover range exceeds u32::MAX."), - ProtoverError::ExceedsExpansionLimit - => write!(f, "The protover string would exceed the maximum expansion limit."), - ProtoverError::UnknownProtocol - => write!(f, "A protocol in the protover string we attempted to parse is unknown."), - ProtoverError::ExceedsNameLimit - => write!(f, "An unrecognised protocol name was too long."), - ProtoverError::InvalidProtocol - => write!(f, "A protocol name includes invalid characters."), + ProtoverError::Overlap => write!( + f, + "Two or more (low, high) protover ranges would overlap once expanded." + ), + ProtoverError::LowGreaterThanHigh => write!( + f, + "The low in a (low, high) protover range was greater than high." + ), + ProtoverError::Unparseable => write!(f, "The protover string was unparseable."), + ProtoverError::ExceedsMax => write!( + f, + "The high in a (low, high) protover range exceeds u32::MAX." + ), + ProtoverError::ExceedsExpansionLimit => write!( + f, + "The protover string would exceed the maximum expansion limit." + ), + ProtoverError::UnknownProtocol => write!( + f, + "A protocol in the protover string we attempted to parse is unknown." + ), + ProtoverError::ExceedsNameLimit => { + write!(f, "An unrecognised protocol name was too long.") + } ++ ProtoverError::InvalidProtocol => { ++ write!(f, "A protocol name includes invalid characters.") ++ } } } } diff --cc src/rust/protover/protover.rs index 8f99a8a8e,0c23a8379..6fbe7c5dc --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@@ -772,8 -771,31 +781,31 @@@ mod test use super::*; + macro_rules! parse_proto { + ($e:expr) => {{ + let proto: Result<UnknownProtocol, _> = $e.parse(); + let proto2 = UnknownProtocol::from_str_any_len($e); + assert_eq!(proto, proto2); + proto + }}; + } + + #[test] + fn test_protocol_from_str() { + assert!(parse_proto!("Cons").is_ok()); + assert!(parse_proto!("123").is_ok()); + assert!(parse_proto!("1-2-3").is_ok()); + + let err = Err(ProtoverError::InvalidProtocol); + assert_eq!(err, parse_proto!("a_b_c")); + assert_eq!(err, parse_proto!("a b")); + assert_eq!(err, parse_proto!("a,")); + assert_eq!(err, parse_proto!("b.")); + assert_eq!(err, parse_proto!("é")); + } + macro_rules! assert_protoentry_is_parseable { - ($e:expr) => ( + ($e:expr) => { let protoentry: Result<ProtoEntry, ProtoverError> = $e.parse(); assert!(protoentry.is_ok(), format!("{:?}", protoentry.err()));

1 0

[tor/master] Merge remote-tracking branch 'onionk/rust-protokeyword1-035'
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 84e3ada71bb3339ebde27734f0924b0c39ddab99 Merge: bb012d794 bf9dc697f Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:25:31 2018 -0400 Merge remote-tracking branch 'onionk/rust-protokeyword1-035' changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 4 ++++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.4'
by nickm＠torproject.org 14 Sep '18

14 Sep '18

commit 0582f678e7307ad271b94a393ba6e76f5acce897 Merge: 84e3ada71 82b128277 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:25:34 2018 -0400 Merge branch 'maint-0.3.4'

1 0

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

14 Sep '18

commit 82b128277203b86f35739a424787bbb268a6cdeb Merge: 3ddfd5ff2 7c26f88fd Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Sep 14 09:25:34 2018 -0400 Merge branch 'maint-0.3.3' into maint-0.3.4 changes/bug27687 | 4 ++++ src/rust/protover/errors.rs | 3 +++ src/rust/protover/protover.rs | 34 +++++++++++++++++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-)

1 0