diff --git a/Cargo.lock b/Cargo.lock index f8775bae7e..e20b79a808 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,31 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "actix" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1be241f88f3b1e7e9a3fbe3b5a8a0f6915b5a1d7ee0d9a248d3376d01068cc60" -dependencies = [ - "actix-rt 1.1.1", - "actix_derive 0.5.0", - "bitflags", - "bytes 0.5.6", - "crossbeam-channel 0.4.4", - "derive_more", - "futures-channel", - "futures-util", - "log", - "once_cell", - "parking_lot 0.11.1", - "pin-project 0.4.28", - "smallvec 1.6.1", - "tokio 0.2.25", - "tokio-util 0.3.1", - "trust-dns-proto", - "trust-dns-resolver", -] - [[package]] name = "actix" version = "0.12.0" @@ -34,10 +9,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3720d0064a0ce5c0de7bd93bdb0a6caebab2a9b5668746145d7b3b0c5da02914" dependencies = [ "actix-rt 2.4.0", - "actix_derive 0.6.0", + "actix_derive", "bitflags", "bytes 1.0.1", - "crossbeam-channel 0.5.1", + "crossbeam-channel", "futures-core", "futures-sink", "futures-task", @@ -152,6 +127,28 @@ dependencies = [ "v_htmlescape", ] +[[package]] +name = "actix-files" +version = "0.6.0-beta.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cf3754d4632de16dd68f6a5d379cf9d7200ec26020482e26aa16560a258e92f3" +dependencies = [ + "actix-http 3.0.0-beta.11", + "actix-service 2.0.1", + "actix-utils 3.0.0", + "actix-web 4.0.0-beta.10", + "askama_escape", + "bitflags", + "bytes 1.0.1", + "derive_more", + "futures-core", + "http-range", + "log", + "mime", + "mime_guess", + "percent-encoding 2.1.0", +] + [[package]] name = "actix-http" version = "2.2.0" @@ -166,14 +163,12 @@ dependencies = [ "actix-utils 2.0.0", "base64 0.13.0", "bitflags", - "brotli2", "bytes 0.5.6", "cookie 0.14.4", "copyless", "derive_more", "either", "encoding_rs", - "flate2", "futures-channel", "futures-core", "futures-util", @@ -263,17 +258,18 @@ dependencies = [ [[package]] name = "actix-multipart" -version = "0.3.0" +version = "0.4.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774bfeb11b54bf9c857a005b8ab893293da4eaff79261a66a9200dab7f5ab6e3" +checksum = "ee3878dadc5d0e2afa0439b4e1ef3b03fa2feb72c208d8c6f196ed6242979f6d" dependencies = [ - "actix-service 1.0.6", - "actix-utils 2.0.0", - "actix-web 3.3.2", - "bytes 0.5.6", + "actix-utils 3.0.0", + "actix-web 4.0.0-beta.10", + "bytes 1.0.1", "derive_more", + "futures-core", "futures-util", "httparse", + "local-waker", "log", "mime", "twoway", @@ -557,29 +553,13 @@ dependencies = [ "url 2.2.2", ] -[[package]] -name = "actix-web-actors" -version = "3.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6edf3c2693e2a8c422800c87ee89a6a4eac7dd01109bc172a1093ce1f4f001" -dependencies = [ - "actix 0.10.0", - "actix-codec 0.3.0", - "actix-http 2.2.0", - "actix-web 3.3.2", - "bytes 0.5.6", - "futures-channel", - "futures-core", - "pin-project 0.4.28", -] - [[package]] name = "actix-web-actors" version = "4.0.0-beta.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "00b43c8e03f1877bc010316de455ee479aa0de0ae0717d49041db5f38fa192de" dependencies = [ - "actix 0.12.0", + "actix", "actix-codec 0.4.1", "actix-http 3.0.0-beta.11", "actix-web 4.0.0-beta.10", @@ -613,17 +593,6 @@ dependencies = [ "syn", ] -[[package]] -name = "actix_derive" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b95aceadaf327f18f0df5962fedc1bde2f870566a0b9f65c89508a3b1f79334c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "actix_derive" version = "0.6.0" @@ -651,12 +620,6 @@ dependencies = [ "opaque-debug", ] -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - [[package]] name = "ahash" version = "0.4.7" @@ -733,116 +696,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e" [[package]] -name = "async-channel" -version = "1.6.1" +name = "askama_escape" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2114d64672151c0c5eaa5e131ec84a74f06e1e559830dabba01ca30605d66319" -dependencies = [ - "concurrent-queue", - "event-listener", - "futures-core", -] - -[[package]] -name = "async-executor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "871f9bb5e0a22eeb7e8cf16641feb87c9dc67032ccf8ff49e772eb9941d3a965" -dependencies = [ - "async-task", - "concurrent-queue", - "fastrand", - "futures-lite", - "once_cell", - "slab", -] - -[[package]] -name = "async-global-executor" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9586ec52317f36de58453159d48351bc244bc24ced3effc1fce22f3d48664af6" -dependencies = [ - "async-channel", - "async-executor", - "async-io", - "async-mutex", - "blocking", - "futures-lite", - "num_cpus", - "once_cell", -] - -[[package]] -name = "async-io" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bbfd5cf2794b1e908ea8457e6c45f8f8f1f6ec5f74617bf4662623f47503c3b" -dependencies = [ - "concurrent-queue", - "fastrand", - "futures-lite", - "libc", - "log", - "once_cell", - "parking", - "polling", - "slab", - "socket2 0.4.0", - "waker-fn", - "winapi 0.3.9", -] - -[[package]] -name = "async-lock" -version = "2.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6a8ea61bf9947a1007c5cada31e647dbc77b103c679858150003ba697ea798b" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-mutex" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479db852db25d9dbf6204e6cb6253698f175c15726470f78af0d918e99d6156e" -dependencies = [ - "event-listener", -] - -[[package]] -name = "async-std" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9f06685bad74e0570f5213741bea82158279a4103d988e57bfada11ad230341" -dependencies = [ - "async-channel", - "async-global-executor", - "async-io", - "async-lock", - "crossbeam-utils 0.8.4", - "futures-channel", - "futures-core", - "futures-io", - "futures-lite", - "gloo-timers", - "kv-log-macro", - "log", - "memchr", - "num_cpus", - "once_cell", - "pin-project-lite 0.2.6", - "pin-utils", - "slab", - "wasm-bindgen-futures", -] - -[[package]] -name = "async-task" -version = "4.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0" +checksum = "90c108c1a94380c89d2215d0ac54ce09796823cca0fd91b299cfff3b33e346fb" [[package]] name = "async-trait" @@ -864,17 +721,11 @@ dependencies = [ "num-traits", ] -[[package]] -name = "atomic-waker" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "065374052e7df7ee4047b1160cca5e1467a12351a40b3da123c870ba0b8eda2a" - [[package]] name = "attohttpc" -version = "0.15.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe174d1b67f7b2bafed829c09db039301eb5841f66e43be2cf60b326e7f8e2cc" +checksum = "e69e13a99a7e6e070bb114f7ff381e58c7ccc188630121fc4c2fe4bcf24cd072" dependencies = [ "http", "log", @@ -883,6 +734,7 @@ dependencies = [ "serde", "serde_json", "url 2.2.2", + "wildmatch", ] [[package]] @@ -934,27 +786,27 @@ dependencies = [ [[package]] name = "aws-creds" -version = "0.24.1" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad53a54cb2c99990e96eefacde6f143dc6d471ab70809d26d360292be421d490" +checksum = "460a75eac8f3cb7683e0a9a588a83c3ff039331ea7bfbfbfcecf1dacab276e11" dependencies = [ + "anyhow", "attohttpc", "dirs", "rust-ini", "serde", "serde-xml-rs", "serde_derive", - "simpl", "url 2.2.2", ] [[package]] name = "aws-region" -version = "0.22.1" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f610af4a396f07592014dc3410f6ad78fab931852a99bb6cfdc1ad04b9329b80" +checksum = "b1efb67b8f201dd0deea4e1240bce7da0366f8df90509a7df054973604b20b34" dependencies = [ - "simpl", + "anyhow", ] [[package]] @@ -1040,20 +892,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" -[[package]] -name = "blocking" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5e170dbede1f740736619b776d7251cb1b9095c435c34d8ca9f57fcd2f335e9" -dependencies = [ - "async-channel", - "async-task", - "atomic-waker", - "fastrand", - "futures-lite", - "once_cell", -] - [[package]] name = "blowfish" version = "0.6.0" @@ -1143,12 +981,6 @@ dependencies = [ "bytes 1.0.1", ] -[[package]] -name = "cache-padded" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba" - [[package]] name = "cargo-platform" version = "0.1.1" @@ -1257,15 +1089,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "concurrent-queue" -version = "1.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30ed07550be01594c6026cff2a1d7fe9c8f683caa798e12b68694ac9e88286a3" -dependencies = [ - "cache-padded", -] - [[package]] name = "config" version = "0.0.1" @@ -1351,6 +1174,15 @@ dependencies = [ "build_const", ] +[[package]] +name = "crc" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49fc9a695bca7f35f5f4c15cddc84415f66a74ea78eef08e90c5024f2b540e23" +dependencies = [ + "crc-catalog", +] + [[package]] name = "crc-any" version = "2.3.11" @@ -1360,6 +1192,12 @@ dependencies = [ "debug-helper", ] +[[package]] +name = "crc-catalog" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccaeedb56da03b09f598226e25e80088cb4cd25f316e6e4df7d695f0feeb1403" + [[package]] name = "crc32fast" version = "1.2.1" @@ -1369,16 +1207,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "crossbeam-channel" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" -dependencies = [ - "crossbeam-utils 0.7.2", - "maybe-uninit", -] - [[package]] name = "crossbeam-channel" version = "0.5.1" @@ -1421,16 +1249,6 @@ dependencies = [ "lazy_static", ] -[[package]] -name = "crypto-mac" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58bcd97a54c7ca5ce2f6eb16f6bede5b0ab5f0055fedc17d2f0b4466e21671ca" -dependencies = [ - "generic-array", - "subtle", -] - [[package]] name = "crypto-mac" version = "0.10.0" @@ -1442,13 +1260,13 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.1.20" +name = "crypto-mac" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" +checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714" dependencies = [ - "quote", - "syn", + "generic-array", + "subtle", ] [[package]] @@ -1520,9 +1338,9 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.2" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" +checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ "dirs-sys", ] @@ -1630,21 +1448,6 @@ dependencies = [ "termcolor", ] -[[package]] -name = "event-listener" -version = "2.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59" - -[[package]] -name = "fastrand" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77b705829d1e87f762c2df6da140b26af5839e1033aa84aa5f56bb688e4e1bdb" -dependencies = [ - "instant", -] - [[package]] name = "firestorm" version = "0.4.6" @@ -1771,27 +1574,23 @@ dependencies = [ "num_cpus", ] +[[package]] +name = "futures-intrusive" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62007592ac46aa7c2b6416f7deb9a8a8f63a01e0f1d6e1787d5630170db2b63e" +dependencies = [ + "futures-core", + "lock_api 0.4.4", + "parking_lot 0.11.1", +] + [[package]] name = "futures-io" version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "522de2a0fe3e380f1bc577ba0474108faf3f6b18321dbf60b3b9c39a75073377" -[[package]] -name = "futures-lite" -version = "1.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4481d0cd0de1d204a4fa55e7d45f07b1d958abcb06714b3446438e2eff695fb" -dependencies = [ - "fastrand", - "futures-core", - "futures-io", - "memchr", - "parking", - "pin-project-lite 0.2.6", - "waker-fn", -] - [[package]] name = "futures-macro" version = "0.3.17" @@ -1888,19 +1687,6 @@ dependencies = [ "wasi 0.10.0+wasi-snapshot-preview1", ] -[[package]] -name = "gloo-timers" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47204a46aaff920a1ea58b11d03dec6f704287d27561724a4631e450654a891f" -dependencies = [ - "futures-channel", - "futures-core", - "js-sys", - "wasm-bindgen", - "web-sys", -] - [[package]] name = "h2" version = "0.2.7" @@ -1940,16 +1726,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "hashbrown" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" -dependencies = [ - "ahash 0.3.8", - "autocfg 1.0.1", -] - [[package]] name = "hashbrown" version = "0.9.1" @@ -1959,6 +1735,15 @@ dependencies = [ "ahash 0.4.7", ] +[[package]] +name = "hashbrown" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash 0.7.4", +] + [[package]] name = "hashlink" version = "0.6.0" @@ -1968,6 +1753,15 @@ dependencies = [ "hashbrown 0.9.1", ] +[[package]] +name = "hashlink" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" +dependencies = [ + "hashbrown 0.11.2", +] + [[package]] name = "heck" version = "0.3.2" @@ -1992,16 +1786,6 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" -[[package]] -name = "hmac" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deae6d9dbb35ec2c502d62b8f7b1c000a0822c3b0794ba36b3149c0a1c840dff" -dependencies = [ - "crypto-mac 0.9.1", - "digest", -] - [[package]] name = "hmac" version = "0.10.1" @@ -2012,6 +1796,16 @@ dependencies = [ "digest", ] +[[package]] +name = "hmac" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" +dependencies = [ + "crypto-mac 0.11.1", + "digest", +] + [[package]] name = "hostname" version = "0.3.1" @@ -2055,15 +1849,18 @@ dependencies = [ "pin-project-lite 0.2.6", ] +[[package]] +name = "http-range" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eee9694f83d9b7c09682fdb32213682939507884e5bcf227be9aff5d644b90dc" + [[package]] name = "http_server_common" version = "0.0.1" dependencies = [ - "actix-cors 0.5.4", "actix-cors 0.6.0-beta.3", - "actix-http 2.2.0", "actix-http 3.0.0-beta.11", - "actix-web 3.3.2", "actix-web 4.0.0-beta.10", "anyhow", "base64 0.13.0", @@ -2303,15 +2100,6 @@ dependencies = [ "winapi-build", ] -[[package]] -name = "kv-log-macro" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f" -dependencies = [ - "log", -] - [[package]] name = "language-tags" version = "0.2.2" @@ -2437,7 +2225,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" dependencies = [ "cfg-if 1.0.0", - "value-bag", ] [[package]] @@ -2490,6 +2277,17 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" +[[package]] +name = "maybe-async" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6007f9dad048e0a224f27ca599d669fca8cfa0dac804725aab542b2eb032bce6" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "maybe-uninit" version = "2.0.0" @@ -2535,6 +2333,15 @@ dependencies = [ "unicase", ] +[[package]] +name = "minidom" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "332592c2149fc7dd40a64fc9ef6f0d65607284b474cef9817d1fc8c7e7b3608e" +dependencies = [ + "quick-xml", +] + [[package]] name = "miniz_oxide" version = "0.4.4" @@ -2720,6 +2527,17 @@ dependencies = [ "num-traits", ] +[[package]] +name = "num-bigint" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f93ab6289c7b344a8a9f60f88d80aa20032336fe78da341afc91c8a2341fc75f" +dependencies = [ + "autocfg 1.0.1", + "num-integer", + "num-traits", +] + [[package]] name = "num-bigint-dig" version = "0.6.1" @@ -2739,6 +2557,24 @@ dependencies = [ "zeroize", ] +[[package]] +name = "num-bigint-dig" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4547ee5541c18742396ae2c895d0717d0f886d8823b8399cdaf7b07d63ad0480" +dependencies = [ + "autocfg 0.1.7", + "byteorder", + "lazy_static", + "libm", + "num-integer", + "num-iter", + "num-traits", + "rand 0.8.4", + "smallvec 1.6.1", + "zeroize", +] + [[package]] name = "num-integer" version = "0.1.44" @@ -2767,6 +2603,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" dependencies = [ "autocfg 1.0.1", + "libm", ] [[package]] @@ -2783,15 +2620,15 @@ dependencies = [ name = "obs-gateway-server" version = "0.0.1" dependencies = [ - "actix 0.12.0", + "actix", "actix-cors 0.5.4", - "actix-files", + "actix-files 0.5.0", "actix-http 3.0.0-beta.11", "actix-rt 2.4.0", "actix-service 2.0.1", "actix-utils 3.0.0", "actix-web 4.0.0-beta.10", - "actix-web-actors 4.0.0-beta.7", + "actix-web-actors", "anyhow", "base64 0.13.0", "bcrypt", @@ -2822,13 +2659,13 @@ dependencies = [ "r2d2_redis", "rand 0.8.4", "regex", - "reqwest 0.11.6", + "reqwest", "rpassword", "serde", "serde_derive", "serde_json", "sha2", - "sqlx", + "sqlx 0.4.2", "time 0.2.26", "tokio 1.13.0", "tokio-tungstenite", @@ -2885,20 +2722,14 @@ dependencies = [ [[package]] name = "ordered-multimap" -version = "0.2.4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88f947c6799d5eff50e6cf8a2365c17ac4aa8f8f43aceeedc29b616d872a358" +checksum = "1c672c7ad9ec066e428c00eb917124a06f08db19e2584de982cc34b1f4c12485" dependencies = [ "dlv-list", - "hashbrown 0.7.2", + "hashbrown 0.9.1", ] -[[package]] -name = "parking" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427c3892f9e783d91cc128285287e70a59e206ca452770ece88a76f7a3eddd72" - [[package]] name = "parking_lot" version = "0.9.0" @@ -3052,19 +2883,6 @@ version = "0.3.19" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3831453b3449ceb48b6d9c7ad7c96d5ea673e9b470a1dc578c2ce6521230884c" -[[package]] -name = "polling" -version = "2.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fc12d774e799ee9ebae13f4076ca003b40d18a11ac0f3641e6f899618580b7b" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "log", - "wepoll-sys", - "winapi 0.3.9", -] - [[package]] name = "ppv-lite86" version = "0.2.10" @@ -3110,6 +2928,15 @@ version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +[[package]] +name = "quick-xml" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26aab6b48e2590e4a64d1ed808749ba06257882b461d01ca71baeb747074a6dd" +dependencies = [ + "memchr", +] + [[package]] name = "quote" version = "1.0.9" @@ -3352,42 +3179,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "reqwest" -version = "0.10.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0718f81a8e14c4dbb3b34cf23dc6aaf9ab8a0dfec160c534b3dbca1aaa21f47c" -dependencies = [ - "base64 0.13.0", - "bytes 0.5.6", - "encoding_rs", - "futures-core", - "futures-util", - "http", - "http-body 0.3.1", - "hyper 0.13.10", - "hyper-tls 0.4.3", - "ipnet", - "js-sys", - "lazy_static", - "log", - "mime", - "mime_guess", - "native-tls", - "percent-encoding 2.1.0", - "pin-project-lite 0.2.6", - "serde", - "serde_json", - "serde_urlencoded", - "tokio 0.2.25", - "tokio-tls", - "url 2.2.2", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", - "winreg 0.7.0", -] - [[package]] name = "reqwest" version = "0.11.6" @@ -3482,57 +3273,78 @@ dependencies = [ "byteorder", "digest", "lazy_static", - "num-bigint-dig", + "num-bigint-dig 0.6.1", "num-integer", "num-iter", "num-traits", "pem", "rand 0.7.3", "sha2", - "simple_asn1", + "simple_asn1 0.4.1", "subtle", "thiserror", "zeroize", ] [[package]] -name = "rust-ini" -version = "0.15.3" +name = "rsa" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a3679dd538c876a7b606f3bb951c8a20fc281a0ff7795f59f7cb490e3f979e1" +checksum = "7b0aeddcca1082112a6eeb43bf25fd7820b066aaf6eaef776e19d0a1febe38fe" dependencies = [ - "cfg-if 0.1.10", + "byteorder", + "digest", + "lazy_static", + "num-bigint-dig 0.7.0", + "num-integer", + "num-iter", + "num-traits", + "pem", + "rand 0.8.4", + "simple_asn1 0.5.4", + "subtle", + "zeroize", +] + +[[package]] +name = "rust-ini" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63471c4aa97a1cf8332a5f97709a79a4234698de6a1f5087faf66f2dae810e22" +dependencies = [ + "cfg-if 1.0.0", "ordered-multimap", ] [[package]] name = "rust-s3" -version = "0.26.4" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a04bdd0f5118d06ef0e2daa658a9e5135282bcecfd6c46b11fddf47b1d5d736d" +checksum = "18c58d4682844a5d6301efbf915dd7a9d3d638006f9bb821527a0bbbf2a4cfc2" dependencies = [ - "async-std", + "anyhow", + "async-trait", "aws-creds", "aws-region", "base64 0.13.0", "cfg-if 1.0.0", "chrono", - "futures 0.3.17", "hex", - "hmac 0.9.0", + "hmac 0.11.0", "http", "log", + "maybe-async", "md5", + "minidom", "percent-encoding 2.1.0", - "reqwest 0.10.10", + "reqwest", "serde", "serde-xml-rs", "serde_derive", "sha2", - "simpl", - "tokio 0.2.25", + "tokio 1.13.0", + "tokio-stream", "url 2.2.2", - "uuid", ] [[package]] @@ -3678,9 +3490,9 @@ dependencies = [ [[package]] name = "serde-xml-rs" -version = "0.4.1" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0bf1ba0696ccf0872866277143ff1fd14d22eec235d2b23702f95e6660f7dfa" +checksum = "65162e9059be2f6a3421ebbb4fef3e74b7d9e7c60c50a0e292c6239f19f1edfa" dependencies = [ "log", "serde", @@ -3784,12 +3596,6 @@ dependencies = [ "libc", ] -[[package]] -name = "simpl" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a30f10c911c0355f80f1c2faa8096efc4a58cdf8590b954d5b395efa071c711" - [[package]] name = "simple_asn1" version = "0.4.1" @@ -3801,6 +3607,18 @@ dependencies = [ "num-traits", ] +[[package]] +name = "simple_asn1" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eb4ea60fb301dc81dfc113df680571045d375ab7345d171c5dc7d7e13107a80" +dependencies = [ + "chrono", + "num-bigint 0.4.3", + "num-traits", + "thiserror", +] + [[package]] name = "slab" version = "0.4.3" @@ -3868,8 +3686,18 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1a98f9bf17b690f026b6fec565293a995b46dfbd6293debcb654dcffd2d1b34" dependencies = [ - "sqlx-core", - "sqlx-macros", + "sqlx-core 0.4.2", + "sqlx-macros 0.4.2", +] + +[[package]] +name = "sqlx" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e4b94ab0f8c21ee4899b93b06451ef5d965f1a355982ee73684338228498440" +dependencies = [ + "sqlx-core 0.5.7", + "sqlx-macros 0.5.7", ] [[package]] @@ -3885,8 +3713,8 @@ dependencies = [ "byteorder", "bytes 0.5.6", "chrono", - "crc", - "crossbeam-channel 0.5.1", + "crc 1.8.1", + "crossbeam-channel", "crossbeam-queue", "crossbeam-utils 0.8.4", "digest", @@ -3895,7 +3723,7 @@ dependencies = [ "futures-core", "futures-util", "generic-array", - "hashlink", + "hashlink 0.6.0", "hex", "itoa", "libc", @@ -3906,19 +3734,68 @@ dependencies = [ "parking_lot 0.11.1", "percent-encoding 2.1.0", "rand 0.7.3", - "rsa", + "rsa 0.3.0", "serde", "sha-1", "sha2", "smallvec 1.6.1", "sqlformat", - "sqlx-rt", + "sqlx-rt 0.2.0", "stringprep", "thiserror", "url 2.2.2", "whoami", ] +[[package]] +name = "sqlx-core" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec28b91a01e1fe286d6ba66f68289a2286df023fc97444e1fd86c2fd6d5dc026" +dependencies = [ + "ahash 0.7.4", + "atoi", + "base64 0.13.0", + "bitflags", + "byteorder", + "bytes 1.0.1", + "chrono", + "crc 2.1.0", + "crossbeam-channel", + "crossbeam-queue", + "crossbeam-utils 0.8.4", + "digest", + "either", + "futures-channel", + "futures-core", + "futures-intrusive", + "futures-util", + "generic-array", + "hashlink 0.7.0", + "hex", + "itoa", + "libc", + "log", + "memchr", + "num-bigint 0.3.2", + "once_cell", + "parking_lot 0.11.1", + "percent-encoding 2.1.0", + "rand 0.8.4", + "rsa 0.4.1", + "serde", + "sha-1", + "sha2", + "smallvec 1.6.1", + "sqlformat", + "sqlx-rt 0.5.9", + "stringprep", + "thiserror", + "tokio-stream", + "url 2.2.2", + "whoami", +] + [[package]] name = "sqlx-macros" version = "0.4.2" @@ -3937,8 +3814,31 @@ dependencies = [ "serde", "serde_json", "sha2", - "sqlx-core", - "sqlx-rt", + "sqlx-core 0.4.2", + "sqlx-rt 0.2.0", + "syn", + "url 2.2.2", +] + +[[package]] +name = "sqlx-macros" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4dc33c35d54774eed73d54568d47a6ac099aed8af5e1556a017c131be88217d5" +dependencies = [ + "dotenv", + "either", + "futures 0.3.17", + "heck", + "hex", + "once_cell", + "proc-macro2", + "quote", + "serde", + "serde_json", + "sha2", + "sqlx-core 0.5.7", + "sqlx-rt 0.5.9", "syn", "url 2.2.2", ] @@ -3955,6 +3855,19 @@ dependencies = [ "tokio-native-tls 0.1.0", ] +[[package]] +name = "sqlx-rt" +version = "0.5.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d1bd069de53442e7a320f525a6d4deb8bb0621ac7a55f7eccbc2b58b57f43d0" +dependencies = [ + "actix-rt 2.4.0", + "native-tls", + "once_cell", + "tokio 1.13.0", + "tokio-native-tls 0.3.0", +] + [[package]] name = "standback" version = "0.2.17" @@ -4023,16 +3936,16 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" name = "storyteller-web" version = "0.0.1" dependencies = [ - "actix 0.10.0", - "actix-cors 0.5.4", - "actix-files", - "actix-http 2.2.0", + "actix", + "actix-cors 0.6.0-beta.3", + "actix-files 0.6.0-beta.8", + "actix-http 3.0.0-beta.11", "actix-multipart", "actix-rt 2.4.0", - "actix-service 1.0.6", + "actix-service 2.0.1", "actix-utils 3.0.0", - "actix-web 3.3.2", - "actix-web-actors 3.0.0", + "actix-web 4.0.0-beta.10", + "actix-web-actors", "anyhow", "base64 0.13.0", "bcrypt", @@ -4070,11 +3983,11 @@ dependencies = [ "serde_derive", "serde_json", "sha2", - "sqlx", + "sqlx 0.5.7", "subprocess", "tempdir", "time 0.2.26", - "tokio 0.2.25", + "tokio 1.13.0", "toml", "uuid", ] @@ -4428,6 +4341,17 @@ dependencies = [ "webpki", ] +[[package]] +name = "tokio-stream" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +dependencies = [ + "futures-core", + "pin-project-lite 0.2.6", + "tokio 1.13.0", +] + [[package]] name = "tokio-sync" version = "0.1.8" @@ -4505,7 +4429,6 @@ checksum = "be8242891f2b6cbef26a2d7e8605133c2c554cd35b3e4948ea892d6d68436499" dependencies = [ "bytes 0.5.6", "futures-core", - "futures-io", "futures-sink", "log", "pin-project-lite 0.1.12", @@ -4652,7 +4575,7 @@ dependencies = [ "futures 0.3.17", "http", "once_cell", - "reqwest 0.11.6", + "reqwest", "serde", "serde_derive", "serde_json", @@ -4678,7 +4601,7 @@ dependencies = [ "http", "once_cell", "rand 0.8.4", - "reqwest 0.11.6", + "reqwest", "serde", "serde_json", "thiserror", @@ -4860,16 +4783,6 @@ dependencies = [ "v_escape", ] -[[package]] -name = "value-bag" -version = "1.0.0-alpha.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd320e1520f94261153e96f7534476ad869c14022aee1e59af7c778075d840ae" -dependencies = [ - "ctor", - "version_check 0.9.3", -] - [[package]] name = "vcpkg" version = "0.2.12" @@ -4894,12 +4807,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -[[package]] -name = "waker-fn" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca" - [[package]] name = "want" version = "0.3.0" @@ -4929,8 +4836,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd" dependencies = [ "cfg-if 1.0.0", - "serde", - "serde_json", "wasm-bindgen-macro", ] @@ -5019,15 +4924,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "wepoll-sys" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fcb14dea929042224824779fbc82d9fab8d2e6d3cbc0ac404de8edf489e77ff" -dependencies = [ - "cc", -] - [[package]] name = "whoami" version = "1.1.2" @@ -5044,6 +4940,12 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c168940144dd21fd8046987c16a46a33d5fc84eec29ef9dcddc2ac9e31526b7c" +[[package]] +name = "wildmatch" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0" + [[package]] name = "winapi" version = "0.2.8" diff --git a/app/lib/http_server_common/Cargo.toml b/app/lib/http_server_common/Cargo.toml index 545e3e3aa3..1dc4b28a0c 100644 --- a/app/lib/http_server_common/Cargo.toml +++ b/app/lib/http_server_common/Cargo.toml @@ -22,23 +22,12 @@ dotenv = "0.15.0" log = "0.4.14" # Web -# NB: One microservice requires old Tokio (thus old actix), and another new Tokio (new actix). -# Thus I'm being extremely extra here and supporting both. -actix-cors-old = { package = "actix-cors", version = "0.5.4", optional = true } -actix-http-old = { package = "actix-http", version = "2.2.0", optional = true } -actix-web-old = { package = "actix-web", version = "3.3.2", optional = true } - -actix-cors-new = { package = "actix-cors", version = "0.6.0-beta.3", optional = true } -actix-http-new = { package = "actix-http", version = "3.0.0-beta.11", optional = true } -actix-web-new = { package = "actix-web", version = "4.0.0-beta.10", optional = true } +actix-cors = "0.6.0-beta.3" +actix-http = "3.0.0-beta.11" +actix-web = "4.0.0-beta.10" # Serialization serde = "1.0.125" serde_derive = "1.0.125" serde_json = "1.0.64" toml = "0.5.8" - -[features] -# default = ["actix-cors-new", "actix-web-new", "actix-http-new"] -actix-new = ["actix-cors-new", "actix-http-new", "actix-web-new"] -actix-old = ["actix-cors-old", "actix-http-old", "actix-web-old"] diff --git a/app/lib/http_server_common/src/lib.rs b/app/lib/http_server_common/src/lib.rs index a7e0cb7a41..44ed722aef 100644 --- a/app/lib/http_server_common/src/lib.rs +++ b/app/lib/http_server_common/src/lib.rs @@ -10,44 +10,6 @@ // I don't think this will be too hard to maintain. AFAICT, the only major differences are which // package "HttpResponseBuilder" is located in. -#[cfg(all(feature = "actix-new", not(feature = "actix-old")))] -//#[cfg(feature = "actix-cors-new")] -extern crate actix_cors_new as actix_cors; -#[cfg(all(feature = "actix-new", not(feature = "actix-old")))] -//#[cfg(feature = "actix-http-new")] -extern crate actix_http_new as actix_http; -#[cfg(all(feature = "actix-new", not(feature = "actix-old")))] -//#[cfg(feature = "actix-web-new")] -extern crate actix_web_new as actix_web; - -#[cfg(all(feature = "actix-old", not(feature = "actix-new")))] -//#[cfg(feature = "actix-cors-old")] -extern crate actix_cors_old as actix_cors; -#[cfg(all(feature = "actix-old", not(feature = "actix-new")))] -//#[cfg(feature = "actix-http-old")] -extern crate actix_http_old as actix_http; -#[cfg(all(feature = "actix-old", not(feature = "actix-new")))] -//#[cfg(feature = "actix-web-old")] -extern crate actix_web_old as actix_web; - -//#[cfg(any( -// all(feature = "actix-cors-new", not(feature = "actix-cors-old")), -// all(feature = "actix-cors-old", not(feature = "actix-cors-new")), -//))] -#[cfg(any( - feature = "actix-new", - feature = "actix-old", -))] pub mod cors; - -#[cfg(any( - feature = "actix-new", - feature = "actix-old", -))] pub mod endpoints; - -#[cfg(any( - feature = "actix-new", - feature = "actix-old", -))] pub mod response; diff --git a/app/lib/http_server_common/src/response/response_error_helpers.rs b/app/lib/http_server_common/src/response/response_error_helpers.rs index cf9bbbfccc..1bd6bf274b 100644 --- a/app/lib/http_server_common/src/response/response_error_helpers.rs +++ b/app/lib/http_server_common/src/response/response_error_helpers.rs @@ -1,12 +1,8 @@ use actix_http::http::header; +use actix_web::HttpResponseBuilder; use actix_web::http::StatusCode; use actix_web::{HttpResponse, ResponseError}; -#[cfg(feature = "actix-new")] -use actix_web::HttpResponseBuilder; - -#[cfg(not(feature = "actix-new"))] -use actix_web::dev::HttpResponseBuilder; #[derive(Serialize)] pub struct SimpleGenericJsonError { diff --git a/app/lib/http_server_common/src/response/serialize_as_json_error.rs b/app/lib/http_server_common/src/response/serialize_as_json_error.rs index 47ea5c3b2e..d288c9205e 100644 --- a/app/lib/http_server_common/src/response/serialize_as_json_error.rs +++ b/app/lib/http_server_common/src/response/serialize_as_json_error.rs @@ -1,18 +1,8 @@ use actix_http::http::{StatusCode, header}; use actix_web::HttpResponse; -use serde::Serialize; - -#[cfg(feature = "actix-new")] -use actix_web::error::ResponseError; - -#[cfg(feature = "actix-new")] use actix_web::HttpResponseBuilder; - -#[cfg(not(feature = "actix-new"))] -use actix_http::ResponseError; - -#[cfg(not(feature = "actix-new"))] -use actix_web::dev::HttpResponseBuilder; +use actix_web::error::ResponseError; +use serde::Serialize; /// Turn error responses into JSON HTTP responses pub fn serialize_as_json_error( diff --git a/app/storyteller_web/Cargo.toml b/app/storyteller_web/Cargo.toml index bcce8433b7..8221f12a87 100644 --- a/app/storyteller_web/Cargo.toml +++ b/app/storyteller_web/Cargo.toml @@ -39,7 +39,7 @@ path = "src/w2l_inference_job.rs" # Internal config = { path = "../lib/config" } -http_server_common = { path = "../lib/http_server_common", features = ["actix-old"] } +http_server_common = { path = "../lib/http_server_common" } # External anyhow = "1.0.40" @@ -67,8 +67,8 @@ uuid = { version = "0.8.2", features = ["v4"] } #async-std = { version = "1.6", features = [ "attributes" ] } # NB(2): Really unfortunate. We can't use Tokio 1.x due to a bug in `rust-s3` that I filed: # https://github.com/durch/rust-s3/issues/198 -#tokio = { version = "1.6.0", features = ["macros"] } -tokio = { version = "0.2.25", features = ["macros"] } +tokio = { version = "1.6.0", features = ["macros"] } +#tokio = { version = "0.2.25", features = ["macros"] } # MySql Database # "offline" supports typesafe builds without a live database @@ -76,8 +76,8 @@ tokio = { version = "0.2.25", features = ["macros"] } # https://github.com/launchbadge/sqlx/issues/1095#issuecomment-798050828 #sqlx = { version = "0.5", features = [ "mysql", "runtime-async-std-native-tls", "offline", "chrono" ] } # NB: We can't use `sqlx` 0.5 due to the `rust-s3` bug that requires a Tokio 1.x -> 0.2 downgrade -#sqlx = { version = "0.5", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } -sqlx = { version = "0.4", features = [ "mysql", "runtime-tokio-native-tls", "offline", "chrono" ] } +sqlx = { version = "0.5", features = [ "mysql", "runtime-actix-native-tls", "offline", "chrono" ] } +#sqlx = { version = "0.4", features = [ "mysql", "runtime-tokio-native-tls", "offline", "chrono" ] } # Redis Database limitation = "0.1.1" # Redis rate limiter @@ -93,25 +93,39 @@ ring = "0.17.0-alpha.10" # in the 0.27.* series, so we have to downgrade to 0.26, which includes a broad downgrade from Tokio 1.0 -> 0.2 #rust-s3 = "0.27.0-rc4" #rust-s3 = { version = "0.27.0-rc4", features = ["with-async-std"], default-features = false } -rust-s3 = { version = "0.26" } +#rust-s3 = { version = "0.26" } +#rust-s3 = { version = "0.28", features = ["with-async-std"], default-features = false } +rust-s3 = { version = "0.28" } infer = "0.5.0" subprocess = "0.2.6" tempdir = "0.3.7" # Web -actix = "0.10" -actix-cors = "0.5.4" -actix-files= "0.5" -actix-http = "2.2.0" -actix-multipart = "0.3.0" # TODO: Ready for 0.4 upgrade -actix-rt = "2.2.0" -actix-service = "1.0.6" +#actix = "0.10" +#actix-cors = "0.5.4" +#actix-files= "0.5" +#actix-http = "2.2.0" +#actix-rt = "2.2.0" +#actix-service = "1.0.6" +#actix-utils = "3.0.0" +#actix-web = "3.3.2" +#actix-web-actors = "3" +#jwt = "0.13.0" + +actix = "0.12.0" +actix-cors = "0.6.0-beta.3" +actix-files= "0.6.0-beta.8" +actix-http = "3.0.0-beta.11" +actix-multipart = "0.4.0-beta.7" # TODO: Ready for 0.4 upgrade +actix-rt = "2.4.0" +actix-service = "2.0.1" actix-utils = "3.0.0" -actix-web = "3.3.2" -actix-web-actors = "3" +actix-web = "4.0.0-beta.10" +actix-web-actors = "4.0.0-beta.7" jwt = "0.13.0" + # NB: Hyper is just for HTTP client use in jobs. I'd use Actix client, but I need tokio runtime # NB: Furthermore, the Tokio runtime is old, so I have to use an older Hyper. hyper = { version = "0.13.10" } diff --git a/app/storyteller_web/src/database/mediators/badge_granter.rs b/app/storyteller_web/src/database/mediators/badge_granter.rs index 1d8bd4734b..126409c4e3 100644 --- a/app/storyteller_web/src/database/mediators/badge_granter.rs +++ b/app/storyteller_web/src/database/mediators/badge_granter.rs @@ -5,7 +5,7 @@ use crate::util::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn,info}; use sqlx::error::Error::Database; -use sqlx::mysql::MySqlDone; +use sqlx::mysql::MySqlQueryResult; use sqlx::{MySqlPool}; use std::sync::Arc; @@ -314,7 +314,7 @@ SET Ok(record_id) } - fn handle_results(query_result: Result) -> AnyhowResult { + fn handle_results(query_result: Result) -> AnyhowResult { let record_id = match query_result { Ok(res) => { res.last_insert_id() diff --git a/app/storyteller_web/src/database/mediators/firehose_publisher.rs b/app/storyteller_web/src/database/mediators/firehose_publisher.rs index 850f4a8a73..d9a1860fb0 100644 --- a/app/storyteller_web/src/database/mediators/firehose_publisher.rs +++ b/app/storyteller_web/src/database/mediators/firehose_publisher.rs @@ -4,7 +4,7 @@ use crate::util::anyhow_result::AnyhowResult; use crate::util::random_prefix_crockford_token::random_prefix_crockford_token; use log::{warn,info}; use sqlx::error::Error::Database; -use sqlx::mysql::MySqlDone; +use sqlx::mysql::MySqlQueryResult; use sqlx::{MySqlPool}; use std::sync::Arc; @@ -207,7 +207,7 @@ SET Ok(record_id) } - fn handle_results(query_result: Result) -> AnyhowResult { + fn handle_results(query_result: Result) -> AnyhowResult { let record_id = match query_result { Ok(res) => { res.last_insert_id() diff --git a/app/storyteller_web/src/http_server/endpoints/events/list_events.rs b/app/storyteller_web/src/http_server/endpoints/events/list_events.rs index 9274684e99..1822edcdaa 100644 --- a/app/storyteller_web/src/http_server/endpoints/events/list_events.rs +++ b/app/storyteller_web/src/http_server/endpoints/events/list_events.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; diff --git a/app/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs b/app/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs index 2437eb477d..0b2c49fcac 100644 --- a/app/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs +++ b/app/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; diff --git a/app/storyteller_web/src/http_server/endpoints/misc/alpha_cookie.rs b/app/storyteller_web/src/http_server/endpoints/misc/alpha_cookie.rs index 6071621606..da5bdb88b7 100644 --- a/app/storyteller_web/src/http_server/endpoints/misc/alpha_cookie.rs +++ b/app/storyteller_web/src/http_server/endpoints/misc/alpha_cookie.rs @@ -1,4 +1,4 @@ -use actix_http::cookie::Cookie; +use actix_web::cookie::Cookie; use crate::server_state::ServerState; pub const ALPHA_COOKIE_NAME : &'static str = "enable-alpha"; diff --git a/app/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs b/app/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs index fc027e963f..c93aea0d49 100644 --- a/app/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs +++ b/app/storyteller_web/src/http_server/endpoints/misc/enable_alpha_easy_handler.rs @@ -1,4 +1,4 @@ -use actix_http::cookie::Cookie; +use actix_web::cookie::Cookie; use actix_http::http::StatusCode; use actix_web::web::Query; use actix_web::{HttpResponse, HttpRequest, Responder, get, web, HttpMessage}; diff --git a/app/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs b/app/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs index 35ae74a502..b07d763759 100644 --- a/app/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs +++ b/app/storyteller_web/src/http_server/endpoints/misc/enable_alpha_handler.rs @@ -1,4 +1,4 @@ -use actix_http::cookie::Cookie; +use actix_web::cookie::Cookie; use actix_http::http::StatusCode; use actix_web::web::Query; use actix_web::{HttpResponse, HttpRequest, Responder, get, web, HttpMessage}; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs b/app/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs index e502cea6b9..f0a6f7b1bc 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/approval/pending_w2l_templates.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs b/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs index 99ea56639c..c95b379039 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/add_ip_ban.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs b/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs index 348a922964..5de8eb49db 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/delete_ip_ban.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs b/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs index 5ba8b6bf2e..20b174bd60 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/get_ip_ban.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs b/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs index ca2cebdca1..1ebea79e13 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/ip_bans/list_ip_bans.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs b/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs index 8f6641dd0f..3558c33897 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_tts_inference_queue_count.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs b/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs index 433e431c69..867e88182c 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/jobs/get_w2l_inference_queue_count.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs b/app/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs index dc2c06880a..b8810e2d21 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/stats/get_voice_count_stats.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs b/app/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs index 725cfc5c87..61fc2a2ce4 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs b/app/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs index 76e8ba7044..6c79346f14 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/user_bans/list_banned_users.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs b/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs index 81c1262c5b..17dc561285 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs b/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs index 9a43ba5afd..d79a244d8c 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_staff.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs b/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs index 9b855a1981..6b8fdba86a 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs b/app/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs index 31d586bf6a..a30b6e1143 100644 --- a/app/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs +++ b/app/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs b/app/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs index 8197488110..9753a57a56 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs b/app/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs index 6e8d1d3b37..6db246af59 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs b/app/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs index befe0efaab..10e4cff029 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs b/app/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs index cd57d8db75..4560c607d7 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs b/app/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs index 3438922477..2a3c964404 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/enqueue_infer_tts.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs b/app/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs index 79165bb12a..e82fcad088 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/enqueue_upload_tts_model.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs index 25005e28b9..8cc570619d 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_inference_job_status.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs index 2f0112070c..baf749499a 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs index bd6069d498..54768c33b8 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_model_use_count.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs index 61b606cccd..f3f9d284dc 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs index ff0ce3e99d..ea5b9c97e7 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/get_tts_upload_model_job_status.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs b/app/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs index de5c2eb9ca..eb1066b464 100644 --- a/app/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs +++ b/app/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; diff --git a/app/storyteller_web/src/http_server/endpoints/users/create_account.rs b/app/storyteller_web/src/http_server/endpoints/users/create_account.rs index 17cabc9dfe..48db69f9d4 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/create_account.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/create_account.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/users/edit_profile.rs b/app/storyteller_web/src/http_server/endpoints/users/edit_profile.rs index 1b69c5e187..c31c421065 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/edit_profile.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/edit_profile.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/users/get_profile.rs b/app/storyteller_web/src/http_server/endpoints/users/get_profile.rs index e88652970d..e3f464a7bb 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/get_profile.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/get_profile.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/users/list_user_tts_inference_results.rs b/app/storyteller_web/src/http_server/endpoints/users/list_user_tts_inference_results.rs index c632a6473f..4b1a64dc5e 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/list_user_tts_inference_results.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/list_user_tts_inference_results.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Query}; diff --git a/app/storyteller_web/src/http_server/endpoints/users/list_user_tts_models.rs b/app/storyteller_web/src/http_server/endpoints/users/list_user_tts_models.rs index 95ea806ad6..e7de6a9d50 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/list_user_tts_models.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/list_user_tts_models.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/users/list_user_w2l_inference_results.rs b/app/storyteller_web/src/http_server/endpoints/users/list_user_w2l_inference_results.rs index 52dc38c569..21e032853d 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/list_user_w2l_inference_results.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/list_user_w2l_inference_results.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Query}; diff --git a/app/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs b/app/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs index 76300e85ca..071e91af1b 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/users/login.rs b/app/storyteller_web/src/http_server/endpoints/users/login.rs index 2079b4648d..a348294866 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/login.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/login.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/users/logout.rs b/app/storyteller_web/src/http_server/endpoints/users/logout.rs index c7f289301d..f892574399 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/logout.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/logout.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; diff --git a/app/storyteller_web/src/http_server/endpoints/users/session_info.rs b/app/storyteller_web/src/http_server/endpoints/users/session_info.rs index 8324b7bf0a..b13a984319 100644 --- a/app/storyteller_web/src/http_server/endpoints/users/session_info.rs +++ b/app/storyteller_web/src/http_server/endpoints/users/session_info.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs b/app/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs index 7864714374..8eba2b589b 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs b/app/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs index bd4f9c2017..cc0fbcea19 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs b/app/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs index cbda727582..f9f45cf103 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs b/app/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs index 5d5929e2b7..1777c3c5ee 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs b/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs index c0c25714f0..1597201851 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs b/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs index 68709a3940..0e9e63b3e5 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_infer_w2l_with_uploads.rs @@ -1,7 +1,7 @@ use actix_http::http::header; use actix_multipart::{Multipart, Field}; use actix_web::body::ResponseBody::Body; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::http::StatusCode; use actix_web::http::header::ContentDisposition; use actix_web::web::{Data, Json, BytesMut}; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs b/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs index 681e9f32b1..54bfac71e0 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/enqueue_upload_w2l_template.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs index afde7fa1cb..5997d0856a 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_inference_job_status.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs index 1313a8fd2f..f5b19d8eff 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs index c9bf1767dd..22a72c26a6 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs index 79583c67fa..909022b12b 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template_use_count.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs index e1fc4dfaf4..c3f26bf6b3 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/get_w2l_upload_template_job_status.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs b/app/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs index c4d8ccbfdf..83b087acdf 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; diff --git a/app/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs b/app/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs index d2612a1d6d..8c356af375 100644 --- a/app/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs +++ b/app/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs @@ -1,7 +1,7 @@ use actix_http::Error; use actix_http::http::header; use actix_web::cookie::Cookie; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; diff --git a/app/storyteller_web/src/http_server/middleware/mod.rs b/app/storyteller_web/src/http_server/middleware/mod.rs index a2369086a3..f7dcd4aaa3 100644 --- a/app/storyteller_web/src/http_server/middleware/mod.rs +++ b/app/storyteller_web/src/http_server/middleware/mod.rs @@ -1 +1 @@ -pub mod ip_filter_middleware; \ No newline at end of file +//pub mod ip_filter_middleware; // TODO(FIXME): Bad upgrade \ No newline at end of file diff --git a/app/storyteller_web/src/http_server/web_utils/response_error_helpers.rs b/app/storyteller_web/src/http_server/web_utils/response_error_helpers.rs index 2977eb183d..e950731d73 100644 --- a/app/storyteller_web/src/http_server/web_utils/response_error_helpers.rs +++ b/app/storyteller_web/src/http_server/web_utils/response_error_helpers.rs @@ -1,5 +1,5 @@ use actix_http::http::header; -use actix_web::dev::HttpResponseBuilder; +use actix_web::HttpResponseBuilder; use actix_web::http::StatusCode; use actix_web::{HttpResponse, ResponseError}; diff --git a/app/storyteller_web/src/http_server/web_utils/serialize_as_json_error.rs b/app/storyteller_web/src/http_server/web_utils/serialize_as_json_error.rs index 7a36a6d595..d288c9205e 100644 --- a/app/storyteller_web/src/http_server/web_utils/serialize_as_json_error.rs +++ b/app/storyteller_web/src/http_server/web_utils/serialize_as_json_error.rs @@ -1,8 +1,8 @@ use actix_http::http::{StatusCode, header}; use actix_web::HttpResponse; +use actix_web::HttpResponseBuilder; +use actix_web::error::ResponseError; use serde::Serialize; -use actix_http::ResponseError; -use actix_web::dev::HttpResponseBuilder; /// Turn error responses into JSON HTTP responses pub fn serialize_as_json_error( diff --git a/app/storyteller_web/src/main.rs b/app/storyteller_web/src/main.rs index 0636e91fcc..be3ba88a91 100644 --- a/app/storyteller_web/src/main.rs +++ b/app/storyteller_web/src/main.rs @@ -90,7 +90,7 @@ use crate::http_server::endpoints::w2l::get_w2l_template_use_count::get_w2l_temp use crate::http_server::endpoints::w2l::get_w2l_upload_template_job_status::get_w2l_upload_template_job_status_handler; use crate::http_server::endpoints::w2l::list_w2l_templates::list_w2l_templates_handler; use crate::http_server::endpoints::w2l::set_w2l_template_mod_approval::set_w2l_template_mod_approval_handler; -use crate::http_server::middleware::ip_filter_middleware::IpFilter; +//use crate::http_server::middleware::ip_filter_middleware::IpFilter; use crate::http_server::web_utils::cookie_manager::CookieManager; use crate::http_server::web_utils::redis_rate_limiter::RedisRateLimiter; use crate::http_server::web_utils::session_checker::SessionChecker; @@ -325,7 +325,7 @@ pub async fn serve(server_state: ServerState) -> AnyhowResult<()> .wrap(DefaultHeaders::new() .header("X-Backend-Hostname", &hostname) .header("X-Build-Sha", "")) - .wrap(IpFilter::new(ip_banlist)) + //.wrap(IpFilter::new(ip_banlist)) // TODO(FIXME): Bad upgrade // ==================== ACCOUNT CREATION / SESSION MANAGEMENT ==================== .service( web::resource("/create_account") diff --git a/app/storyteller_web/src/util/buckets/bucket_client.rs b/app/storyteller_web/src/util/buckets/bucket_client.rs index a137184d5a..72ff1b2bf1 100644 --- a/app/storyteller_web/src/util/buckets/bucket_client.rs +++ b/app/storyteller_web/src/util/buckets/bucket_client.rs @@ -29,13 +29,21 @@ impl BucketClient { bucket_name: &str, optional_bucket_root: Option<&str>) -> anyhow::Result { - let credentials = Credentials::new( + /*let credentials = Credentials::new( Some(&access_key), Some(&secret_key), None, None, None, - )?; + )?;*/ + + let credentials = Credentials { + access_key: Some(access_key.to_string()), + secret_key: Some(secret_key.to_string()), + security_token: None, + session_token: None, + }; + // NB: The GCS buckets aren't supported by default. let region = Region::Custom { region: region_name.to_owned(), @@ -184,7 +192,9 @@ impl BucketClient { info!("downloading from bucket: {:?}", &object_path_str); - let mut output_file = std::fs::File::create(filesystem_path)?; + //let mut output_file = std::fs::File::create(filesystem_path)?; + //let mut output_file = async_std::fs::File::create(filesystem_path).await?; + let mut output_file = tokio::fs::File::create(filesystem_path).await?; let status_code = self.bucket.get_object_stream(&object_path_str, &mut output_file).await?;