Skip to content

Commit

Permalink
fix: do not crash in ServerConfig::from_url() on unknown method (#1762)
Browse files Browse the repository at this point in the history
  • Loading branch information
link2xt authored Nov 11, 2024
1 parent ea2e315 commit 3582e27
Showing 1 changed file with 21 additions and 1 deletion.
22 changes: 21 additions & 1 deletion crates/shadowsocks/src/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -905,7 +905,13 @@ impl ServerConfig {
}
};

let method = method.parse().expect("method");
let method = match method.parse::<CipherKind>() {
Ok(m) => m,
Err(err) => {
error!("failed to parse \"{}\" to CipherKind, err: {:?}", method, err);
return Err(UrlParseError::InvalidMethod);
}
};
let mut svrconfig = ServerConfig::new(addr, pwd, method);

if let Some(q) = parsed.query() {
Expand Down Expand Up @@ -959,6 +965,7 @@ impl ServerConfig {
pub enum UrlParseError {
ParseError(url::ParseError),
InvalidScheme,
InvalidMethod,
InvalidUserInfo,
MissingHost,
InvalidAuthInfo,
Expand All @@ -977,6 +984,7 @@ impl fmt::Display for UrlParseError {
match *self {
UrlParseError::ParseError(ref err) => fmt::Display::fmt(err, f),
UrlParseError::InvalidScheme => write!(f, "URL must have \"ss://\" scheme"),
UrlParseError::InvalidMethod => write!(f, "unknown encryption method"),
UrlParseError::InvalidUserInfo => write!(f, "invalid user info"),
UrlParseError::MissingHost => write!(f, "missing host"),
UrlParseError::InvalidAuthInfo => write!(f, "invalid authentication info"),
Expand All @@ -991,6 +999,7 @@ impl error::Error for UrlParseError {
match *self {
UrlParseError::ParseError(ref err) => Some(err as &dyn error::Error),
UrlParseError::InvalidScheme => None,
UrlParseError::InvalidMethod => None,
UrlParseError::InvalidUserInfo => None,
UrlParseError::MissingHost => None,
UrlParseError::InvalidAuthInfo => None,
Expand Down Expand Up @@ -1405,3 +1414,14 @@ impl FromStr for ReplayAttackPolicy {
}
}
}

#[cfg(test)]
mod test {
use super::*;

#[test]
fn test_server_config_from_url() {
let server_config = ServerConfig::from_url("ss://foo:[email protected]:9999");
assert!(matches!(server_config, Err(UrlParseError::InvalidMethod)));
}
}

0 comments on commit 3582e27

Please sign in to comment.