Tim-Paik/srv
1
0
Fork 0
mirror of https://github.com/Tim-Paik/srv.git synced 2024-10-13 00:29:43 +00:00
Code Issues Projects Releases Wiki Activity

1.0.0-rc.2 xdg-open and tls bug fix

Browse Source
This commit is contained in:
Tim-Paik 2021-08-23 17:47:56 +08:00
parent 8db0f82d08
commit d59a3fc4a5
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.lock generated
View File

@ -2488,7 +2488,7 @@ checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
[[package]] [[package]]
name = "web" name = "web"
version = "0.8.3-beta" version = "1.0.0-rc"
dependencies = [ dependencies = [
"actix-files", "actix-files",
"actix-http", "actix-http",

2
Cargo.toml
View File

@ -3,7 +3,7 @@ authors = ["Tim_Paik <timpaikc@outlook.com>"]
description = "simple http server written in rust" description = "simple http server written in rust"
edition = "2018" edition = "2018"
name = "web" name = "web"
version = "0.8.3-beta" version = "1.0.0-rc"
[dependencies] [dependencies]
actix-files = "0.5" actix-files = "0.5"

14
src/main.rs
View File

@ -492,7 +492,13 @@ async fn main() -> std::io::Result<()> {
std::process::Command::new("explorer").arg(url).spawn().ok(); std::process::Command::new("explorer").arg(url).spawn().ok();
} else if cfg!(target_os = "macos") { } else if cfg!(target_os = "macos") {
std::process::Command::new("open").arg(url).spawn().ok(); std::process::Command::new("open").arg(url).spawn().ok();
} else if cfg!(target_os = "linux") { } else if cfg!(target_os = "linux")
|| cfg!(target_os = "android")
|| cfg!(target_os = "freebsd")
|| cfg!(target_os = "dragonfly")
|| cfg!(target_os = "openbsd")
|| cfg!(target_os = "netbsd")
{
std::process::Command::new("xdg-open").arg(url).spawn().ok(); std::process::Command::new("xdg-open").arg(url).spawn().ok();
} }
}; };
@ -572,7 +578,7 @@ async fn main() -> std::io::Result<()> {
} }
} }
} }
if data.starts_with("[ERROR]") { if data.starts_with("[ERROR]") || data.starts_with("TLS alert") {
writeln!(buf, "\r{}", red.value(data)) writeln!(buf, "\r{}", red.value(data))
} else { } else {
writeln!(buf, "\r{}", green.value(data)) writeln!(buf, "\r{}", green.value(data))
@ -581,7 +587,6 @@ async fn main() -> std::io::Result<()> {
.init(); .init();
let addr = if let Some(matches) = matches.subcommand_matches("doc") { let addr = if let Some(matches) = matches.subcommand_matches("doc") {
info!("[INFO] Generating document (may take a while)");
let mut cargo_toml = match std::fs::File::open("./Cargo.toml") { let mut cargo_toml = match std::fs::File::open("./Cargo.toml") {
Ok(file) => file, Ok(file) => file,
Err(e) => { Err(e) => {
@ -605,6 +610,7 @@ async fn main() -> std::io::Result<()> {
} }
}; };
let crate_name = contents.package.name; let crate_name = contents.package.name;
info!("[INFO] Generating document (may take a while)");
match std::process::Command::new("cargo").arg("doc").output() { match std::process::Command::new("cargo").arg("doc").output() {
Ok(output) => { Ok(output) => {
let output = std::str::from_utf8(&output.stderr).unwrap_or(""); let output = std::str::from_utf8(&output.stderr).unwrap_or("");
@ -745,7 +751,7 @@ async fn main() -> std::io::Result<()> {
); );
let mut config = rustls::ServerConfig::new(rustls::NoClientAuth::new()); let mut config = rustls::ServerConfig::new(rustls::NoClientAuth::new());
let cert_chain = rustls::internal::pemfile::certs(cert).unwrap(); let cert_chain = rustls::internal::pemfile::certs(cert).unwrap();
let mut keys = rustls::internal::pemfile::rsa_private_keys(key).unwrap(); let mut keys = rustls::internal::pemfile::pkcs8_private_keys(key).unwrap();
config.set_single_cert(cert_chain, keys.remove(0)).unwrap(); config.set_single_cert(cert_chain, keys.remove(0)).unwrap();
server.bind_rustls(addr, config) server.bind_rustls(addr, config)
} else { } else {