过滤无效bucketname

This commit is contained in:
weisd
2024-08-09 23:03:44 +08:00
parent 9f4c49c07d
commit f5263cf8d7
+24 -23
View File
@@ -45,21 +45,21 @@ async fn run(opt: config::Opt) -> Result<()> {
let listener = TcpListener::bind(opt.address.clone()).await?; let listener = TcpListener::bind(opt.address.clone()).await?;
let local_addr: SocketAddr = listener.local_addr()?; let local_addr: SocketAddr = listener.local_addr()?;
let mut domain_name = { // let mut domain_name = {
netif::up()? // netif::up()?
.map(|x| x.address().to_owned()) // .map(|x| x.address().to_owned())
.filter(|v| v.is_ipv4()) // .filter(|v| v.is_ipv4())
// .filter(|v| v.is_ipv4() && !v.is_loopback() && !v.is_unspecified()) // // .filter(|v| v.is_ipv4() && !v.is_loopback() && !v.is_unspecified())
.map(|v| format!("{}", v)) // .map(|v| format!("{}", v))
.next() // .next()
.and_then(|ip| { // .and_then(|ip| {
if let SocketAddr::V4(ipv4) = local_addr { // if let SocketAddr::V4(ipv4) = local_addr {
Some(format!("{}:{}", ip, ipv4.port())) // Some(format!("{}:{}", ip, ipv4.port()))
} else { // } else {
None // None
} // }
}) // })
}; // };
// Setup S3 service // Setup S3 service
let service = { let service = {
@@ -79,16 +79,17 @@ async fn run(opt: config::Opt) -> Result<()> {
// Enable parsing virtual-hosted-style requests // Enable parsing virtual-hosted-style requests
if let Some(dm) = opt.domain_name { if let Some(dm) = opt.domain_name {
domain_name = Some(dm) info!("virtual-hosted-style requests are enabled use domain_name {}", &dm);
b.set_base_domain(dm);
} }
if domain_name.is_some() { // if domain_name.is_some() {
info!( // info!(
"virtual-hosted-style requests are enabled use domain_name {}", // "virtual-hosted-style requests are enabled use domain_name {}",
domain_name.as_ref().unwrap() // domain_name.as_ref().unwrap()
); // );
b.set_base_domain(domain_name.unwrap()); // b.set_base_domain(domain_name.unwrap());
} // }
b.build() b.build()
}; };