source/shadowsocks-rust
1
0
Fork 0
mirror of https://github.com/shadowsocks/shadowsocks-rust.git synced 2026-02-09 10:09:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Config check_integrity extends to DnsLocal, TunnelLocal and HttpsLocal

Browse Source
This commit is contained in:
zonyitoo
2020-11-23 16:12:53 +08:00
parent fee940af88
commit 8bd54052ac
7 changed files with 135 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/bin/local.rs
View File

@@ -256,19 +256,6 @@ fn main() {
config.server.push(svr_addr);
}
#[cfg(target_os = "android")]
if matches.is_present("VPN_MODE") {
// A socket `protect_path` in CWD
// Same as shadowsocks-libev's android.c
config.protect_path = Some(From::from("protect_path"));
// Set default config.local_dns_addr
#[cfg(feature = "local-dns")]
if config.local_dns_addr.is_none() {
config.local_dns_addr = Some(From::from("local_dns_path"));
}
}
#[cfg(feature = "local-flow-stat")]
{
if let Some(stat_path) = matches.value_of("STAT_PATH") {
@@ -283,8 +270,6 @@ fn main() {
if let Some(local_dns_addr) = matches.value_of("LOCAL_DNS_ADDR") {
let addr = local_dns_addr.parse::<LocalDnsAddr>().expect("local dns address");
config.local_dns_addr = Some(addr);
} else if config.local_dns_addr.is_none() {
panic!("--local-dns-addr is required for local-dns relay");
}
if let Some(remote_dns_addr) = matches.value_of("REMOTE_DNS_ADDR") {
@@ -298,6 +283,19 @@ fn main() {
}
}
#[cfg(target_os = "android")]
if matches.is_present("VPN_MODE") {
// A socket `protect_path` in CWD
// Same as shadowsocks-libev's android.c
config.protect_path = Some(From::from("protect_path"));
// Set default config.local_dns_addr
#[cfg(feature = "local-dns")]
if config.local_dns_addr.is_none() {
config.local_dns_addr = Some(From::from("local_dns_path"));
}
}
if let Some(local_addr) = matches.value_of("LOCAL_ADDR") {
let local_addr = local_addr.parse::<ServerAddr>().expect("local bind addr");
config.local_addr = Some(local_addr);
@@ -412,6 +410,12 @@ fn main() {
return;
}
if let Err(err) = config.check_integrity() {
eprintln!("config integrity check failed, {}", err);
println!("{}", matches.usage());
return;
}
#[cfg(unix)]
if matches.is_present("DAEMONIZE") {
daemonize::daemonize(matches.value_of("DAEMONIZE_PID_PATH"));

6
src/bin/manager.rs
View File

@@ -192,6 +192,12 @@ fn main() {
return;
}
if let Err(err) = config.check_integrity() {
eprintln!("config integrity check failed, {}", err);
println!("{}", matches.usage());
return;
}
#[cfg(unix)]
if matches.is_present("DAEMONIZE") {
daemonize::daemonize(matches.value_of("DAEMONIZE_PID_PATH"));

6
src/bin/server.rs
View File

@@ -216,6 +216,12 @@ fn main() {
return;
}
if let Err(err) = config.check_integrity() {
eprintln!("config integrity check failed, {}", err);
println!("{}", matches.usage());
return;
}
#[cfg(unix)]
if matches.is_present("DAEMONIZE") {
daemonize::daemonize(matches.value_of("DAEMONIZE_PID_PATH"));

113
src/config.rs
View File

@@ -1614,44 +1614,109 @@ impl Config {
/// Check if all required fields are already set
pub fn check_integrity(&self) -> Result<(), Error> {
if self.config_type.is_local() {
if self.local_addr.is_some() {
return Ok(());
if self.local_addr.is_none() {
let err = Error::new(
ErrorKind::MissingField,
"missing `local_address` and `local_port` for client configuration",
None,
);
return Err(err);
}
let err = Error::new(
ErrorKind::MissingField,
"missing `local_address` and `local_port` for client configuration",
None,
);
return Err(err);
if self.server.is_empty() {
let err = Error::new(
ErrorKind::MissingField,
"missing `servers` for client configuration",
None,
);
return Err(err);
}
}
if self.config_type.is_server() {
if !self.server.is_empty() {
return Ok(());
if self.server.is_empty() {
let err = Error::new(
ErrorKind::MissingField,
"missing any valid servers in configuration",
None,
);
return Err(err);
}
let err = Error::new(
ErrorKind::MissingField,
"missing any valid servers in configuration",
None,
);
return Err(err);
}
if self.config_type.is_manager() {
if self.manager.is_some() {
return Ok(());
if self.manager.is_none() {
let err = Error::new(
ErrorKind::MissingField,
"missing `manager_addr` and `manager_port` in configuration",
None,
);
return Err(err);
}
}
#[cfg(feature = "local-dns")]
if self.config_type == ConfigType::DnsLocal {
if self.dns_bind_addr.is_none() || self.local_dns_addr.is_none() || self.remote_dns_addr.is_none() {
let err = Error::new(
ErrorKind::MissingField,
"missing `dns_bind_addr`, `local_dns_addr` or `remote_dns_addr` in configuration",
None,
);
return Err(err);
}
} else if self.dns_bind_addr.is_some() {
// Run a DNS server in the same process
if self.local_dns_addr.is_none() || self.remote_dns_addr.is_none() {
let err = Error::new(
ErrorKind::MissingField,
"missing `local_dns_addr` or `remote_dns_addr` in configuration",
None,
);
return Err(err);
}
}
#[cfg(all(
feature = "local-http",
any(feature = "local-http-native-tls", feature = "local-http-rustls")
))]
if self.config_type == ConfigType::HttpsLocal {
#[cfg(feature = "local-http-rustls")]
if self.tls_identity_certificate_path.is_none() || self.tls_identity_private_key_path.is_none() {
let err = Error::new(
ErrorKind::MissingField,
"missing `tls_identity_certificate_path` or `tls_identity_private_key_path` in configuration",
None,
);
return Err(err);
}
let err = Error::new(
ErrorKind::MissingField,
"missing `manager_addr` and `manager_port` in configuration",
None,
);
#[cfg(feature = "local-http-native-tls")]
if self.tls_identity_path.is_none() || self.tls_identity_password.is_none() {
let err = Error::new(
ErrorKind::MissingField,
"missing `tls_identity_path` or `tls_identity_password` in configuration",
None,
);
return Err(err);
}
}
#[cfg(feature = "local-flow-stat")]
if self.stat_path.is_none() {
let err = Error::new(ErrorKind::MissingField, "missing `stat_path` in configuration", None);
return Err(err);
}
#[cfg(feature = "local-tunnel")]
if self.config_type == ConfigType::TunnelLocal {
if self.forward.is_none() {
let err = Error::new(ErrorKind::MissingField, "missing `forward` in configuration", None);
return Err(err);
}
}
Ok(())
}

5
src/relay/local.rs
View File

@@ -20,6 +20,11 @@ pub async fn run(mut config: Config) -> io::Result<()> {
assert!(config.config_type.is_local());
if let Err(err) = config.check_integrity() {
let e = io::Error::new(ErrorKind::Other, err.desc);
return Err(e);
}
if let Some(nofile) = config.nofile {
debug!("setting RLIMIT_NOFILE to {}", nofile);
if let Err(err) = set_nofile(nofile) {

5
src/relay/manager.rs
View File

@@ -576,6 +576,11 @@ impl ManagerService {
pub async fn run(config: Config) -> io::Result<()> {
assert!(config.config_type.is_manager());
if let Err(err) = config.check_integrity() {
let e = io::Error::new(ErrorKind::Other, err.desc);
return Err(e);
}
if let Some(nofile) = config.nofile {
debug!("setting RLIMIT_NOFILE to {}", nofile);
if let Err(err) = set_nofile(nofile) {

5
src/relay/server.rs
View File

@@ -45,6 +45,11 @@ pub(crate) async fn run_with(
assert!(config.config_type.is_server());
if let Err(err) = config.check_integrity() {
let e = io::Error::new(ErrorKind::Other, err.desc);
return Err(e);
}
if let Some(nofile) = config.nofile {
debug!("setting RLIMIT_NOFILE to {}", nofile);
if let Err(err) = set_nofile(nofile) {