diff --git a/Cargo.lock b/Cargo.lock index ef89cf617a..092541d8dc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -29,7 +29,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7fc95d1bdb8e6666b2b217308eeeb09f2d6728d104be3e31916cc74d15420331" dependencies = [ - "generic-array 0.14.4", + "generic-array", ] [[package]] @@ -64,7 +64,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" dependencies = [ "cipher 0.2.5", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -74,7 +74,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" dependencies = [ "cipher 0.2.5", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -636,25 +636,13 @@ version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" -[[package]] -name = "block-buffer" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" -dependencies = [ - "block-padding", - "byte-tools", - "byteorder", - "generic-array 0.12.4", -] - [[package]] name = "block-buffer" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4" dependencies = [ - "generic-array 0.14.4", + "generic-array", ] [[package]] @@ -663,16 +651,7 @@ version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf7fe51849ea569fd452f37822f606a5cabb684dc918707a0193fd4664ff324" dependencies = [ - "generic-array 0.14.4", -] - -[[package]] -name = "block-padding" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" -dependencies = [ - "byte-tools", + "generic-array", ] [[package]] @@ -756,12 +735,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "byte-tools" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" - [[package]] name = "bytemuck" version = "1.5.1" @@ -863,7 +836,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801" dependencies = [ - "generic-array 0.14.4", + "generic-array", ] [[package]] @@ -872,7 +845,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ee52072ec15386f770805afd189a01c8841be8696bed250fa2f13c4c0d6dfb7" dependencies = [ - "generic-array 0.14.4", + "generic-array", ] [[package]] @@ -986,18 +959,6 @@ dependencies = [ "cc", ] -[[package]] -name = "coarsetime" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2918e2ffa91a49dabbba4965fe38a37a1ba0b6953a29e32cc250a8d59cd42232" -dependencies = [ - "libc", - "once_cell", - "wasi 0.10.0+wasi-snapshot-preview1", - "wasm-bindgen", -] - [[package]] name = "cocoa" version = "0.24.0" @@ -1037,28 +998,20 @@ dependencies = [ "async-trait", "async-tungstenite", "base64 0.13.0", - "clap 3.1.8", "client", "collections", - "comrak", "ctor", "editor", - "either", "env_logger 0.8.3", "envy", "futures", "gpui", - "handlebars", - "http-auth-basic", "json_env_logger", - "jwt-simple", "language", "lazy_static", "lipsum", "log", "lsp", - "oauth2", - "oauth2-surf", "parking_lot", "project", "rand 0.8.3", @@ -1067,7 +1020,7 @@ dependencies = [ "serde", "serde_json", "settings", - "sha-1 0.9.6", + "sha-1", "sqlx", "surf", "theme", @@ -1109,25 +1062,6 @@ dependencies = [ "workspace", ] -[[package]] -name = "comrak" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b423acba50d5016684beaf643f9991e622633a4c858be6885653071c2da2b0c6" -dependencies = [ - "clap 2.33.3", - "entities", - "lazy_static", - "pest", - "pest_derive", - "regex", - "shell-words", - "twoway", - "typed-arena", - "unicode_categories", - "xdg", -] - [[package]] name = "concurrent-queue" version = "1.2.2" @@ -1137,12 +1071,6 @@ dependencies = [ "cache-padded", ] -[[package]] -name = "const-oid" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c32f031ea41b4291d695026c023b95d59db2d8a2c7640800ed56bc8f510f22" - [[package]] name = "const_fn" version = "0.4.8" @@ -1362,25 +1290,13 @@ dependencies = [ "loom", ] -[[package]] -name = "crypto-bigint" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b32a398eb1ccfbe7e4f452bc749c44d38dd732e9a253f19da224c416f00ee7f4" -dependencies = [ - "generic-array 0.14.4", - "rand_core 0.6.2", - "subtle", - "zeroize", -] - [[package]] name = "crypto-common" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "57952ca27b5e3606ff4dd79b0020231aaf9d6aa76dc05fd30137538c50bd3ce8" dependencies = [ - "generic-array 0.14.4", + "generic-array", "typenum", ] @@ -1390,7 +1306,7 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab" dependencies = [ - "generic-array 0.14.4", + "generic-array", "subtle", ] @@ -1400,7 +1316,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4857fd85a0c34b3c3297875b747c1e02e06b6a0ea32dd892d8192b9ce0813ea6" dependencies = [ - "generic-array 0.14.4", + "generic-array", "subtle", ] @@ -1410,16 +1326,10 @@ version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e" dependencies = [ - "generic-array 0.14.4", + "generic-array", "subtle", ] -[[package]] -name = "ct-codecs" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3b7eb4404b8195a9abb6356f4ac07d8ba267045c8d6d220ac4dc992e6cc75df" - [[package]] name = "ctor" version = "0.1.20" @@ -1505,15 +1415,6 @@ dependencies = [ "byteorder", ] -[[package]] -name = "der" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f215f706081a44cb702c71c39a52c05da637822e9c1645a50b7202689e982d" -dependencies = [ - "const-oid", -] - [[package]] name = "dhat" version = "0.3.0" @@ -1549,22 +1450,13 @@ dependencies = [ "workspace", ] -[[package]] -name = "digest" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" -dependencies = [ - "generic-array 0.12.4", -] - [[package]] name = "digest" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" dependencies = [ - "generic-array 0.14.4", + "generic-array", ] [[package]] @@ -1663,27 +1555,6 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1dd4afd79212583ff429b913ad6605242ed7eec277e950b1438f300748f948f4" -[[package]] -name = "ecdsa" -version = "0.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05cb0ed2d2ce37766ac86c05f66973ace8c51f7f1533bedce8fb79e2b54b3f14" -dependencies = [ - "der", - "elliptic-curve", - "hmac 0.11.0", - "signature", -] - -[[package]] -name = "ed25519-compact" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf396058cc7285b342f9a10ed7a377f088942396c46c4c9a7eb4f0782cb1171" -dependencies = [ - "getrandom 0.2.2", -] - [[package]] name = "editor" version = "0.1.0" @@ -1730,22 +1601,6 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" -[[package]] -name = "elliptic-curve" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83e5c176479da93a0983f0a6fdc3c1b8e7d5be0d7fe3fe05a99f15b96582b9a8" -dependencies = [ - "crypto-bigint", - "ff", - "generic-array 0.14.4", - "group", - "pkcs8", - "rand_core 0.6.2", - "subtle", - "zeroize", -] - [[package]] name = "encoding_rs" version = "0.8.28" @@ -1755,12 +1610,6 @@ dependencies = [ "cfg-if 1.0.0", ] -[[package]] -name = "entities" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5320ae4c3782150d900b79807611a59a99fc9a1d61d686faafc24b93fc8d7ca" - [[package]] name = "env_logger" version = "0.7.1" @@ -1836,12 +1685,6 @@ dependencies = [ "pkg-config", ] -[[package]] -name = "fake-simd" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" - [[package]] name = "fastrand" version = "1.7.0" @@ -1867,16 +1710,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "ff" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63eec06c61e487eecf0f7e6e6372e596a81922c28d33e645d6983ca6493a1af0" -dependencies = [ - "rand_core 0.6.2", - "subtle", -] - [[package]] name = "file_finder" version = "0.1.0" @@ -2199,15 +2032,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "generic-array" -version = "0.12.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffdf9f34f1447443d37393cc6c2b8313aebddcd96906caf34e54c68d8e57d7bd" -dependencies = [ - "typenum", -] - [[package]] name = "generic-array" version = "0.14.4" @@ -2236,10 +2060,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ "cfg-if 1.0.0", - "js-sys", "libc", "wasi 0.10.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -2248,7 +2070,7 @@ version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "97304e4cd182c3846f7575ced3890c53012ce534ad9114046b0a9e00bb30a375" dependencies = [ - "opaque-debug 0.3.0", + "opaque-debug", "polyval", ] @@ -2374,31 +2196,6 @@ dependencies = [ "syn", ] -[[package]] -name = "group" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c363a5301b8f153d80747126a04b3c82073b9fe3130571a9d170cacdeaf7912" -dependencies = [ - "ff", - "rand_core 0.6.2", - "subtle", -] - -[[package]] -name = "handlebars" -version = "3.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4498fc115fa7d34de968184e473529abb40eeb6be8bc5f7faba3d08c316cb3e3" -dependencies = [ - "log", - "pest", - "pest_derive", - "quick-error", - "serde", - "serde_json", -] - [[package]] name = "hashbrown" version = "0.9.1" @@ -2493,24 +2290,6 @@ dependencies = [ "digest 0.9.0", ] -[[package]] -name = "hmac-sha256" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdc571e566521512579aab40bf807c5066e1765fb36857f16ed7595c13567c6" -dependencies = [ - "digest 0.9.0", -] - -[[package]] -name = "hmac-sha512" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77e806677ce663d0a199541030c816847b36e8dc095f70dae4a4f4ad63da5383" -dependencies = [ - "digest 0.9.0", -] - [[package]] name = "http" version = "0.2.4" @@ -2786,40 +2565,6 @@ dependencies = [ "serde_json", ] -[[package]] -name = "jwt-simple" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b5630483dc02fd2274f6d1ec91209811f1a3bc442da4d76a31872d6a02cf9e9" -dependencies = [ - "anyhow", - "coarsetime", - "ct-codecs", - "ed25519-compact", - "hmac-sha256", - "hmac-sha512", - "k256", - "p256", - "rand 0.8.3", - "rsa", - "serde", - "serde_json", - "thiserror", - "zeroize", -] - -[[package]] -name = "k256" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3a26a4a8e8b0ab315c687767b543c923c9667a1f2bf42a42818d1453891c7c1" -dependencies = [ - "cfg-if 1.0.0", - "ecdsa", - "elliptic-curve", - "sha2 0.9.5", -] - [[package]] name = "kernel32-sys" version = "0.2.2" @@ -3087,7 +2832,7 @@ checksum = "7b5a279bb9607f9f53c22d496eade00d138d1bdcccd07d74650387cf94942a15" dependencies = [ "block-buffer 0.9.0", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -3343,38 +3088,6 @@ dependencies = [ "libc", ] -[[package]] -name = "oauth2" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e47cfc4c0a1a519d9a025ebfbac3a2439d1b5cdf397d72dcb79b11d9920dab" -dependencies = [ - "base64 0.13.0", - "chrono", - "getrandom 0.2.2", - "http", - "rand 0.8.3", - "serde", - "serde_json", - "serde_path_to_error", - "sha2 0.9.5", - "thiserror", - "url", -] - -[[package]] -name = "oauth2-surf" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8a041fdfcfb6aac56f08d021befc1493bde6e6699fef2364e74f0d9adedd27b" -dependencies = [ - "anyhow", - "http", - "oauth2", - "surf", - "thiserror", -] - [[package]] name = "objc" version = "0.2.7" @@ -3409,12 +3122,6 @@ version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" -[[package]] -name = "opaque-debug" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" - [[package]] name = "opaque-debug" version = "0.3.0" @@ -3475,17 +3182,6 @@ dependencies = [ "workspace", ] -[[package]] -name = "p256" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d053368e1bae4c8a672953397bd1bd7183dde1c72b0b7612a15719173148d186" -dependencies = [ - "ecdsa", - "elliptic-curve", - "sha2 0.9.5", -] - [[package]] name = "parking" version = "2.0.0" @@ -3588,49 +3284,6 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" -[[package]] -name = "pest" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53" -dependencies = [ - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "833d1ae558dc601e9a60366421196a8d94bc0ac980476d0b67e1d0988d72b2d0" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "99b8db626e31e5b81787b9783425769681b347011cc59471e33ea46d2ea0cf55" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "pest_meta" -version = "2.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54be6e404f5317079812fc8f9f5279de376d8856929e21c184ecf6bbd692a11d" -dependencies = [ - "maplit", - "pest", - "sha-1 0.8.2", -] - [[package]] name = "petgraph" version = "0.5.1" @@ -3700,18 +3353,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" -[[package]] -name = "pkcs8" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d156817ae0125e8aa5067710b0db24f0984830614f99875a70aa5e3b74db69" -dependencies = [ - "base64ct", - "der", - "spki", - "zeroize", -] - [[package]] name = "pkg-config" version = "0.3.19" @@ -3770,7 +3411,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd" dependencies = [ "cpuid-bool", - "opaque-debug 0.3.0", + "opaque-debug", "universal-hash", ] @@ -3964,12 +3605,6 @@ dependencies = [ "prost", ] -[[package]] -name = "quick-error" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" - [[package]] name = "quote" version = "1.0.9" @@ -4656,18 +4291,6 @@ dependencies = [ "util", ] -[[package]] -name = "sha-1" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" -dependencies = [ - "block-buffer 0.7.3", - "digest 0.8.1", - "fake-simd", - "opaque-debug 0.2.3", -] - [[package]] name = "sha-1" version = "0.9.6" @@ -4678,7 +4301,7 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.1.4", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -4697,7 +4320,7 @@ dependencies = [ "cfg-if 1.0.0", "cpufeatures 0.1.4", "digest 0.9.0", - "opaque-debug 0.3.0", + "opaque-debug", ] [[package]] @@ -4711,12 +4334,6 @@ dependencies = [ "digest 0.10.3", ] -[[package]] -name = "shell-words" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fa3938c99da4914afedd13bf3d79bcb6c277d1b2c398d23257a304d9e1b074" - [[package]] name = "shlex" version = "1.0.0" @@ -4742,16 +4359,6 @@ dependencies = [ "libc", ] -[[package]] -name = "signature" -version = "1.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c19772be3c4dd2ceaacf03cb41d5885f2a02c4d8804884918e3a258480803335" -dependencies = [ - "digest 0.9.0", - "rand_core 0.6.2", -] - [[package]] name = "similar" version = "1.3.0" @@ -4900,15 +4507,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "spki" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "987637c5ae6b3121aba9d513f869bd2bff11c4cc086c22473befd6649c0bd521" -dependencies = [ - "der", -] - [[package]] name = "sqlformat" version = "0.1.6" @@ -4968,7 +4566,7 @@ dependencies = [ "rustls", "serde", "serde_json", - "sha-1 0.9.6", + "sha-1", "sha2 0.9.5", "smallvec", "sqlformat", @@ -5627,46 +5225,18 @@ dependencies = [ "httparse", "log", "rand 0.8.3", - "sha-1 0.9.6", + "sha-1", "thiserror", "url", "utf-8", ] -[[package]] -name = "twoway" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c57ffb460d7c24cd6eda43694110189030a3d1dfe418416d9468fd1c1d290b47" -dependencies = [ - "memchr", - "unchecked-index", -] - -[[package]] -name = "typed-arena" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b2228007eba4120145f785df0f6c92ea538f5a3635a612ecf4e334c8c1446d" - [[package]] name = "typenum" version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" -[[package]] -name = "ucd-trie" -version = "0.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c" - -[[package]] -name = "unchecked-index" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eeba86d422ce181a719445e51872fa30f1f7413b62becb52e95ec91aa262d85c" - [[package]] name = "unicase" version = "2.6.0" @@ -5760,7 +5330,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8326b2c654932e3e4f9196e69d08fdf7cfd718e1dc6f66b347e6024a0c961402" dependencies = [ - "generic-array 0.14.4", + "generic-array", "subtle", ] @@ -6155,12 +5725,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214" -[[package]] -name = "xdg" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d089681aa106a86fade1b0128fb5daf07d5867a509ab036d99988dec80429a57" - [[package]] name = "xml-rs" version = "0.8.4" diff --git a/crates/collab/.env.template.toml b/crates/collab/.env.template.toml index b5e030fad4..fab50d3021 100644 --- a/crates/collab/.env.template.toml +++ b/crates/collab/.env.template.toml @@ -1,11 +1,2 @@ DATABASE_URL = "postgres://postgres@localhost/zed" -SESSION_SECRET = "6E1GS6IQNOLIBKWMEVWF1AFO4H78KNU8" - HTTP_PORT = 8080 - -# Available at https://github.com/organizations/zed-industries/settings/apps/zed-local-development -GITHUB_APP_ID = 115633 -GITHUB_CLIENT_ID = "Iv1.768076c9becc75c4" -GITHUB_CLIENT_SECRET = "" -GITHUB_PRIVATE_KEY = """\ -""" diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml index 22ba90936c..44b551cd05 100644 --- a/crates/collab/Cargo.toml +++ b/crates/collab/Cargo.toml @@ -22,19 +22,11 @@ async-std = { version = "1.8.0", features = ["attributes"] } async-trait = "0.1.50" async-tungstenite = "0.16" base64 = "0.13" -clap = "3.1" -comrak = "0.10" -either = "1.6" envy = "0.4.2" futures = "0.3" -handlebars = "3.5" -http-auth-basic = "0.1.3" json_env_logger = "0.1" -jwt-simple = "0.10.0" lipsum = { version = "0.8", optional = true } log = { version = "0.4.16", features = ["kv_unstable_serde"] } -oauth2 = { version = "4.0.0", default_features = false } -oauth2-surf = "0.1.1" parking_lot = "0.11.1" rand = "0.8" scrypt = "0.7" diff --git a/crates/collab/src/auth.rs b/crates/collab/src/auth.rs index b6721cee84..0d2bb045d7 100644 --- a/crates/collab/src/auth.rs +++ b/crates/collab/src/auth.rs @@ -2,31 +2,18 @@ use super::{ db::{self, UserId}, errors::TideResultExt, }; -use crate::{github, Request, RequestExt as _}; +use crate::Request; use anyhow::{anyhow, Context}; -use async_trait::async_trait; -pub use oauth2::basic::BasicClient as Client; use rand::thread_rng; use rpc::auth as zed_auth; use scrypt::{ password_hash::{PasswordHash, PasswordHasher, PasswordVerifier, SaltString}, Scrypt, }; -use serde::Serialize; use std::convert::TryFrom; use surf::StatusCode; use tide::Error; -static CURRENT_GITHUB_USER: &'static str = "current_github_user"; - -#[derive(Serialize)] -pub struct User { - pub github_login: String, - pub avatar_url: String, - pub is_insider: bool, - pub is_admin: bool, -} - pub async fn process_auth_header(request: &Request) -> tide::Result { let mut auth_header = request .header("Authorization") @@ -71,28 +58,6 @@ pub async fn process_auth_header(request: &Request) -> tide::Result { Ok(user_id) } -#[async_trait] -pub trait RequestExt { - async fn current_user(&self) -> tide::Result>; -} - -#[async_trait] -impl RequestExt for Request { - async fn current_user(&self) -> tide::Result> { - if let Some(details) = self.session().get::(CURRENT_GITHUB_USER) { - let user = self.db().get_user_by_github_login(&details.login).await?; - Ok(Some(User { - github_login: details.login, - avatar_url: details.avatar_url, - is_insider: user.is_some(), - is_admin: user.map_or(false, |user| user.admin), - })) - } else { - Ok(None) - } - } -} - const MAX_ACCESS_TOKENS_TO_STORE: usize = 8; pub async fn create_access_token(db: &dyn db::Db, user_id: UserId) -> tide::Result { diff --git a/crates/collab/src/github.rs b/crates/collab/src/github.rs deleted file mode 100644 index 047ae24f0f..0000000000 --- a/crates/collab/src/github.rs +++ /dev/null @@ -1,7 +0,0 @@ -use serde::{Deserialize, Serialize}; - -#[derive(Clone, Debug, Deserialize, Serialize)] -pub struct User { - pub login: String, - pub avatar_url: String, -} diff --git a/crates/collab/src/main.rs b/crates/collab/src/main.rs index e4627427c0..d5f7a570ae 100644 --- a/crates/collab/src/main.rs +++ b/crates/collab/src/main.rs @@ -3,7 +3,6 @@ mod auth; mod db; mod env; mod errors; -mod github; mod rpc; use ::rpc::Peer; @@ -84,13 +83,13 @@ pub async fn run_server( rpc: Arc, listener: TcpListener, ) -> tide::Result<()> { + let mut app = tide::with_state(state.clone()); + rpc::add_routes(&mut app, &rpc); + let mut web = tide::with_state(state.clone()); web.with(CompressMiddleware::new()); api::add_routes(&mut web); - let mut app = tide::with_state(state.clone()); - rpc::add_routes(&mut app, &rpc); - app.at("/").nest(web); app.listen(listener).await?;