mirror of
https://github.com/Tim-Paik/srv.git
synced 2024-10-13 00:29:43 +00:00
Compare commits
10 Commits
v0.7.9-bet
...
v1.0.0-rc.
| Author | SHA1 | Date | |
|---|---|---|---|
| 757a2943f4 | |||
| 2cda2c0a45 | |||
| dda85e927a | |||
| de00101713 | |||
| 12993018ab | |||
| d59a3fc4a5 | |||
| 8db0f82d08 | |||
| e407395080 | |||
| d6e64db5c7 | |||
| 1ae50ebca8 |
38
.github/workflows/release.yml
vendored
38
.github/workflows/release.yml
vendored
@ -14,39 +14,19 @@ jobs:
|
|||||||
env:
|
env:
|
||||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||||
|
|
||||||
upload-assets-linux:
|
upload-assets:
|
||||||
runs-on: ubuntu-latest
|
strategy:
|
||||||
|
matrix:
|
||||||
|
os:
|
||||||
|
- ubuntu-latest
|
||||||
|
- macos-latest
|
||||||
|
- windows-latest
|
||||||
|
runs-on: ${{ matrix.os }}
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v2
|
- uses: actions/checkout@v2
|
||||||
- uses: taiki-e/upload-rust-binary-action@v1
|
- uses: taiki-e/upload-rust-binary-action@v1
|
||||||
with:
|
with:
|
||||||
bin: web
|
bin: srv
|
||||||
tar: unix
|
|
||||||
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
|
tar: unix
|
||||||
zip: windows
|
zip: windows
|
||||||
env:
|
env:
|
||||||
|
|||||||
223
Cargo.lock
generated
223
Cargo.lock
generated
@ -33,10 +33,11 @@ dependencies = [
|
|||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http",
|
||||||
"log",
|
"log",
|
||||||
"openssl",
|
"rustls",
|
||||||
"tokio-openssl",
|
"tokio-rustls",
|
||||||
"trust-dns-proto",
|
"trust-dns-proto",
|
||||||
"trust-dns-resolver",
|
"trust-dns-resolver",
|
||||||
|
"webpki",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -72,7 +73,7 @@ dependencies = [
|
|||||||
"actix-threadpool",
|
"actix-threadpool",
|
||||||
"actix-tls",
|
"actix-tls",
|
||||||
"actix-utils",
|
"actix-utils",
|
||||||
"base64",
|
"base64 0.13.0",
|
||||||
"bitflags",
|
"bitflags",
|
||||||
"brotli2",
|
"brotli2",
|
||||||
"bytes 0.5.6",
|
"bytes 0.5.6",
|
||||||
@ -214,8 +215,10 @@ dependencies = [
|
|||||||
"actix-service",
|
"actix-service",
|
||||||
"actix-utils",
|
"actix-utils",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"openssl",
|
"rustls",
|
||||||
"tokio-openssl",
|
"tokio-rustls",
|
||||||
|
"webpki",
|
||||||
|
"webpki-roots",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -266,9 +269,9 @@ dependencies = [
|
|||||||
"fxhash",
|
"fxhash",
|
||||||
"log",
|
"log",
|
||||||
"mime",
|
"mime",
|
||||||
"openssl",
|
|
||||||
"pin-project 1.0.8",
|
"pin-project 1.0.8",
|
||||||
"regex",
|
"regex",
|
||||||
|
"rustls",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_urlencoded",
|
"serde_urlencoded",
|
||||||
@ -296,7 +299,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "0c3b11a07a3df3f7970fd8bd38cc66998b5549f507c54cc64c6e843bc82d6358"
|
checksum = "0c3b11a07a3df3f7970fd8bd38cc66998b5549f507c54cc64c6e843bc82d6358"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"actix-web",
|
"actix-web",
|
||||||
"base64",
|
"base64 0.13.0",
|
||||||
"futures-util",
|
"futures-util",
|
||||||
]
|
]
|
||||||
|
|
||||||
@ -353,16 +356,16 @@ dependencies = [
|
|||||||
"actix-http",
|
"actix-http",
|
||||||
"actix-rt",
|
"actix-rt",
|
||||||
"actix-service",
|
"actix-service",
|
||||||
"base64",
|
"base64 0.13.0",
|
||||||
"bytes 0.5.6",
|
"bytes 0.5.6",
|
||||||
"cfg-if 1.0.0",
|
"cfg-if 1.0.0",
|
||||||
"derive_more",
|
"derive_more",
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"log",
|
"log",
|
||||||
"mime",
|
"mime",
|
||||||
"openssl",
|
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"rand 0.7.3",
|
"rand 0.7.3",
|
||||||
|
"rustls",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"serde_urlencoded",
|
"serde_urlencoded",
|
||||||
@ -374,6 +377,12 @@ version = "0.2.8"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
|
checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "base64"
|
||||||
|
version = "0.12.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "base64"
|
name = "base64"
|
||||||
version = "0.13.0"
|
version = "0.13.0"
|
||||||
@ -730,21 +739,6 @@ version = "1.0.7"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "foreign-types"
|
|
||||||
version = "0.3.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
|
|
||||||
dependencies = [
|
|
||||||
"foreign-types-shared",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "foreign-types-shared"
|
|
||||||
version = "0.1.1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "form_urlencoded"
|
name = "form_urlencoded"
|
||||||
version = "1.0.1"
|
version = "1.0.1"
|
||||||
@ -1086,6 +1080,15 @@ version = "0.4.7"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
|
checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "js-sys"
|
||||||
|
version = "0.3.53"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e4bf49d50e2961077d9c99f4b7997d770a1114f087c3c2e0069b36c13fc2979d"
|
||||||
|
dependencies = [
|
||||||
|
"wasm-bindgen",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "kernel32-sys"
|
name = "kernel32-sys"
|
||||||
version = "0.2.2"
|
version = "0.2.2"
|
||||||
@ -1307,33 +1310,6 @@ version = "0.3.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
|
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "openssl"
|
|
||||||
version = "0.10.36"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "8d9facdb76fec0b73c406f125d44d86fdad818d66fef0531eec9233ca425ff4a"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags",
|
|
||||||
"cfg-if 1.0.0",
|
|
||||||
"foreign-types",
|
|
||||||
"libc",
|
|
||||||
"once_cell",
|
|
||||||
"openssl-sys",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "openssl-sys"
|
|
||||||
version = "0.9.66"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1996d2d305e561b70d1ee0c53f1542833f4e1ac6ce9a6708b6ff2738ca67dc82"
|
|
||||||
dependencies = [
|
|
||||||
"autocfg",
|
|
||||||
"cc",
|
|
||||||
"libc",
|
|
||||||
"pkg-config",
|
|
||||||
"vcpkg",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "os_str_bytes"
|
name = "os_str_bytes"
|
||||||
version = "3.1.0"
|
version = "3.1.0"
|
||||||
@ -1481,12 +1457,6 @@ version = "0.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "pkg-config"
|
|
||||||
version = "0.3.19"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ppv-lite86"
|
name = "ppv-lite86"
|
||||||
version = "0.2.10"
|
version = "0.2.10"
|
||||||
@ -1670,6 +1640,21 @@ dependencies = [
|
|||||||
"quick-error",
|
"quick-error",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ring"
|
||||||
|
version = "0.16.20"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"libc",
|
||||||
|
"once_cell",
|
||||||
|
"spin",
|
||||||
|
"untrusted",
|
||||||
|
"web-sys",
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rustc_version"
|
name = "rustc_version"
|
||||||
version = "0.2.3"
|
version = "0.2.3"
|
||||||
@ -1688,6 +1673,19 @@ dependencies = [
|
|||||||
"semver 0.11.0",
|
"semver 0.11.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "rustls"
|
||||||
|
version = "0.18.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5d1126dcf58e93cee7d098dbda643b5f92ed724f1f6a63007c1116eed6700c81"
|
||||||
|
dependencies = [
|
||||||
|
"base64 0.12.3",
|
||||||
|
"log",
|
||||||
|
"ring",
|
||||||
|
"sct",
|
||||||
|
"webpki",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ryu"
|
name = "ryu"
|
||||||
version = "1.0.5"
|
version = "1.0.5"
|
||||||
@ -1709,6 +1707,16 @@ version = "1.1.0"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sct"
|
||||||
|
version = "0.6.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b362b83898e0e69f38515b82ee15aa80636befe47c3b6d3d89a911e78fc228ce"
|
||||||
|
dependencies = [
|
||||||
|
"ring",
|
||||||
|
"untrusted",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "semver"
|
name = "semver"
|
||||||
version = "0.9.0"
|
version = "0.9.0"
|
||||||
@ -1870,6 +1878,34 @@ dependencies = [
|
|||||||
"winapi 0.3.9",
|
"winapi 0.3.9",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "spin"
|
||||||
|
version = "0.5.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "srv"
|
||||||
|
version = "1.0.0-rc"
|
||||||
|
dependencies = [
|
||||||
|
"actix-files",
|
||||||
|
"actix-http",
|
||||||
|
"actix-web",
|
||||||
|
"actix-web-httpauth",
|
||||||
|
"chrono",
|
||||||
|
"clap",
|
||||||
|
"env_logger",
|
||||||
|
"lazy_static",
|
||||||
|
"log",
|
||||||
|
"mime_guess",
|
||||||
|
"regex",
|
||||||
|
"rustls",
|
||||||
|
"serde",
|
||||||
|
"sha2",
|
||||||
|
"tera",
|
||||||
|
"toml",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "standback"
|
name = "standback"
|
||||||
version = "0.2.17"
|
version = "0.2.17"
|
||||||
@ -2119,13 +2155,15 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-openssl"
|
name = "tokio-rustls"
|
||||||
version = "0.4.0"
|
version = "0.14.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3c4b08c5f4208e699ede3df2520aca2e82401b2de33f45e96696a074480be594"
|
checksum = "e12831b255bcfa39dc0436b01e19fea231a37db570686c06ee72c423479f889a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"openssl",
|
"futures-core",
|
||||||
|
"rustls",
|
||||||
"tokio",
|
"tokio",
|
||||||
|
"webpki",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@ -2142,6 +2180,15 @@ dependencies = [
|
|||||||
"tokio",
|
"tokio",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "toml"
|
||||||
|
version = "0.5.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa"
|
||||||
|
dependencies = [
|
||||||
|
"serde",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tracing"
|
name = "tracing"
|
||||||
version = "0.1.26"
|
version = "0.1.26"
|
||||||
@ -2316,6 +2363,12 @@ version = "0.2.2"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
|
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "untrusted"
|
||||||
|
version = "0.7.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "url"
|
name = "url"
|
||||||
version = "2.2.2"
|
version = "2.2.2"
|
||||||
@ -2360,12 +2413,6 @@ dependencies = [
|
|||||||
"v_escape",
|
"v_escape",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "vcpkg"
|
|
||||||
version = "0.2.15"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "vec_map"
|
name = "vec_map"
|
||||||
version = "0.8.2"
|
version = "0.8.2"
|
||||||
@ -2462,24 +2509,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
|
checksum = "acdb075a845574a1fa5f09fd77e43f7747599301ea3417a9fbffdeedfc1f4a29"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "web"
|
name = "web-sys"
|
||||||
version = "0.7.2-beta"
|
version = "0.3.53"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "224b2f6b67919060055ef1a67807367c2066ed520c3862cc013d26cf893a783c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"actix-files",
|
"js-sys",
|
||||||
"actix-http",
|
"wasm-bindgen",
|
||||||
"actix-web",
|
]
|
||||||
"actix-web-httpauth",
|
|
||||||
"chrono",
|
[[package]]
|
||||||
"clap",
|
name = "webpki"
|
||||||
"env_logger",
|
version = "0.21.4"
|
||||||
"lazy_static",
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
"log",
|
checksum = "b8e38c0608262c46d4a56202ebabdeb094cef7e560ca7a226c6bf055188aa4ea"
|
||||||
"mime_guess",
|
dependencies = [
|
||||||
"openssl",
|
"ring",
|
||||||
"regex",
|
"untrusted",
|
||||||
"serde",
|
]
|
||||||
"sha2",
|
|
||||||
"tera",
|
[[package]]
|
||||||
|
name = "webpki-roots"
|
||||||
|
version = "0.20.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0f20dea7535251981a9670857150d571846545088359b28e4951d350bdaf179f"
|
||||||
|
dependencies = [
|
||||||
|
"webpki",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
|
|||||||
@ -2,13 +2,13 @@
|
|||||||
authors = ["Tim_Paik <timpaikc@outlook.com>"]
|
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 = "srv"
|
||||||
version = "0.7.2-beta"
|
version = "1.0.0-rc"
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
actix-files = "0.5"
|
actix-files = "0.5"
|
||||||
actix-http = "2.2"
|
actix-http = "2.2"
|
||||||
actix-web = {version = "3.3", features = ["openssl"]}
|
actix-web = {version = "3.3", features = ["rustls"]}
|
||||||
actix-web-httpauth = "0.5"
|
actix-web-httpauth = "0.5"
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
clap = {version = "3.0.0-beta.4", features = ["wrap_help", "color"]}
|
clap = {version = "3.0.0-beta.4", features = ["wrap_help", "color"]}
|
||||||
@ -16,11 +16,12 @@ env_logger = "0.9"
|
|||||||
lazy_static = "1.4"
|
lazy_static = "1.4"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
mime_guess = "2"
|
mime_guess = "2"
|
||||||
openssl = {version = "0.10", features = ["v110"]}
|
|
||||||
regex = "1.5"
|
regex = "1.5"
|
||||||
|
rustls = "0.18"
|
||||||
serde = "1"
|
serde = "1"
|
||||||
sha2 = "0.9"
|
sha2 = "0.9"
|
||||||
tera = "1"
|
tera = "1"
|
||||||
|
toml = "0.5"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
lto = true
|
lto = true
|
||||||
|
|||||||
373
LICENSE
Normal file
373
LICENSE
Normal file
@ -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.
|
||||||
35
README.md
Normal file
35
README.md
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
# 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
|
||||||
|
|
||||||
|
|
||||||
|
### 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
|
||||||
BIN
screenshot.png
Normal file
BIN
screenshot.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 164 KiB |
243
src/main.rs
243
src/main.rs
@ -1,3 +1,7 @@
|
|||||||
|
/* 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/. */
|
||||||
|
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
extern crate clap;
|
extern crate clap;
|
||||||
#[macro_use]
|
#[macro_use]
|
||||||
@ -14,7 +18,7 @@ use sha2::Digest;
|
|||||||
use std::{
|
use std::{
|
||||||
env::{set_var, var},
|
env::{set_var, var},
|
||||||
fs::read_dir,
|
fs::read_dir,
|
||||||
io::{Error, ErrorKind, Write},
|
io::{BufReader, Error, ErrorKind, Read, Write},
|
||||||
net::IpAddr,
|
net::IpAddr,
|
||||||
path::{Path, PathBuf},
|
path::{Path, PathBuf},
|
||||||
str::FromStr,
|
str::FromStr,
|
||||||
@ -151,6 +155,16 @@ fn get_file_type(from: &Path) -> String {
|
|||||||
.to_string()
|
.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize)]
|
||||||
|
struct Package {
|
||||||
|
name: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(serde::Deserialize)]
|
||||||
|
struct CargoToml {
|
||||||
|
package: Package,
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Eq, Ord, PartialEq, PartialOrd, serde::Serialize)]
|
#[derive(Eq, Ord, PartialEq, PartialOrd, serde::Serialize)]
|
||||||
struct Dir {
|
struct Dir {
|
||||||
name: String,
|
name: String,
|
||||||
@ -427,9 +441,13 @@ async fn main() -> std::io::Result<()> {
|
|||||||
set_var("DOTFILES", matches.is_present("dotfiles").to_string());
|
set_var("DOTFILES", matches.is_present("dotfiles").to_string());
|
||||||
set_var("NOCACHE", matches.is_present("nocache").to_string());
|
set_var("NOCACHE", matches.is_present("nocache").to_string());
|
||||||
set_var("COMPRESS", matches.is_present("compress").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") {
|
if matches.is_present("nocolor") {
|
||||||
set_var("RUST_LOG_STYLE", "never");
|
set_var("RUST_LOG_STYLE", "never");
|
||||||
}
|
}
|
||||||
@ -473,11 +491,7 @@ async fn main() -> std::io::Result<()> {
|
|||||||
} else {
|
} else {
|
||||||
"http://".to_string()
|
"http://".to_string()
|
||||||
},
|
},
|
||||||
if ip == "0.0.0.0" {
|
if ip == "0.0.0.0" { "127.0.0.1" } else { &ip },
|
||||||
"127.0.0.1"
|
|
||||||
} else {
|
|
||||||
ip.as_str()
|
|
||||||
},
|
|
||||||
matches.value_of("port").unwrap_or("8000").to_string()
|
matches.value_of("port").unwrap_or("8000").to_string()
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -486,7 +500,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();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -495,11 +515,92 @@ async fn main() -> std::io::Result<()> {
|
|||||||
open_in_browser(&url);
|
open_in_browser(&url);
|
||||||
}
|
}
|
||||||
|
|
||||||
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
|
let addr = if let Some(matches) = matches.subcommand_matches("doc") {
|
||||||
.format(|buf, record| {
|
let mut cargo_toml = match std::fs::File::open("./Cargo.toml") {
|
||||||
if var("QUIETALL").unwrap_or("false".to_string()) == "true" {
|
Ok(file) => file,
|
||||||
|
Err(e) => {
|
||||||
|
error!("[ERROR] {}", e.to_string());
|
||||||
return Ok(());
|
return Ok(());
|
||||||
}
|
}
|
||||||
|
};
|
||||||
|
let mut contents = String::new();
|
||||||
|
match cargo_toml.read_to_string(&mut contents) {
|
||||||
|
Ok(_) => {}
|
||||||
|
Err(e) => {
|
||||||
|
error!("[ERROR] {}", e.to_string());
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let contents: CargoToml = match toml::from_str(&contents) {
|
||||||
|
Ok(t) => t,
|
||||||
|
Err(e) => {
|
||||||
|
error!("[ERROR] {}", e.to_string());
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
};
|
||||||
|
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("");
|
||||||
|
if output.starts_with("error: could not find `Cargo.toml` in") {
|
||||||
|
error!("[ERROR] Cargo.toml Not Found");
|
||||||
|
return Ok(());
|
||||||
|
} else if output.starts_with("error: ") {
|
||||||
|
error!(
|
||||||
|
"[ERROR] {}",
|
||||||
|
output.strip_prefix("error: ").unwrap_or(output)
|
||||||
|
);
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Err(e) => {
|
||||||
|
error!("[ERROR] Cargo Error: {}", e.to_string());
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let path = Path::new("./target/doc/");
|
||||||
|
let mut index_path = path.to_path_buf();
|
||||||
|
index_path.push(crate_name.to_string() + "/index.html");
|
||||||
|
if !index_path.exists() || !index_path.is_file() {
|
||||||
|
error!("[ERROR] Cargo Error: doc path not found");
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
set_var("ROOT", display_path(path));
|
||||||
|
let ip = matches
|
||||||
|
.value_of("address")
|
||||||
|
.unwrap_or("127.0.0.1")
|
||||||
|
.to_string();
|
||||||
|
let addr = format!(
|
||||||
|
"{}:{}",
|
||||||
|
ip,
|
||||||
|
matches.value_of("port").unwrap_or("8000").to_string()
|
||||||
|
);
|
||||||
|
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(),
|
||||||
|
crate_name,
|
||||||
|
);
|
||||||
|
if !matches.is_present("noopen") {
|
||||||
|
open_in_browser(&url);
|
||||||
|
}
|
||||||
|
if !matches.is_present("log") {
|
||||||
|
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");
|
||||||
|
}
|
||||||
|
addr
|
||||||
|
} else {
|
||||||
|
addr
|
||||||
|
};
|
||||||
|
|
||||||
|
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info"))
|
||||||
|
.format(|buf, record| {
|
||||||
let data = record.args().to_string();
|
let data = record.args().to_string();
|
||||||
let mut style = buf.style();
|
let mut style = buf.style();
|
||||||
let blue = style.set_color(Color::Rgb(52, 152, 219));
|
let blue = style.set_color(Color::Rgb(52, 152, 219));
|
||||||
@ -508,9 +609,6 @@ async fn main() -> std::io::Result<()> {
|
|||||||
let mut style = buf.style();
|
let mut style = buf.style();
|
||||||
let green = style.set_color(Color::Rgb(76, 175, 80));
|
let green = style.set_color(Color::Rgb(76, 175, 80));
|
||||||
if record.target() == "actix_web::middleware::logger" {
|
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 data: Vec<&str> = data.splitn(5, "^").collect();
|
||||||
let time = blue.value(
|
let time = blue.value(
|
||||||
chrono::NaiveDateTime::from_str(data[0])
|
chrono::NaiveDateTime::from_str(data[0])
|
||||||
@ -528,22 +626,22 @@ async fn main() -> std::io::Result<()> {
|
|||||||
let process_time: Vec<&str> = data[3].splitn(2, ".").collect();
|
let process_time: Vec<&str> = data[3].splitn(2, ".").collect();
|
||||||
let process_time = process_time[0].to_string() + "ms";
|
let process_time = process_time[0].to_string() + "ms";
|
||||||
let process_time = blue.value(if process_time.len() == 3 {
|
let process_time = blue.value(if process_time.len() == 3 {
|
||||||
" ".to_string() + process_time.as_str()
|
" ".to_string() + &process_time
|
||||||
} else if process_time.len() == 4 {
|
} else if process_time.len() == 4 {
|
||||||
" ".to_string() + process_time.as_str()
|
" ".to_string() + &process_time
|
||||||
} else {
|
} else {
|
||||||
process_time
|
process_time
|
||||||
});
|
});
|
||||||
let content = blue.value(data[4]);
|
let content = blue.value(data[4]);
|
||||||
return writeln!(
|
return writeln!(
|
||||||
buf,
|
buf,
|
||||||
"\r[{}] {} | {} | {} | {}",
|
"[{}] {} | {} | {} | {}",
|
||||||
time, ipaddr, status_code, process_time, content
|
time, ipaddr, status_code, process_time, content
|
||||||
);
|
);
|
||||||
// Add '\r' to remove the input ^C
|
|
||||||
} else if record.target() == "actix_server::builder" {
|
} else if record.target() == "actix_server::builder" {
|
||||||
if data.starts_with("SIGINT received, exiting") {
|
if data.starts_with("SIGINT received, exiting") {
|
||||||
return writeln!(buf, "\r{}", green.value("[INFO] SIGINT received, exiting"));
|
return writeln!(buf, "\r{}", green.value("[INFO] SIGINT received, exiting"));
|
||||||
|
// Add '\r' to remove the input ^C
|
||||||
} else {
|
} else {
|
||||||
let data = data.replace("actix-web-service-", "");
|
let data = data.replace("actix-web-service-", "");
|
||||||
let re1 = regex::Regex::new("Starting (.*) workers").unwrap();
|
let re1 = regex::Regex::new("Starting (.*) workers").unwrap();
|
||||||
@ -559,14 +657,17 @@ async fn main() -> std::io::Result<()> {
|
|||||||
.map_or("", |m| m.as_str());
|
.map_or("", |m| m.as_str());
|
||||||
let data = format!(
|
let data = format!(
|
||||||
"[INFO] Serving {} on {}",
|
"[INFO] Serving {} on {}",
|
||||||
var("ROOT").unwrap_or(".".to_string()).as_str(),
|
var("ROOT").unwrap_or(".".to_string()),
|
||||||
addr
|
addr
|
||||||
);
|
);
|
||||||
return writeln!(buf, "\r{}", green.value(data));
|
return writeln!(buf, "\r{}", green.value(data));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if data.starts_with("[ERROR]") {
|
if data.starts_with("[ERROR]")
|
||||||
|
|| data.starts_with("TLS alert")
|
||||||
|
|| data.starts_with("Failed")
|
||||||
|
{
|
||||||
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))
|
||||||
@ -574,68 +675,6 @@ async fn main() -> std::io::Result<()> {
|
|||||||
})
|
})
|
||||||
.init();
|
.init();
|
||||||
|
|
||||||
let addr = if let Some(matches) = matches.subcommand_matches("doc") {
|
|
||||||
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("");
|
|
||||||
if output.starts_with("error: could not find `Cargo.toml` in") {
|
|
||||||
error!("[ERROR] Cargo.toml Not Found");
|
|
||||||
return Ok(());
|
|
||||||
} else if output.starts_with("error: ") {
|
|
||||||
error!(
|
|
||||||
"[ERROR] {}",
|
|
||||||
output.strip_prefix("error: ").unwrap_or(output)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
error!("[ERROR] Cargo Error: {}", e.to_string());
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let path = Path::new("./target/doc/");
|
|
||||||
let mut index_path = path.to_path_buf();
|
|
||||||
index_path.push(crate_name!().to_string() + "/index.html");
|
|
||||||
if !index_path.exists() || !index_path.is_file() {
|
|
||||||
error!("[ERROR] Cargo Error: doc path not found");
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
set_var("ROOT", display_path(path));
|
|
||||||
let ip = matches
|
|
||||||
.value_of("address")
|
|
||||||
.unwrap_or("127.0.0.1")
|
|
||||||
.to_string();
|
|
||||||
let addr = format!(
|
|
||||||
"{}:{}",
|
|
||||||
ip,
|
|
||||||
matches.value_of("port").unwrap_or("8000").to_string()
|
|
||||||
);
|
|
||||||
let url = format!(
|
|
||||||
"http://{}:{}/{}/index.html",
|
|
||||||
if ip == "0.0.0.0" {
|
|
||||||
"127.0.0.1"
|
|
||||||
} else {
|
|
||||||
ip.as_str()
|
|
||||||
},
|
|
||||||
matches.value_of("port").unwrap_or("8000").to_string(),
|
|
||||||
crate_name!(),
|
|
||||||
);
|
|
||||||
if !matches.is_present("noopen") {
|
|
||||||
open_in_browser(&url);
|
|
||||||
}
|
|
||||||
if !matches.is_present("log") {
|
|
||||||
set_var("QUIET", true.to_string());
|
|
||||||
}
|
|
||||||
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 || {
|
let server = HttpServer::new(move || {
|
||||||
let compress = if var("COMPRESS").unwrap_or("false".to_string()) == "true" {
|
let compress = if var("COMPRESS").unwrap_or("false".to_string()) == "true" {
|
||||||
http::header::ContentEncoding::Auto
|
http::header::ContentEncoding::Auto
|
||||||
@ -643,11 +682,6 @@ async fn main() -> std::io::Result<()> {
|
|||||||
http::header::ContentEncoding::Identity
|
http::header::ContentEncoding::Identity
|
||||||
};
|
};
|
||||||
let app = App::new()
|
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| {
|
.wrap_fn(|req, srv| {
|
||||||
let paths = PathBuf::from_str(req.path()).unwrap_or(PathBuf::default());
|
let paths = PathBuf::from_str(req.path()).unwrap_or(PathBuf::default());
|
||||||
let mut isdotfile = false;
|
let mut isdotfile = false;
|
||||||
@ -658,7 +692,7 @@ async fn main() -> std::io::Result<()> {
|
|||||||
}
|
}
|
||||||
let fut = srv.call(req);
|
let fut = srv.call(req);
|
||||||
async move {
|
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("false".to_string()) == "true" {
|
||||||
head.headers_mut().insert(
|
head.headers_mut().insert(
|
||||||
http::header::CACHE_CONTROL,
|
http::header::CACHE_CONTROL,
|
||||||
@ -667,7 +701,7 @@ async fn main() -> std::io::Result<()> {
|
|||||||
}
|
}
|
||||||
if var("ENABLE_CORS").unwrap_or("false".to_string()) == "true" {
|
if var("ENABLE_CORS").unwrap_or("false".to_string()) == "true" {
|
||||||
let cors = var("CORS").unwrap_or("*".to_string());
|
let cors = var("CORS").unwrap_or("*".to_string());
|
||||||
let cors = http::HeaderValue::from_str(cors.as_str())
|
let cors = http::HeaderValue::from_str(&cors)
|
||||||
.unwrap_or(http::HeaderValue::from_static("*"));
|
.unwrap_or(http::HeaderValue::from_static("*"));
|
||||||
head.headers_mut()
|
head.headers_mut()
|
||||||
.insert(http::header::ACCESS_CONTROL_ALLOW_ORIGIN, cors);
|
.insert(http::header::ACCESS_CONTROL_ALLOW_ORIGIN, cors);
|
||||||
@ -676,13 +710,17 @@ async fn main() -> std::io::Result<()> {
|
|||||||
{
|
{
|
||||||
head.status = http::StatusCode::FORBIDDEN;
|
head.status = http::StatusCode::FORBIDDEN;
|
||||||
*head.headers_mut() = http::HeaderMap::new();
|
*head.headers_mut() = http::HeaderMap::new();
|
||||||
let _ = body.take_body();
|
return dev::ResponseBody::Other(actix_web::body::Body::None);
|
||||||
head.set_connection_type(http::ConnectionType::Close);
|
|
||||||
}
|
}
|
||||||
body
|
body
|
||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
.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(middleware::Logger::new("%t^%a^%s^%D^%r"));
|
.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(".".to_string()))
|
||||||
.use_hidden_files()
|
.use_hidden_files()
|
||||||
@ -711,16 +749,17 @@ async fn main() -> std::io::Result<()> {
|
|||||||
return app.service(files);
|
return app.service(files);
|
||||||
});
|
});
|
||||||
let server = if enable_tls {
|
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 mut config = rustls::ServerConfig::new(rustls::NoClientAuth::new());
|
||||||
.unwrap();
|
let cert_chain = rustls::internal::pemfile::certs(cert).unwrap();
|
||||||
builder.set_certificate_chain_file(cert).unwrap();
|
let mut keys = rustls::internal::pemfile::pkcs8_private_keys(key).unwrap();
|
||||||
server.bind_openssl(addr, builder)
|
config.set_single_cert(cert_chain, keys.remove(0)).unwrap();
|
||||||
|
server.bind_rustls(addr, config)
|
||||||
} else {
|
} else {
|
||||||
server.bind(addr)
|
server.bind(addr)
|
||||||
};
|
};
|
||||||
|
|||||||
@ -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>
|
<!DOCTYPE html>
|
||||||
<html lang="en">
|
<html lang="en">
|
||||||
|
|
||||||
@ -18,6 +21,7 @@
|
|||||||
#header,
|
#header,
|
||||||
#meta,
|
#meta,
|
||||||
#listing {
|
#listing {
|
||||||
|
font-family: sans-serif;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
border-spacing: 0;
|
border-spacing: 0;
|
||||||
@ -131,22 +135,37 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
@media (prefers-color-scheme: dark) {
|
@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 .goup svg,
|
||||||
#listing .file svg {
|
#listing .file svg {
|
||||||
fill: #444444;
|
fill: #cacaca;
|
||||||
}
|
|
||||||
|
|
||||||
#listing .dir svg {
|
|
||||||
filter: invert(1);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#header a,
|
#header a,
|
||||||
|
|||||||
Reference in New Issue
Block a user