add update deps

.cargo/config.toml

@@ -0,0 +1,5 @@
+[target.x86_64-pc-windows-msvc]
+rustflags = ["-C", "target-feature=+crt-static"]
+
+[target.aarch64-unknown-linux-musl]
+linker = "aarch64-linux-musl-gcc"

.github/workflows/release.yml

@@ -14,39 +14,25 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-  upload-assets-linux:
+  upload-assets:
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - target: aarch64-unknown-linux-musl
+            os: ubuntu-latest
+          - target: x86_64-unknown-linux-musl
+            os: ubuntu-latest
+          - target: x86_64-apple-darwin
+            os: macos-latest
+          - target: x86_64-pc-windows-msvc
+            os: windows-latest
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: taiki-e/upload-rust-binary-action@v1
         with:
-          bin: web
+          bin: srv
-          tar: unix
+          target: ${{ matrix.target }}
-          zip: windows
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  upload-assets-macos:
-    runs-on: macos-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: taiki-e/upload-rust-binary-action@v1
-        with:
-          bin: web
-          tar: unix
-          zip: windows
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  upload-assets-windows:
-    runs-on: windows-latest
-    steps:
-      - uses: actions/checkout@v2
-      - run: vcpkg integrate install
-      - run: vcpkg install openssl:x64-windows-static-md
-      - uses: taiki-e/upload-rust-binary-action@v1
-        with:
-          bin: web
           tar: unix
           zip: windows
         env:

Cargo.toml

@@ -2,26 +2,28 @@
 authors = ["Tim_Paik <timpaikc@outlook.com>"]
 description = "simple http server written in rust"
 edition = "2018"
-name = "web"
+name = "srv"
-version = "0.8.0-beta"
+version = "1.0.0-rc"
 
 [dependencies]
-actix-files = "0.5"
+actix-files = "0.6"
-actix-http = "2.2"
+actix-http = "3.0"
-actix-web = {version = "3.3", features = ["openssl"]}
+actix-web = {version = "4.0", features = ["rustls"]}
-actix-web-httpauth = "0.5"
+actix-web-httpauth = "0.6"
 chrono = "0.4"
-clap = {version = "3.0.0-beta.4", features = ["wrap_help", "color"]}
+clap = {version = "3.1", features = ["wrap_help", "color", "cargo"]}
 env_logger = "0.9"
 lazy_static = "1.4"
 log = "0.4"
-mime_guess = "2"
+mime_guess = "2.0"
-openssl = {version = "0.10", features = ["v110"]}
 regex = "1.5"
-serde = "1"
+rustls = "0.20"
-sha2 = "0.9"
+rustls-pemfile = "1.0"
-tera = "1"
+serde = {version = "1.0", features = ["derive"]}
+sha2 = "0.10"
+tera = "1.15"
 toml = "0.5"
+urlencoding = "2.1"
 
 [profile.release]
 lto = true

LICENSE

@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

README.md

@@ -0,0 +1,98 @@
+# Srv Dev Server
+
+This is a simple HTTP Server for use in a development environment, inspired by [simple-http-server](https://github.com/TheWaWaR/simple-http-server) and [caddy2](https://github.com/caddyserver/caddy), and it is also a practice project for me to learn rust.
+
+### Screenshot
+![screenshot](screenshot.png)
+
+### Built With
+
+- ~~[rocket](https://github.com/SergioBenitez/Rocket)~~ Framework used in previous versions
+- [clap](https://github.com/clap-rs/clap) Provide command line parameter analysis
+- [tera](https://github.com/Keats/tera) Provide template support
+- [actix-web](https://github.com/actix/actix-web) Main frame
+- [actix-files](https://github.com/actix/actix-web/tree/master/actix-files) Provide static resources
+- [actix-web-httpauth](https://github.com/actix/actix-extras/tree/master/actix-web-httpauth) Provide authentication
+- [rustls](https://github.com/rustls/rustls) Provide TLS and HTTP/2 support
+- [env_logger](https://github.com/env-logger-rs/env_logger) Provide log output
+
+
+## Features
+
+- Automatic generation of directory listings (default enabled)
+- Relative path/absolute path/support
+- Brotli/Gzip/Deflate streaming compression support (default disabled, disables Content-length and segmented downloads when enabled)
+- Control whether dotfiles are displayed and can be accessed (default disabled)
+- HTTP cache support, 304 support, Last-Modified/ETag support, of course you can also turn off cache
+- Clearly colored organized log
+- Disable access logging or disable all logging support
+- Automatically open default browser (default disabled)
+- Single-Page Application mode (always serve /index.html when the file is not found)
+- Custom listening address (default 0.0.0.0) Custom listening port number (default 8000)
+- HTTP Basic Authentication Support
+- TLS/SSL support, HTTP/2 support
+- One click to enable CORS, custom CORS header support
+- cargo doc support
+
+## Install
+
+### Pre-compiled Version
+
+#### Linux
+
+##### Archlinux
+
+```shell
+yay -S srv-bin
+```
+
+##### Other Linux
+
+Download the pre-compiled `srv-x86_64-unknown-linux-musl.tar.gz` on the [releases](https://github.com/Tim-Paik/srv/releases/latest), and copy the srv file in the compressed package to `/usr/bin` as a ROOT user with 755 permissions.
+
+```shell
+wget https://github.com/Tim-Paik/srv/releases/download/v1.0.0-rc.6/srv-x86_64-unknown-linux-musl.tar.gz
+tar -xzvf srv-x86_64-unknown-linux-musl.tar.gz
+install -Dm0755 -t /usr/bin/ srv
+rm srv srv-x86_64-unknown-linux-musl.tar.gz
+```
+for reference only
+
+#### MacOS
+
+I'm sorry I don't have the corresponding equipment, but I can only provide `srv-x86_64-apple-darwin.tar.gz` (Of course, if someone can sponsor me a Mac I would be very grateful)
+
+#### Windows
+
+Download the pre-compiled `srv-x86_64-pc-windows-msvc.zip` in the [releases](https://github.com/Tim-Paik/srv/releases/latest), unzip the srv.exe and copy it to your `%PATH%` (if you don’t know what this is, move `srv.exe` to `%SystemRoot%\System32`)
+
+### Compile and Install
+
+You Need:
+
+ - Rust & Cargo Installation
+ - Git Installation
+ - Gcc/Msvc Toolchain Installation
+
+```shell
+git clone git@github.com:Tim-Paik/srv.git
+cd srv
+cargo build --release
+strip target/release/srv
+```
+
+Then you can find the compiled executable file named `srv` in the `target/release/` folder.
+
+## Usage
+
+Execute `srv --help` to get all the usage methods
+
+Waiting to be added...
+
+## License
+
+```text
+This Source Code Form is subject to the terms of the Mozilla Public
+License, v. 2.0. If a copy of the MPL was not distributed with this
+file, You can obtain one at https://mozilla.org/MPL/2.0/.
+```

src/main.rs

@@ -1,5 +1,7 @@
-#[macro_use]
+/* This Source Code Form is subject to the terms of the Mozilla Public
-extern crate clap;
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+
 #[macro_use]
 extern crate lazy_static;
 
@@ -8,13 +10,15 @@ use actix_web::{
     dev::{self, Service, ServiceResponse},
     http, middleware, App, HttpResponse, HttpServer,
 };
+use clap::Arg;
 use env_logger::fmt::Color;
 use log::{error, info};
+use serde::{Deserialize, Serialize};
 use sha2::Digest;
 use std::{
     env::{set_var, var},
     fs::read_dir,
-    io::{Error, ErrorKind, Read, Write},
+    io::{BufReader, Error, ErrorKind, Read, Write},
     net::IpAddr,
     path::{Path, PathBuf},
     str::FromStr,
@@ -151,23 +155,23 @@ fn get_file_type(from: &Path) -> String {
     .to_string()
 }
 
-#[derive(serde::Deserialize)]
+#[derive(Deserialize)]
 struct Package {
     name: String,
 }
 
-#[derive(serde::Deserialize)]
+#[derive(Deserialize)]
 struct CargoToml {
     package: Package,
 }
 
-#[derive(Eq, Ord, PartialEq, PartialOrd, serde::Serialize)]
+#[derive(Eq, Ord, PartialEq, PartialOrd, Serialize)]
 struct Dir {
     name: String,
     modified: String,
 }
 
-#[derive(Eq, Ord, PartialEq, PartialOrd, serde::Serialize)]
+#[derive(Eq, Ord, PartialEq, PartialOrd, Serialize)]
 struct File {
     name: String,
     size: u64,
@@ -175,10 +179,10 @@ struct File {
     modified: String,
 }
 
-#[derive(serde::Serialize)]
+#[derive(Serialize)]
-struct IndexContext<'r> {
+struct IndexContext {
-    title: &'r str,
+    title: String,
-    paths: Vec<&'r str>,
+    paths: Vec<String>,
     dirs: Vec<Dir>,
     files: Vec<File>,
 }
@@ -190,32 +194,31 @@ fn render_index(
     let mut index = dir.path.clone();
     index.push("index.html");
     if index.exists() && index.is_file() {
-        let res = match actix_files::NamedFile::open(index)?
+        let res = actix_files::NamedFile::open(index)?
             .set_content_type(mime_guess::mime::TEXT_HTML_UTF_8)
-            .into_response(req)
+            .into_response(req);
-        {
-            Ok(res) => res,
-            Err(e) => return Err(Error::new(ErrorKind::Other, e.to_string())),
-        };
         return Ok(ServiceResponse::new(req.clone(), res));
     }
-    if var("NOINDEX").unwrap_or("false".to_string()) == "true" {
+    if var("NOINDEX").unwrap_or_else(|_| "false".to_string()) == "true" {
         return Ok(ServiceResponse::new(
             req.clone(),
             HttpResponse::NotFound().body(""),
         ));
     }
-    let show_dot_files = var("DOTFILES").unwrap_or("false".to_string()) == "true";
+    let show_dot_files = var("DOTFILES").unwrap_or_else(|_| "false".to_string()) == "true";
     let mut context = IndexContext {
-        title: "",
+        title: "".to_string(),
         paths: vec![],
         dirs: vec![],
         files: vec![],
     };
     for path in req.path().split('/') {
-        if path == "" {
+        if path.is_empty() {
             continue;
         }
+        let path =
+            urlencoding::decode(path).unwrap_or(std::borrow::Cow::Borrowed("[Parse URL Error]"));
+        let path = path.into_owned();
         context.paths.push(path);
     }
     match read_dir(&dir.path) {
@@ -238,7 +241,7 @@ fn render_index(
                         continue;
                     }
                 };
-                if !show_dot_files && name.starts_with(".") {
+                if !show_dot_files && name.starts_with('.') {
                     continue;
                 }
                 let metadata = match path.metadata() {
@@ -272,7 +275,7 @@ fn render_index(
             }
         }
     }
-    context.title = context.paths.last().unwrap_or(&"/");
+    context.title = context.paths.last().unwrap_or(&"/".to_string()).to_string();
     context.dirs.sort();
     context.files.sort();
     let content = tera::Context::from_serialize(&context);
@@ -285,7 +288,7 @@ fn render_index(
     };
     let index = TEMPLATE
         .render("index", &content)
-        .unwrap_or("TEMPLATE RENDER ERROR".to_string());
+        .unwrap_or_else(|_| "TEMPLATE RENDER ERROR".to_string());
     let res = HttpResponse::Ok()
         .content_type("text/html; charset=utf-8")
         .body(index);
@@ -298,7 +301,7 @@ fn display_path(path: &Path) -> String {
     if root.starts_with("\\\\?\\") {
         root[4..root.len()].to_string()
     } else {
-        root.to_string()
+        root
     }
 }
 
@@ -314,9 +317,14 @@ async fn validator(
     req: dev::ServiceRequest,
     auth: actix_web_httpauth::extractors::basic::BasicAuth,
 ) -> Result<dev::ServiceRequest, actix_web::Error> {
-    if auth.user_id() == var("AUTH_USERNAME").unwrap_or("".to_string()).as_str()
+    if auth.user_id()
+        == var("AUTH_USERNAME")
+            .unwrap_or_else(|_| "".to_string())
+            .as_str()
         && hash(auth.password().unwrap_or(&std::borrow::Cow::from("")))
-            == var("AUTH_PASSWORD").unwrap_or("".to_string()).as_str()
+            == var("AUTH_PASSWORD")
+                .unwrap_or_else(|_| "".to_string())
+                .as_str()
     {
         return Ok(req);
     }
@@ -330,23 +338,7 @@ async fn validator(
 
 #[actix_web::main]
 async fn main() -> std::io::Result<()> {
-    let matches = clap_app!((crate_name!()) =>
+    let check_does_dir_exits = |path: &str| match std::fs::metadata(path) {
-        (version: crate_version!())
-        (author: crate_authors!())
-        (about: crate_description!())
-        (@arg noindex: --noindex "Disable automatic index page generation")
-        (@arg compress: -c --compress "Enable streaming compression (Content-length/segment download will be disabled)")
-        // (@arg upload: -u --upload "Enable file upload")
-        (@arg nocache: --nocache "Disable HTTP cache")
-        (@arg nocolor: --nocolor "Disable cli colors")
-        (@arg cors: --cors [VALUE] min_values(0) max_values(1) "Enable CORS")
-        (@arg spa: --spa "Enable Single-Page Application mode (always serve /index.html when the file is not found)")
-        (@arg dotfiles: -d --dotfiles "Show dotfiles")
-        (@arg open: -o --open "Open the page in the default browser")
-        (@arg quiet: -q --quiet "Disable access log output")
-        (@arg quietall: --quietall "Disable all output")
-        (@arg ROOT: default_value["."] {
-            |path| match std::fs::metadata(path) {
         Ok(meta) => {
             if meta.is_dir() {
                 Ok(())
@@ -355,22 +347,26 @@ async fn main() -> std::io::Result<()> {
             }
         }
         Err(e) => Err(e.to_string()),
+    };
+    let check_does_file_exits = |path: &str| match std::fs::metadata(path) {
+        Ok(metadata) => {
+            if metadata.is_file() {
+                Ok(())
+            } else {
+                Err("Parameter is not a file".to_owned())
             }
-        } "Root directory")
+        }
-        (@arg address: -a --address +takes_value default_value["0.0.0.0"] {
+        Err(e) => Err(e.to_string()),
-            |s| match IpAddr::from_str(&s) {
+    };
+    let check_is_ip_addr = |s: &str| match IpAddr::from_str(s) {
         Ok(_) => Ok(()),
         Err(e) => Err(e.to_string()),
-            }
+    };
-        } "IP address to serve on")
+    let check_is_port_num = |s: &str| match s.parse::<u16>() {
-        (@arg port: -p --port +takes_value default_value["8000"] {
-            |s| match s.parse::<u16>() {
         Ok(_) => Ok(()),
         Err(e) => Err(e.to_string()),
-            }
+    };
-        } "Port to serve on")
+    let check_is_auth = |s: &str| {
-        (@arg auth: --auth +takes_value {
-            |s| {
         let parts = s.splitn(2, ':').collect::<Vec<&str>>();
         if parts.len() < 2 || parts.len() >= 2 && parts[1].is_empty() {
             Err("Password not found".to_owned())
@@ -379,51 +375,31 @@ async fn main() -> std::io::Result<()> {
         } else {
             Ok(())
         }
-            }
+    };
-        } "HTTP Auth (username:password)")
+    let matches = clap::command!()
-        (@arg cert: --cert +takes_value {
+        .arg(Arg::new("noindex").long("noindex").help("Disable automatic index page generation"))
-            |s| match std::fs::metadata(s) {
+        .arg(Arg::new("nocache").long("nocache").help("Disable HTTP cache"))
-                Ok(metadata) => {
+        .arg(Arg::new("nocolor").long("nocolor").help("Disable cli colors"))
-                    if metadata.is_file() {
+        .arg(Arg::new("cors").long("cors").takes_value(true).min_values(0).max_values(1).help("Enable CORS [with custom value]"))
-                        Ok(())
+        .arg(Arg::new("spa").long("spa").help("Enable Single-Page Application mode (always serve /index.html when the file is not found)"))
-                    } else {
+        .arg(Arg::new("dotfiles").short('d').long("dotfiles").help("Show dotfiles"))
-                        Err("Parameter is not a file".to_owned())
+        .arg(Arg::new("open").short('o').long("open").help("Open the page in the default browser"))
-                    }
+        .arg(Arg::new("quiet").short('q').long("quiet").help("Disable access log output"))
-                }
+        .arg(Arg::new("quietall").long("quietall").help("Disable all output"))
-                Err(e) => Err(e.to_string()),
+        .arg(Arg::new("ROOT").default_value(".").validator(check_does_dir_exits).help("Root directory"))
-            }
+        .arg(Arg::new("address").short('a').long("address").default_value("0.0.0.0").takes_value(true).validator(check_is_ip_addr).help("IP address to serve on"))
-        } "Path of TLS/SSL public key (certificate)")
+        .arg(Arg::new("port").short('p').long("port").default_value("8000").takes_value(true).validator(check_is_port_num).help("Port to serve on"))
-        (@arg key: --key +takes_value {
+        .arg(Arg::new("auth").long("auth").takes_value(true).validator(check_is_auth).help("HTTP Auth (username:password)"))
-            |s| match std::fs::metadata(s) {
+        .arg(Arg::new("cert").long("cert").takes_value(true).validator(check_does_file_exits).help("Path of TLS/SSL public key (certificate)"))
-                Ok(metadata) => {
+        .arg(Arg::new("key").long("key").takes_value(true).validator(check_does_file_exits).help("Path of TLS/SSL private key"))
-                    if metadata.is_file() {
+        .subcommand(clap::Command::new("doc")
-                        Ok(())
+            .about("Open cargo doc via local server (Need cargo installation)")
-                    } else {
+            .arg(Arg::new("nocolor").long("nocolor").help("Disable cli colors"))
-                        Err("Parameter is not a file".to_owned())
+            .arg(Arg::new("noopen").long("noopen").help("Do not open the page in the default browser"))
-                    }
+            .arg(Arg::new("log").long("log").help("Enable access log output [default: disabled]"))
-                }
+            .arg(Arg::new("quietall").long("quietall").help("Disable all output"))
-                Err(e) => Err(e.to_string()),
+            .arg(Arg::new("address").short('a').long("address").default_value("0.0.0.0").takes_value(true).validator(check_is_ip_addr).help("IP address to serve on"))
-            }
+            .arg(Arg::new("port").short('p').long("port").default_value("8000").takes_value(true).validator(check_is_port_num).help("Port to serve on"))
-        } "Path of TLS/SSL private key")
-        (@subcommand doc =>
-            (about: "Open cargo doc via local server (Need cargo installation)")
-            (@arg nocolor: --nocolor "Disable cli colors")
-            (@arg noopen: -no --noopen "Do not open the page in the default browser")
-            (@arg log: --log "Enable access log output [default: false]")
-            (@arg quietall: --quietall "Disable all output")
-            (@arg address: -a --address +takes_value default_value["0.0.0.0"] {
-                |s| match IpAddr::from_str(&s) {
-                    Ok(_) => Ok(()),
-                    Err(e) => Err(e.to_string()),
-                }
-            } "IP address to serve on")
-            (@arg port: -p --port +takes_value default_value["8000"] {
-                |s| match s.parse::<u16>() {
-                    Ok(_) => Ok(()),
-                    Err(e) => Err(e.to_string()),
-                }
-            } "Port to serve on")
-        )
         )
         .get_matches();
 
@@ -437,28 +413,29 @@ async fn main() -> std::io::Result<()> {
     set_var("DOTFILES", matches.is_present("dotfiles").to_string());
     set_var("NOCACHE", matches.is_present("nocache").to_string());
     set_var("COMPRESS", matches.is_present("compress").to_string());
-    set_var("QUIET", matches.is_present("quiet").to_string());
-    set_var("QUIETALL", matches.is_present("quietall").to_string());
 
+    if matches.is_present("quiet") {
+        set_var("RUST_LOG", "info,actix_web::middleware::logger=off");
+    }
+    if matches.is_present("quietall") {
+        set_var("RUST_LOG", "off");
+    }
     if matches.is_present("nocolor") {
         set_var("RUST_LOG_STYLE", "never");
     }
 
-    match matches.value_of("auth") {
+    if let Some(s) = matches.value_of("auth") {
-        Some(s) => {
         set_var("ENABLE_AUTH", matches.is_present("auth").to_string());
         let parts = s.splitn(2, ':').collect::<Vec<&str>>();
         set_var("AUTH_USERNAME", parts[0]);
         set_var("AUTH_PASSWORD", hash(parts[1]));
     }
-        None => {}
-    }
 
     if matches.is_present("cors") {
         set_var("ENABLE_CORS", matches.is_present("cors").to_string());
         match matches.value_of("cors") {
             Some(str) => {
-                set_var("CORS", str.to_string());
+                set_var("CORS", str);
             }
             None => {
                 set_var("CORS", "*");
@@ -474,7 +451,7 @@ async fn main() -> std::io::Result<()> {
     let addr = format!(
         "{}:{}",
         ip,
-        matches.value_of("port").unwrap_or("8000").to_string()
+        matches.value_of("port").unwrap_or("8000")
     );
     let url = format!(
         "{}{}:{}",
@@ -484,7 +461,7 @@ async fn main() -> std::io::Result<()> {
             "http://".to_string()
         },
         if ip == "0.0.0.0" { "127.0.0.1" } else { &ip },
-        matches.value_of("port").unwrap_or("8000").to_string()
+        matches.value_of("port").unwrap_or("8000")
     );
 
     let open_in_browser = |url: &str| {
@@ -492,7 +469,13 @@ async fn main() -> std::io::Result<()> {
             std::process::Command::new("explorer").arg(url).spawn().ok();
         } else if cfg!(target_os = "macos") {
             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();
         }
     };
@@ -501,87 +484,7 @@ async fn main() -> std::io::Result<()> {
         open_in_browser(&url);
     }
 
-    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
-        .format(|buf, record| {
-            if var("QUIETALL").unwrap_or("false".to_string()) == "true" {
-                return Ok(());
-            }
-            let data = record.args().to_string();
-            let mut style = buf.style();
-            let blue = style.set_color(Color::Rgb(52, 152, 219));
-            let mut style = buf.style();
-            let red = style.set_color(Color::Rgb(231, 76, 60));
-            let mut style = buf.style();
-            let green = style.set_color(Color::Rgb(76, 175, 80));
-            if record.target() == "actix_web::middleware::logger" {
-                if var("QUIET").unwrap_or("false".to_string()) == "true" {
-                    return Ok(());
-                }
-                let data: Vec<&str> = data.splitn(5, "^").collect();
-                let time = blue.value(
-                    chrono::NaiveDateTime::from_str(data[0])
-                        .unwrap()
-                        .format("%Y/%m/%d %H:%M:%S")
-                        .to_string(),
-                );
-                let ipaddr = blue.value(data[1]);
-                let status_code = data[2].parse().unwrap_or(500);
-                let status_code = if status_code < 400 {
-                    green.value(status_code)
-                } else {
-                    red.value(status_code)
-                };
-                let process_time: Vec<&str> = data[3].splitn(2, ".").collect();
-                let process_time = process_time[0].to_string() + "ms";
-                let process_time = blue.value(if process_time.len() == 3 {
-                    "  ".to_string() + &process_time
-                } else if process_time.len() == 4 {
-                    " ".to_string() + &process_time
-                } else {
-                    process_time
-                });
-                let content = blue.value(data[4]);
-                return writeln!(
-                    buf,
-                    "\r[{}] {} | {} | {} | {}",
-                    time, ipaddr, status_code, process_time, content
-                );
-                // Add '\r' to remove the input ^C
-            } else if record.target() == "actix_server::builder" {
-                if data.starts_with("SIGINT received, exiting") {
-                    return writeln!(buf, "\r{}", green.value("[INFO] SIGINT received, exiting"));
-                } else {
-                    let data = data.replace("actix-web-service-", "");
-                    let re1 = regex::Regex::new("Starting (.*) workers").unwrap();
-                    if re1.is_match(&data) {
-                        return Ok(());
-                    }
-                    let re2 = regex::Regex::new("Starting \"(.*)\" service on (.*)").unwrap();
-                    if re2.is_match(&data) {
-                        let addr = re2
-                            .captures(&data)
-                            .unwrap()
-                            .get(1)
-                            .map_or("", |m| m.as_str());
-                        let data = format!(
-                            "[INFO] Serving {} on {}",
-                            var("ROOT").unwrap_or(".".to_string()),
-                            addr
-                        );
-                        return writeln!(buf, "\r{}", green.value(data));
-                    }
-                }
-            }
-            if data.starts_with("[ERROR]") {
-                writeln!(buf, "\r{}", red.value(data))
-            } else {
-                writeln!(buf, "\r{}", green.value(data))
-            }
-        })
-        .init();
-
     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") {
             Ok(file) => file,
             Err(e) => {
@@ -605,6 +508,7 @@ async fn main() -> std::io::Result<()> {
             }
         };
         let crate_name = contents.package.name;
+        info!("[INFO] Generating document (may take a while)");
         match std::process::Command::new("cargo").arg("doc").output() {
             Ok(output) => {
                 let output = std::str::from_utf8(&output.stderr).unwrap_or("");
@@ -639,43 +543,115 @@ async fn main() -> std::io::Result<()> {
         let addr = format!(
             "{}:{}",
             ip,
-            matches.value_of("port").unwrap_or("8000").to_string()
+            matches.value_of("port").unwrap_or("8000")
         );
         let url = format!(
             "http://{}:{}/{}/index.html",
             if ip == "0.0.0.0" { "127.0.0.1" } else { &ip },
-            matches.value_of("port").unwrap_or("8000").to_string(),
+            matches.value_of("port").unwrap_or("8000"),
             crate_name,
         );
         if !matches.is_present("noopen") {
             open_in_browser(&url);
         }
         if !matches.is_present("log") {
-            set_var("QUIET", true.to_string());
+            set_var("RUST_LOG", "info,actix_web::middleware::logger=off");
+        }
+        if matches.is_present("quietall") {
+            set_var("RUST_LOG", "off");
         }
         if matches.is_present("nocolor") {
             set_var("RUST_LOG_STYLE", "never");
         }
-        set_var("QUIETALL", matches.is_present("quietall").to_string());
         addr
     } else {
         addr
     };
 
-    let server = HttpServer::new(move || {
+    env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
-        let compress = if var("COMPRESS").unwrap_or("false".to_string()) == "true" {
+        .format(|buf, record| {
-            http::header::ContentEncoding::Auto
+            let data = record.args().to_string();
+            let mut style = buf.style();
+            let blue = style.set_color(Color::Cyan);
+            let mut style = buf.style();
+            let red = style.set_color(Color::Red);
+            let mut style = buf.style();
+            let green = style.set_color(Color::Green);
+            if record.target() == "actix_web::middleware::logger" {
+                let data: Vec<&str> = data.splitn(5, '^').collect();
+                let time = blue.value(
+                    chrono::NaiveDateTime::from_str(data[0])
+                        .unwrap()
+                        .format("%Y/%m/%d %H:%M:%S")
+                        .to_string(),
+                );
+                let ipaddr = blue.value(data[1]);
+                let status_code = data[2].parse().unwrap_or(500);
+                let status_code = if status_code < 400 {
+                    green.value(status_code)
                 } else {
-            http::header::ContentEncoding::Identity
+                    red.value(status_code)
                 };
+                let process_time: Vec<&str> = data[3].splitn(2, '.').collect();
+                let process_time = process_time[0].to_string() + "ms";
+                let process_time = blue.value(if process_time.len() == 3 {
+                    "  ".to_string() + &process_time
+                } else if process_time.len() == 4 {
+                    " ".to_string() + &process_time
+                } else {
+                    process_time
+                });
+                let content = blue.value(
+                    urlencoding::decode(data[4])
+                        .unwrap_or(std::borrow::Cow::Borrowed("[Parse URL Error]"))
+                        .into_owned(),
+                );
+                return writeln!(
+                    buf,
+                    "[{}] {} | {} | {} | {}",
+                    time, ipaddr, status_code, process_time, content
+                );
+            } else if record.target() == "actix_server::builder" {
+                if data.starts_with("SIGINT received, exiting") {
+                    return writeln!(buf, "\r{}", green.value("[INFO] SIGINT received, exiting"));
+                    // Add '\r' to remove the input ^C
+                } else {
+                    let data = data.replace("actix-web-service-", "");
+                    let re1 = regex::Regex::new("Starting (.*) workers").unwrap();
+                    if re1.is_match(&data) {
+                        return Ok(());
+                    }
+                    let re2 = regex::Regex::new("Starting \"(.*)\" service on (.*)").unwrap();
+                    if re2.is_match(&data) {
+                        let addr = re2
+                            .captures(&data)
+                            .unwrap()
+                            .get(1)
+                            .map_or("", |m| m.as_str());
+                        let data = format!(
+                            "[INFO] Serving {} on {}",
+                            var("ROOT").unwrap_or_else(|_| ".".to_string()),
+                            addr
+                        );
+                        return writeln!(buf, "\r{}", green.value(data));
+                    }
+                }
+            }
+            if data.starts_with("[ERROR]")
+                || data.starts_with("TLS alert")
+                || data.starts_with("Failed")
+            {
+                writeln!(buf, "\r{}", red.value(data))
+            } else {
+                writeln!(buf, "\r{}", green.value(data))
+            }
+        })
+        .init();
+
+    let server = HttpServer::new(move || {
         let app = App::new()
-            .wrap(middleware::Compress::new(compress))
-            .wrap(middleware::Condition::new(
-                var("ENABLE_AUTH").unwrap_or("false".to_string()) == "true",
-                actix_web_httpauth::middleware::HttpAuthentication::basic(validator),
-            ))
             .wrap_fn(|req, srv| {
-                let paths = PathBuf::from_str(req.path()).unwrap_or(PathBuf::default());
+                let paths = PathBuf::from_str(req.path()).unwrap_or_default();
                 let mut isdotfile = false;
                 for path in paths.iter() {
                     if path.to_string_lossy().starts_with('.') {
@@ -684,33 +660,36 @@ async fn main() -> std::io::Result<()> {
                 }
                 let fut = srv.call(req);
                 async move {
-                    Ok(fut.await?.map_body(|head, mut body| {
+                    Ok(fut.await?.map_body(|head, body| {
-                        if var("NOCACHE").unwrap_or("false".to_string()) == "true" {
+                        if var("NOCACHE").unwrap_or_else(|_| "false".to_string()) == "true" {
                             head.headers_mut().insert(
                                 http::header::CACHE_CONTROL,
-                                http::HeaderValue::from_static("no-store"),
+                                http::header::HeaderValue::from_static("no-store"),
                             );
                         }
-                        if var("ENABLE_CORS").unwrap_or("false".to_string()) == "true" {
+                        if var("ENABLE_CORS").unwrap_or_else(|_| "false".to_string()) == "true" {
-                            let cors = var("CORS").unwrap_or("*".to_string());
+                            let cors = var("CORS").unwrap_or_else(|_| "*".to_string());
-                            let cors = http::HeaderValue::from_str(&cors)
+                            let cors = http::header::HeaderValue::from_str(&cors)
-                                .unwrap_or(http::HeaderValue::from_static("*"));
+                                .unwrap_or_else(|_| http::header::HeaderValue::from_static("*"));
                             head.headers_mut()
                                 .insert(http::header::ACCESS_CONTROL_ALLOW_ORIGIN, cors);
                         }
-                        if isdotfile && !(var("DOTFILES").unwrap_or("false".to_string()) == "true")
+                        if isdotfile
+                            && var("DOTFILES").unwrap_or_else(|_| "false".to_string()) != "true"
                         {
-                            head.status = http::StatusCode::FORBIDDEN;
+                            return dev::Response::new(http::StatusCode::FORBIDDEN).into_body();
-                            *head.headers_mut() = http::HeaderMap::new();
-                            let _ = body.take_body();
-                            head.set_connection_type(http::ConnectionType::Close);
                         }
                         body
                     }))
                 }
             })
+            .wrap(middleware::Compress::default())
+            .wrap(middleware::Condition::new(
+                var("ENABLE_AUTH").unwrap_or_else(|_| "false".to_string()) == "true",
+                actix_web_httpauth::middleware::HttpAuthentication::basic(validator),
+            ))
             .wrap(middleware::Logger::new("%t^%a^%s^%D^%r"));
-        let files = fs::Files::new("/", var("ROOT").unwrap_or(".".to_string()))
+        let files = fs::Files::new("/", var("ROOT").unwrap_or_else(|_| ".".to_string()))
             .use_hidden_files()
             .prefer_utf8(true)
             .show_files_listing()
@@ -718,35 +697,39 @@ async fn main() -> std::io::Result<()> {
             .default_handler(|req: dev::ServiceRequest| {
                 let (http_req, _payload) = req.into_parts();
                 async {
-                    let path = var("ROOT").unwrap_or(".".to_string());
+                    let path = var("ROOT").unwrap_or_else(|_| ".".to_string());
                     let mut path = Path::new(&path).to_path_buf();
                     path.push("index.html");
                     if path.exists()
                         && path.is_file()
-                        && var("SPA").unwrap_or("false".to_string()) == "true"
+                        && var("SPA").unwrap_or_else(|_| "false".to_string()) == "true"
                     {
-                        let res = fs::NamedFile::open(path)?.into_response(&http_req)?;
+                        let res = fs::NamedFile::open(path)?.into_response(&http_req);
                         return Ok(ServiceResponse::new(http_req, res));
                     }
-                    return Ok(ServiceResponse::new(
+                    Ok(ServiceResponse::new(
                         http_req,
                         HttpResponse::NotFound().body(""),
-                    ));
+                    ))
                 }
             });
-        return app.service(files);
+        app.service(files)
     });
     let server = if enable_tls {
-        let cert = Path::new(matches.value_of("cert").unwrap());
+        let cert = &mut BufReader::new(
-        let key = Path::new(matches.value_of("key").unwrap());
+            std::fs::File::open(Path::new(matches.value_of("cert").unwrap())).unwrap(),
-        let mut builder =
+        );
-            openssl::ssl::SslAcceptor::mozilla_intermediate(openssl::ssl::SslMethod::tls())
+        let key = &mut BufReader::new(
-                .unwrap();
+            std::fs::File::open(Path::new(matches.value_of("key").unwrap())).unwrap(),
-        builder
+        );
-            .set_private_key_file(key, openssl::ssl::SslFiletype::PEM)
+        let cert = rustls_pemfile::certs(cert).unwrap().iter().map(|x| rustls::Certificate(x.to_vec())).collect::<Vec<_>>();
-            .unwrap();
+        let key = rustls::PrivateKey(rustls_pemfile::pkcs8_private_keys(key).unwrap().first().expect("no private key found").to_owned());
-        builder.set_certificate_chain_file(cert).unwrap();
+        let config = rustls::ServerConfig::builder()
-        server.bind_openssl(addr, builder)
+            .with_safe_defaults()
+            .with_no_client_auth()
+            .with_single_cert(cert, key)
+            .expect("bad certificate/key");
+        server.bind_rustls(addr, config)
     } else {
         server.bind(addr)
     };

templates/index.html.tera

@@ -1,3 +1,6 @@
+{# This Source Code Form is subject to the terms of the Mozilla Public
+ # License, v. 2.0. If a copy of the MPL was not distributed with this
+ # file, You can obtain one at https://mozilla.org/MPL/2.0/. #}
 <!DOCTYPE html>
 <html lang="en">
 
@@ -18,6 +21,7 @@
     #header,
     #meta,
     #listing {
+      font-family: sans-serif;
       padding: 0;
       margin: 0;
       border-spacing: 0;
@@ -131,22 +135,37 @@
     }
 
     @media (prefers-color-scheme: dark) {
-      html {
+
-        color: #444444;
+      html,
-        filter: invert(1);
+      body,
+      #header,
+      #meta,
+      #listing {
+        color: #cacaca;
+        background: #000000;
       }
 
-      #listing a span {
+      #header nav span a {
-        filter: invert(1);
+        color: #cacaca;
+      }
+
+      #header {
+        padding: 1.5rem 5% 1rem;
+        background-color: #0e0e0e;
+      }
+
+      #listing table {
+        border-top: 1px dashed #999999;
+      }
+
+      #listing th,
+      #listing td {
+        border-bottom: 1px dashed #999999;
       }
 
       #listing .goup svg,
       #listing .file svg {
-        fill: #444444;
+        fill: #cacaca;
-      }
-
-      #listing .dir svg {
-        filter: invert(1);
       }
 
       #header a,