diff --git a/.gitignore b/.gitignore index a400144b2..2cb02c26c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ vendor.tar.* *.patch orca/example_profiles/small/orca-edited.toml docs/ +kanidm_unix_int/pam_tester/Cargo.lock diff --git a/Cargo.lock b/Cargo.lock index 94d67fd76..fa92e2969 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,7 +62,7 @@ version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", "once_cell", "version_check", ] @@ -87,9 +87,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "08f9b8508dccb7687a1d6c4ce66b2b0ecef467c94667de27d8d7fe1f8d2a9cdc" + +[[package]] +name = "anymap2" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "arrayref" @@ -146,9 +152,9 @@ dependencies = [ [[package]] name = "async-global-executor" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c026b7e44f1316b567ee750fea85103f87fcb80792b860e979f221259796ca0a" +checksum = "c290043c9a95b05d45e952fb6383c67bcb61471f60cfa21e890dba6654234f43" dependencies = [ "async-channel", "async-executor", @@ -268,9 +274,9 @@ dependencies = [ [[package]] name = "async-std" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8056f1455169ab86dd47b47391e4ab0cbd25410a70e9fe675544f49bafaf952" +checksum = "52580991739c5cdb36cde8b2a516371c0a3b70dda36d916cc08b82372916808c" dependencies = [ "async-channel", "async-global-executor", @@ -288,7 +294,7 @@ dependencies = [ "memchr", "num_cpus", "once_cell", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "pin-utils", "slab", "wasm-bindgen-futures", @@ -315,9 +321,9 @@ checksum = "30696a84d817107fc028e049980e09d5e140e8da8f1caeb17e8e950658a3cea9" [[package]] name = "async-trait" -version = "0.1.52" +version = "0.1.53" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "061a7acccaa286c011ddc30970520b98fa40e00c9d644633fb26b5fc63a265e3" +checksum = "ed6aa3524a2dfcf9fe180c51eae2b58738348d819517ceadf95789c51fff7600" dependencies = [ "proc-macro2", "quote", @@ -366,9 +372,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base-x" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4521f3e3d031370679b3b140beb36dfe4801b09ac77e30c61941f97df3ef28b" +checksum = "dc19a4937b4fbd3fe3379793130e42060d10627a360f2127802b10b87e7baf74" [[package]] name = "base32" @@ -577,7 +583,7 @@ dependencies = [ "num-integer", "num-traits", "serde", - "time 0.1.43", + "time 0.1.44", "winapi", ] @@ -603,9 +609,9 @@ dependencies = [ [[package]] name = "compact_jwt" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46791721f86800e2ceab7716756122d36a4963ea2b04b306586c371f68f752ae" +checksum = "c808f92e2decd79e113f0a6214a495e3ec830c77b78e7d5f7a41a28299165cc0" dependencies = [ "base64 0.13.0", "openssl", @@ -613,7 +619,7 @@ dependencies = [ "serde_json", "tracing", "url", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -626,7 +632,7 @@ dependencies = [ "quote", "syn", "thiserror", - "uuid", + "uuid 0.8.2", ] [[package]] @@ -640,7 +646,7 @@ dependencies = [ "crossbeam-epoch", "crossbeam-utils", "lru", - "parking_lot 0.11.2", + "parking_lot", "rand 0.8.5", "smallvec", "tokio", @@ -754,9 +760,9 @@ checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "59a6001667ab124aebae2a495118e11d30984c3a653e99d86d58971708cf5e4b" dependencies = [ "libc", ] @@ -819,9 +825,9 @@ dependencies = [ [[package]] name = "crossbeam-channel" -version = "0.5.3" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdbfe11fe19ff083c48923cf179540e8cd0535903dc35e178a1fdeeb59aef51f" +checksum = "5aaa7bd5fb665c6864b5f963dd9097905c54125909c7aa94c9e18507cdbe6c53" dependencies = [ "cfg-if 1.0.0", "crossbeam-utils", @@ -916,9 +922,9 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.21" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccc0a48a9b826acdf4028595adc9db92caea352f7af011a3034acd172a52a0aa" +checksum = "f877be4f7c9f246b183111634f75baa039715e3f46ce860677d3b19a69fb229c" dependencies = [ "quote", "syn", @@ -949,9 +955,9 @@ dependencies = [ [[package]] name = "darling" -version = "0.12.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f2c43f534ea4b0b049015d00269734195e6d3f0f6635cb692251aca6f9f8b3c" +checksum = "f1a5d2e8b5a94b2261efb20e99a01255b9c5293797d69bbf04600567b2f9b8d7" dependencies = [ "darling_core", "darling_macro", @@ -959,9 +965,9 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.12.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e91455b86830a1c21799d94524df0845183fa55bafd9aa137b01c7d1065fa36" +checksum = "8f1c7d56716be82d9c6adb967cfe700955179ea88806e898483dad6987330a54" dependencies = [ "fnv", "ident_case", @@ -973,9 +979,9 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.12.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29b5acf0dea37a7f66f7b25d2c5e93fd46f8f6968b1a5d7a3e02e97768afc95a" +checksum = "64dd7e5a75a00cb6799ae9fbbfc3bba0134def6579a9e27564e72c839c837bed" dependencies = [ "darling_core", "quote", @@ -994,18 +1000,18 @@ dependencies = [ [[package]] name = "derive_builder" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d13202debe11181040ae9063d739fa32cfcaaebe2275fe387703460ae2365b30" +checksum = "d07adf7be193b71cc36b193d0f5fe60b918a3a9db4dad0449f57bcfd519704a3" dependencies = [ "derive_builder_macro", ] [[package]] name = "derive_builder_core" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66e616858f6187ed828df7c64a6d71720d83767a7f19740b2d1b6fe6327b36e5" +checksum = "1f91d4cfa921f1c05904dc3c57b4a32c38aed3340cce209f3a6fd1478babafc4" dependencies = [ "darling", "proc-macro2", @@ -1015,9 +1021,9 @@ dependencies = [ [[package]] name = "derive_builder_macro" -version = "0.10.2" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58a94ace95092c5acb1e97a7e846b310cfbd499652f72297da7493f618a98d73" +checksum = "8f0314b72bed045f3a68671b3c86328386762c93f82d98c65c3cb5e5f573dd68" dependencies = [ "derive_builder_core", "syn", @@ -1036,12 +1042,11 @@ dependencies = [ [[package]] name = "dialoguer" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61579ada4ec0c6031cfac3f86fdba0d195a7ebeb5e36693bd53cb5999a25beeb" +checksum = "349d6b4fabcd9e97e1df1ae15395ac7e49fb144946a0d453959dc2696273b9da" dependencies = [ "console", - "lazy_static", "tempfile", "zeroize", ] @@ -1105,13 +1110,22 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.30" +version = "0.8.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dc8abb250ffdda33912550faa54c88ec8b998dec0b2c55ab224921ce11df" +checksum = "9852635589dc9f9ea1b6fe9f05b50ef208c85c834a562f0c6abb1c475736ec2b" dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "erased-serde" +version = "0.3.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad132dd8d0d0b546348d7d86cb3191aad14b34e5f979781fc005c80d4ac67ffd" +dependencies = [ + "serde", +] + [[package]] name = "event-listener" version = "2.5.2" @@ -1157,11 +1171,11 @@ dependencies = [ [[package]] name = "femme" -version = "2.1.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2af1a24f391a5a94d756db5092c6576aad494b88a71a5a36b20c67b63e0df034" +checksum = "2997b612abb06bc299486c807e68c5fd12e7618e69cf34c5958ca6b575674403" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "js-sys", "log", "serde", @@ -1179,16 +1193,16 @@ checksum = "93804560e638370a8be6d59ce71ed803e55e230abdbf42598e666b41adda9b1f" dependencies = [ "base64 0.13.0", "byteorder", - "getrandom 0.2.5", + "getrandom 0.2.6", "openssl", "zeroize", ] [[package]] name = "filetime" -version = "0.2.15" +version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975ccf83d8d9d0d84682850a38c8169027be83368805971cc4f238c2b245bc98" +checksum = "c0408e2626025178a6a7f7ffc05a25bc47103229f19c113755de7bf63816290c" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1292,7 +1306,7 @@ dependencies = [ "futures-io", "memchr", "parking", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "waker-fn", ] @@ -1332,7 +1346,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "pin-utils", "slab", ] @@ -1369,14 +1383,14 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" +checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" dependencies = [ "cfg-if 1.0.0", "js-sys", "libc", - "wasi 0.10.2+wasi-snapshot-preview1", + "wasi 0.10.0+wasi-snapshot-preview1", "wasm-bindgen", ] @@ -1408,19 +1422,21 @@ dependencies = [ [[package]] name = "gloo" -version = "0.5.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b30b0425ea2dcc1a0d2cbb9512ee1c4d9a911509cb1f8cb17b612e71411c07" +checksum = "03e691526c3972d1fda35453f6df29925edea014dc75a2dede7661527e9439f0" dependencies = [ "gloo-console", "gloo-dialogs", "gloo-events", "gloo-file", "gloo-history", + "gloo-net", "gloo-render", "gloo-storage", "gloo-timers", "gloo-utils", + "gloo-worker", ] [[package]] @@ -1437,9 +1453,9 @@ dependencies = [ [[package]] name = "gloo-dialogs" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ffb557a2ea2ed283f1334423d303a336fad55fb8572d51ae488f828b1464b40" +checksum = "67062364ac72d27f08445a46cab428188e2e224ec9e37efdba48ae8c289002e6" dependencies = [ "wasm-bindgen", "web-sys", @@ -1447,9 +1463,9 @@ dependencies = [ [[package]] name = "gloo-events" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088514ec8ef284891c762c88a66b639b3a730134714692ee31829765c5bc814f" +checksum = "68b107f8abed8105e4182de63845afcc7b69c098b7852a813ea7462a320992fc" dependencies = [ "wasm-bindgen", "web-sys", @@ -1485,10 +1501,30 @@ dependencies = [ ] [[package]] -name = "gloo-render" -version = "0.1.0" +name = "gloo-net" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b4cda6e149df3bb4a3c6a343873903e5bcc2448a9877d61bb8274806ad67f6e" +checksum = "f6d37f728c2b2b8c568bd2efb34ce9087e347c182db68f101a969b4fe23054d5" +dependencies = [ + "futures-channel", + "futures-core", + "futures-sink", + "gloo-utils", + "js-sys", + "pin-project", + "serde", + "serde_json", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "gloo-render" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2fd9306aef67cfd4449823aadcd14e3958e0800aa2183955a309112a84ec7764" dependencies = [ "wasm-bindgen", "web-sys", @@ -1496,9 +1532,9 @@ dependencies = [ [[package]] name = "gloo-storage" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b5057761927af1b1929d02b1f49cf83553dd347a473ee7c8bb08420f2673ffc" +checksum = "1caa4ba51c99de680dee3ad99c32ca45e9f13311be72079154d222c3f9a6b6f5" dependencies = [ "gloo-utils", "js-sys", @@ -1511,9 +1547,9 @@ dependencies = [ [[package]] name = "gloo-timers" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d12a7f4e95cfe710f1d624fb1210b7d961a5fb05c4fd942f4feab06e61f590e" +checksum = "5fb7d06c1c8cc2a29bee7ec961009a0b2caa0793ee4900c2ffb348734ba1c8f9" dependencies = [ "futures-channel", "futures-core", @@ -1523,9 +1559,9 @@ dependencies = [ [[package]] name = "gloo-utils" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05c77af6f96a4f9e27c8ac23a88407381a31f4a74c3fb985c85aa79b8d898136" +checksum = "5c0bbef55e98d946adbd89f3c65a497cf9adb995a73b99573f30180e8813ab21" dependencies = [ "js-sys", "wasm-bindgen", @@ -1533,10 +1569,27 @@ dependencies = [ ] [[package]] -name = "h2" -version = "0.3.12" +name = "gloo-worker" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62eeb471aa3e3c9197aa4bfeabfe02982f6dc96f750486c0bb0009ac58b26d2b" +checksum = "7c843b9a46d07485026f030be7bd008580a12a2920fea837745a440a3b0c97cb" +dependencies = [ + "anymap2", + "bincode", + "gloo-console", + "gloo-utils", + "js-sys", + "serde", + "slab", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "h2" +version = "0.3.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37a82c6d637fc9515a4694bbf1cb2457b79d81ce52b3108bdeea58b07dd34a57" dependencies = [ "bytes", "fnv", @@ -1562,6 +1615,15 @@ name = "hashbrown" version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +dependencies = [ + "ahash", +] + +[[package]] +name = "hashbrown" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" dependencies = [ "ahash", "serde", @@ -1573,7 +1635,7 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7249a3129cbc1ffccd74857f81464a323a152173cdb134e0fd81bc803b29facf" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -1643,7 +1705,7 @@ checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes", "http", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", ] [[package]] @@ -1672,7 +1734,7 @@ dependencies = [ "cookie 0.14.4", "futures-lite", "infer", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "rand 0.7.3", "serde", "serde_json", @@ -1683,9 +1745,9 @@ dependencies = [ [[package]] name = "httparse" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9100414882e15fb7feccb4897e5f0ff0ff1ca7d1a86a23208ada4d7a18e6c6c4" +checksum = "496ce29bb5a52785b44e0f7ca2847ae0bb839c9bd28f69acac9b99d461c0c04c" [[package]] name = "httpdate" @@ -1695,9 +1757,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "hyper" -version = "0.14.17" +version = "0.14.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "043f0e083e9901b6cc658a77d1eb86f4fc650bbb977a4337dd63192826aa85dd" +checksum = "b26ae0a80afebe130861d90abf98e3814a4f28a4c6ffeb5ab8ebb2be311e0ef2" dependencies = [ "bytes", "futures-channel", @@ -1709,7 +1771,7 @@ dependencies = [ "httparse", "httpdate", "itoa 1.0.1", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "socket2", "tokio", "tower-service", @@ -1772,12 +1834,12 @@ checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3" [[package]] name = "indexmap" -version = "1.8.0" +version = "1.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282a6247722caba404c065016bbfa522806e51714c34f5dfc3e4a3a46fcb4223" +checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" dependencies = [ "autocfg", - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -1797,9 +1859,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35e70ee094dc02fd9c13fdad4940090f22dbd6ac7c9e7094a46cf0232a50bc7c" +checksum = "879d54834c8c76457ef4293a689b2a8c59b076067ad77b15efafbb05f92a592b" [[package]] name = "itertools" @@ -1860,9 +1922,9 @@ checksum = "72167d68f5fce3b8655487b8038691a3c9984ee769590f93f2a631f4ad64e4f5" [[package]] name = "js-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a38fc24e30fd564ce974c02bf1d337caddff65be6cc4735a1f7eab22a7440f04" +checksum = "671a26f820db17c2a2750743f1dd03bafd15b98c9f30c7c2628c024c05d73397" dependencies = [ "wasm-bindgen", ] @@ -1871,7 +1933,6 @@ dependencies = [ name = "kanidm" version = "1.1.0-alpha.7" dependencies = [ - "async-h1", "async-std", "async-trait", "base64 0.13.0", @@ -1885,7 +1946,7 @@ dependencies = [ "filetime", "futures", "futures-util", - "hashbrown", + "hashbrown 0.12.0", "idlset", "jemallocator", "kanidm_proto", @@ -1919,7 +1980,7 @@ dependencies = [ "tracing-subscriber", "url", "users", - "uuid", + "uuid 1.0.0", "validator", "webauthn-authenticator-rs", "webauthn-rs", @@ -1938,7 +1999,7 @@ dependencies = [ "toml", "tracing", "url", - "uuid", + "uuid 1.0.0", "webauthn-rs", ] @@ -1951,7 +2012,7 @@ dependencies = [ "serde_json", "time 0.2.27", "url", - "uuid", + "uuid 1.0.0", "webauthn-rs", ] @@ -2013,7 +2074,7 @@ dependencies = [ name = "kanidmd_web_ui" version = "1.1.0-alpha.7" dependencies = [ - "gloo 0.5.0", + "gloo 0.7.0", "js-sys", "kanidm_proto", "serde", @@ -2054,24 +2115,14 @@ dependencies = [ [[package]] name = "ldap3_proto" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38792e250a5442c1af9a13c3e979796e96b494862d751a4172300b6f668d449c" -dependencies = [ - "bytes", - "lber", - "tokio-util", -] - -[[package]] -name = "ldap3_server" -version = "0.1.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7873d5bd5baabdb77aa2d8a762bf8b1136f9f90cc90f44639b4c0d4486281dcb" +checksum = "62d7f04b6dc4d5401b817596e424ecb4a0931db1418f3987a27e0ab69320665e" dependencies = [ "bytes", "lber", "tokio-util", + "tracing", ] [[package]] @@ -2089,9 +2140,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.120" +version = "0.2.124" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad5c14e80759d0939d013e6ca49930e59fc53dd8e5009132f76240c179380c09" +checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" [[package]] name = "libnss" @@ -2106,9 +2157,9 @@ dependencies = [ [[package]] name = "libsqlite3-sys" -version = "0.23.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cafc7c74096c336d9d27145f7ebd4f4b6f95ba16aa5a282387267e6925cb58" +checksum = "898745e570c7d0453cc1fbc4a701eb6c662ed54e8fec8b7d14be137ebeeb9d14" dependencies = [ "pkg-config", "vcpkg", @@ -2142,30 +2193,32 @@ checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" [[package]] name = "lock_api" -version = "0.4.6" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" +checksum = "327fa5b6a6940e4699ec49a9beae1ea4845c6bab9314e4f84ac68742139d8c53" dependencies = [ + "autocfg", "scopeguard", ] [[package]] name = "log" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" +checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" dependencies = [ "cfg-if 1.0.0", + "serde", "value-bag", ] [[package]] name = "lru" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb87f3080f6d1d69e8c564c0fcfde1d7aa8cc451ce40cae89479111f03bc0eb" +checksum = "32613e41de4c47ab04970c348ca7ae7382cf116625755af070b008a15516a889" dependencies = [ - "hashbrown", + "hashbrown 0.11.2", ] [[package]] @@ -2194,9 +2247,9 @@ checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" [[package]] name = "mathru" -version = "0.11.3" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9140fc31c8956ceffd08f43fc6e4ce7b92d95c33159174872ae5e99b0303cde4" +checksum = "d2bc4eefa78af77a4a4e13c3a030c56804d705d4c93420c16a3f5109e2252c29" dependencies = [ "rand 0.8.5", ] @@ -2230,9 +2283,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mio" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba42135c6a5917b9db9cd7b293e5409e1c6b041e6f9825e92e55a894c63b6f8" +checksum = "52da4364ffb0e4fe33a9841a98a3f3014fb964045ce4f7a45a398243c8d6b0c9" dependencies = [ "libc", "log", @@ -2253,9 +2306,9 @@ dependencies = [ [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "fd7e2f3618557f980e0b17e8856252eee3c97fa12c54dff0ca290fb6266ca4a9" dependencies = [ "lazy_static", "libc", @@ -2381,9 +2434,9 @@ dependencies = [ [[package]] name = "num_threads" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c539a50b93a303167eded6e8dff5220cd39447409fb659f4cd24b1f72fe4f133" +checksum = "aba1801fb138d8e85e11d0fc70baf4fe1cdfffda7c6cd34a854905df588e5ed0" dependencies = [ "libc", ] @@ -2396,7 +2449,7 @@ checksum = "80e47cfc4c0a1a519d9a025ebfbac3a2439d1b5cdf397d72dcb79b11d9920dab" dependencies = [ "base64 0.13.0", "chrono", - "getrandom 0.2.5", + "getrandom 0.2.6", "http", "rand 0.8.5", "serde", @@ -2481,7 +2534,7 @@ dependencies = [ "jemallocator", "kanidm_client", "kanidm_proto", - "ldap3_server", + "ldap3_proto", "mathru", "openssl", "profiles", @@ -2495,7 +2548,7 @@ dependencies = [ "toml", "tracing", "tracing-subscriber", - "uuid", + "uuid 1.0.0", ] [[package]] @@ -2521,17 +2574,7 @@ checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", "lock_api", - "parking_lot_core 0.8.5", -] - -[[package]] -name = "parking_lot" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" -dependencies = [ - "lock_api", - "parking_lot_core 0.9.1", + "parking_lot_core", ] [[package]] @@ -2548,19 +2591,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "parking_lot_core" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28141e0cc4143da2443301914478dc976a61ffdb3f043058310c70df2fed8954" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "redox_syscall", - "smallvec", - "windows-sys", -] - [[package]] name = "paste" version = "0.1.18" @@ -2640,9 +2670,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "e0a7ae3ac2f1173085d398531c705756c94a4c56843785df85a60c1a0afac116" [[package]] name = "pin-utils" @@ -2756,9 +2786,9 @@ checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" [[package]] name = "proc-macro2" -version = "1.0.36" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" +checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" dependencies = [ "unicode-xid", ] @@ -2768,7 +2798,6 @@ name = "profiles" version = "1.1.0" dependencies = [ "base64 0.13.0", - "rustc_version 0.4.0", "serde", "toml", ] @@ -2786,7 +2815,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "292972edad6bbecc137ab84c5e36421a4a6c979ea31d3cc73540dd04315b33e1" dependencies = [ "byteorder", - "hashbrown", + "hashbrown 0.11.2", "idna", "psl-types", ] @@ -2817,9 +2846,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.15" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" +checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" dependencies = [ "proc-macro2", ] @@ -2831,15 +2860,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "545c5bc2b880973c9c10e4067418407a0ccaa3091781d1671d46eb35107cb26f" dependencies = [ "log", - "parking_lot 0.11.2", + "parking_lot", "scheduled-thread-pool", ] [[package]] name = "r2d2_sqlite" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54ca3c9468a76fc2ad724c486a59682fc362efeac7b18d1c012958bc19f34800" +checksum = "6fdc8e4da70586127893be32b7adf21326a4c6b1aba907611edf467d13ffe895" dependencies = [ "r2d2", "rusqlite", @@ -2904,7 +2933,7 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", ] [[package]] @@ -2918,9 +2947,9 @@ dependencies = [ [[package]] name = "rayon" -version = "1.5.1" +version = "1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "fd249e82c21598a9a426a4e00dd7adc1d640b22445ec8545feef801d1a74c221" dependencies = [ "autocfg", "crossbeam-deque", @@ -2930,34 +2959,34 @@ dependencies = [ [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "9f51245e1e62e1f1629cbfec37b5793bbabcaeb90f30e94d2ba03564687353e4" dependencies = [ "crossbeam-channel", "crossbeam-deque", "crossbeam-utils", - "lazy_static", "num_cpus", ] [[package]] name = "redox_syscall" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8380fe0152551244f0747b1bf41737e0f8a74f97a14ccefd1148187271634f3c" +checksum = "62f25bc4c7e55e0b0b7a1d43fb893f4fa1361d0abe38b9ce4f323c2adfe6ef42" dependencies = [ "bitflags", ] [[package]] name = "redox_users" -version = "0.4.0" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" +checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", "redox_syscall", + "thiserror", ] [[package]] @@ -3032,7 +3061,7 @@ dependencies = [ "mime", "native-tls", "percent-encoding", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "proc-macro-hack", "serde", "serde_json", @@ -3060,11 +3089,13 @@ checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746" [[package]] name = "rpassword" -version = "5.0.1" +version = "6.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" +checksum = "2bf099a1888612545b683d2661a1940089f6c2e5a8e38979b2159da876bfd956" dependencies = [ "libc", + "serde", + "serde_json", "winapi", ] @@ -3076,9 +3107,9 @@ checksum = "5d79b4b604167921892e84afbbaad9d5ad74e091bf6c511d9dbfb0593f09fabd" [[package]] name = "rusqlite" -version = "0.26.3" +version = "0.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ba4d3462c8b2e4d7f4fcfcf2b296dc6b65404fbbc7b63daa37fd485c149daf7" +checksum = "85127183a999f7db96d1a976a309eebbfb6ea3b0b400ddd8340190129de6eb7a" dependencies = [ "bitflags", "fallible-iterator", @@ -3104,7 +3135,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.6", + "semver 1.0.7", ] [[package]] @@ -3148,7 +3179,7 @@ version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc6f74fd1204073fa02d5d5d68bec8021be4c38690b61264b2fdb48083d0e7d7" dependencies = [ - "parking_lot 0.11.2", + "parking_lot", ] [[package]] @@ -3192,7 +3223,7 @@ dependencies = [ "tracing", "tracing-subscriber", "url", - "uuid", + "uuid 1.0.0", "webauthn-authenticator-rs", ] @@ -3230,9 +3261,9 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a3381e03edd24287172047536f20cabde766e2cd3e65e6b00fb3af51c4f38d" +checksum = "d65bd28f48be7196d222d95b9243287f48d27aca604e08497513019ff0502cc4" [[package]] name = "semver-parser" @@ -3282,6 +3313,15 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_fmt" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2963a69a2b3918c1dc75a45a18bd3fcd1120e31d3f59deb1b2f9b5d5ffb8baa4" +dependencies = [ + "serde", +] + [[package]] name = "serde_json" version = "1.0.79" @@ -3413,9 +3453,9 @@ dependencies = [ [[package]] name = "slab" -version = "0.4.5" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" @@ -3428,12 +3468,14 @@ dependencies = [ [[package]] name = "smartstring" -version = "0.2.10" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e714dff2b33f2321fdcd475b71cec79781a692d846f37f415fb395a1d2bcd48e" +checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" dependencies = [ + "autocfg", "serde", "static_assertions", + "version_check", ] [[package]] @@ -3571,12 +3613,15 @@ name = "sval" version = "1.0.0-alpha.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "45f6ee7c7b87caf59549e9fe45d6a69c75c8019e79e212a835c5da0e92f0ba08" +dependencies = [ + "serde", +] [[package]] name = "syn" -version = "1.0.89" +version = "1.0.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea297be220d52398dcc07ce15a209fce436d361735ac1db700cab3b6cdfb9f54" +checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" dependencies = [ "proc-macro2", "quote", @@ -3674,7 +3719,7 @@ dependencies = [ "http-types", "kv-log-macro", "log", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "route-recognizer 0.2.0", "serde", "serde_json", @@ -3698,11 +3743,12 @@ dependencies = [ [[package]] name = "time" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", + "wasi 0.10.0+wasi-snapshot-preview1", "winapi", ] @@ -3724,9 +3770,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "004cbc98f30fa233c61a38bc77e96a9106e65c88f2d3bef182ae952027e5753d" +checksum = "c2702e08a7a860f005826c6815dcac101b19b5eb330c27fe4a5928fec1d20ddd" dependencies = [ "libc", "num_threads", @@ -3767,9 +3813,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] @@ -3792,8 +3838,7 @@ dependencies = [ "mio", "num_cpus", "once_cell", - "parking_lot 0.12.0", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "signal-hook-registry", "socket2", "tokio-macros", @@ -3835,23 +3880,23 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "0edfdeb067411dba2044da6d1cb2df793dd35add7888d73c16e3381ded401764" dependencies = [ "bytes", "futures-core", "futures-sink", - "log", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "tokio", + "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" dependencies = [ "serde", ] @@ -3873,21 +3918,21 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "5d0ecdcb44a79f0fe9844f0c4f33a342cbcbb5117de8001e6ba0dc2351327d09" dependencies = [ "cfg-if 1.0.0", - "pin-project-lite 0.2.8", + "pin-project-lite 0.2.9", "tracing-attributes", "tracing-core", ] [[package]] name = "tracing-attributes" -version = "0.1.20" +version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +checksum = "cc6b8ad3567499f98a1db7a752b07a7c8c7c7c34c332ec00effb2b0027974b7c" dependencies = [ "proc-macro2", "quote", @@ -3896,9 +3941,9 @@ dependencies = [ [[package]] name = "tracing-core" -version = "0.1.23" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa31669fa42c09c34d94d8165dd2012e8ff3c66aca50f3bb226b68f216f2706c" +checksum = "f54c8ca710e81886d498c2fd3331b56c93aa248d49de2222ad2742247c60072f" dependencies = [ "lazy_static", "valuable", @@ -3906,9 +3951,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", "log", @@ -3927,9 +3972,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.9" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e0ab7bdc962035a87fba73f3acca9b8a8d0034c2e6f60b84aeaaddddc155dce" +checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" dependencies = [ "ansi_term", "lazy_static", @@ -3957,9 +4002,9 @@ checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987" [[package]] name = "unicode-bidi" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "099b7128301d285f79ddd55b9a83d5e6b9e97c92e0ea0daebee7263e932de992" [[package]] name = "unicode-normalization" @@ -4026,8 +4071,14 @@ name = "uuid" version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5cf98d8186244414c848017f0e2676b3fcb46807f6668a97dfe67359a3c4b7" + +[[package]] +name = "uuid" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8cfcd319456c4d6ea10087ed423473267e1a071f3bc0aa89f80d60997843c6f0" dependencies = [ - "getrandom 0.2.5", + "getrandom 0.2.6", "serde", ] @@ -4088,6 +4139,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "79923f7731dc61ebfba3633098bf3ac533bbd35ccd8c57e7088d9a5eebe0263f" dependencies = [ "ctor", + "erased-serde", + "serde", + "serde_fmt", "sval", "version_check", ] @@ -4139,9 +4193,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" [[package]] name = "wasi" @@ -4151,9 +4205,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25f1af7423d8588a3d840681122e72e6a24ddbcb3f0ec385cac0d12d24256c06" +checksum = "27370197c907c55e3f1a9fbe26f44e937fe6451368324e009cba39e139dc08ad" dependencies = [ "cfg-if 1.0.0", "serde", @@ -4163,9 +4217,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b21c0df030f5a177f3cba22e9bc4322695ec43e7257d865302900290bcdedca" +checksum = "53e04185bfa3a779273da532f5025e33398409573f348985af9a1cbf3774d3f4" dependencies = [ "bumpalo", "lazy_static", @@ -4178,9 +4232,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.29" +version = "0.4.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb6ec270a31b1d3c7e266b999739109abce8b6c87e4b31fcfcd788b65267395" +checksum = "6f741de44b75e14c35df886aff5f1eb73aa114fa5d4d00dcd37b5e01259bf3b2" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -4190,9 +4244,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f4203d69e40a52ee523b2529a773d5ffc1dc0071801c87b3d270b471b80ed01" +checksum = "17cae7ff784d7e83a2fe7611cfe766ecf034111b49deb850a3dc7699c08251f5" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -4200,9 +4254,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa8a30d46208db204854cadbb5d4baf5fcf8071ba5bf48190c3e59937962ebc" +checksum = "99ec0dc7a4756fffc231aab1b9f2f578d23cd391390ab27f952ae0c9b3ece20b" dependencies = [ "proc-macro2", "quote", @@ -4213,15 +4267,15 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.79" +version = "0.2.80" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d958d035c4438e28c70e4321a2911302f10135ce78a9c7834c0cab4123d06a2" +checksum = "d554b7f530dee5964d9a9468d95c1f8b8acae4f282807e7d27d4b03099a46744" [[package]] name = "web-sys" -version = "0.3.56" +version = "0.3.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c060b319f29dd25724f09a2ba1418f142f539b2be99fbf4d2d5a8f7330afb8eb" +checksum = "7b17e741662c70c8bd24ac5c5b18de314a2c26c32bf8346ee1e6f53de919c283" dependencies = [ "js-sys", "wasm-bindgen", @@ -4305,49 +4359,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-sys" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3df6e476185f92a12c072be4a189a0210dcdcf512a1891d6dff9edb874deadc6" -dependencies = [ - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_msvc", -] - -[[package]] -name = "windows_aarch64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8e92753b1c443191654ec532f14c199742964a061be25d77d7a96f09db20bf5" - -[[package]] -name = "windows_i686_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a711c68811799e017b6038e0922cb27a5e2f43a2ddb609fe0b6f3eeda9de615" - -[[package]] -name = "windows_i686_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "146c11bb1a02615db74680b32a68e2d61f553cc24c4eb5b4ca10311740e44172" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c912b12f7454c6620635bbff3450962753834be2a594819bd5e945af18ec64bc" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.32.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504a2476202769977a040c6364301a3f65d0cc9e3fb08600b2bda150a0488316" - [[package]] name = "winreg" version = "0.10.1" @@ -4423,9 +4434,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.5.3" +version = "1.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50344758e2f40e3a1fcfc8f6f91aa57b5f8ebd8d27919fe6451f15aaaf9ee608" +checksum = "7eb5728b8afd3f280a869ce1d4c554ffaed35f45c231fc41bfbd0381bef50317" dependencies = [ "zeroize_derive", ] @@ -4444,15 +4455,16 @@ dependencies = [ [[package]] name = "zxcvbn" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9a82a53b34b5a70581b858e887de69e447cc909f882a470b47ac6d35ca7324c" +checksum = "568becce91e872373a4b33f24ddc67e5280ae2536ccb8c9d22a25d398b72c8b0" dependencies = [ "derive_builder", "fancy-regex", "itertools 0.10.3", + "js-sys", "lazy_static", "quick-error", "regex", - "time 0.3.7", + "time 0.3.9", ] diff --git a/kanidm_client/Cargo.toml b/kanidm_client/Cargo.toml index fa8c0b323..391bedca4 100644 --- a/kanidm_client/Cargo.toml +++ b/kanidm_client/Cargo.toml @@ -11,14 +11,14 @@ homepage = "https://github.com/kanidm/kanidm/" repository = "https://github.com/kanidm/kanidm/" [dependencies] -tracing = "0.1" -reqwest = { version = "0.11", features=["cookies", "json", "native-tls"] } -kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" } -serde = { version = "1", features = ["derive"] } -serde_json = "1.0" -toml = "0.5" -uuid = { version = "0.8", features = ["serde", "v4"] } -url = { version = "2", features = ["serde"] } -webauthn-rs = "0.3" -tokio = { version = "1", features = ["rt", "net", "time", "macros", "sync", "signal"] } +tracing = "^0.1.34" +reqwest = { version = "^0.11.10", features=["cookies", "json", "native-tls"] } +kanidm_proto = { path = "../kanidm_proto" } +serde = { version = "^1.0.136", features = ["derive"] } +serde_json = "^1.0.79" +toml = "^0.5.9" +uuid = { version = "^1.0.0", features = ["serde", "v4"] } +url = { version = "^2.2.2", features = ["serde"] } +webauthn-rs = "^0.3.2" +tokio = { version = "^1.17.0", features = ["rt", "net", "time", "macros", "sync", "signal"] } diff --git a/kanidm_proto/Cargo.toml b/kanidm_proto/Cargo.toml index 7f0e7b797..bf10ab525 100644 --- a/kanidm_proto/Cargo.toml +++ b/kanidm_proto/Cargo.toml @@ -11,15 +11,12 @@ homepage = "https://github.com/kanidm/kanidm/" repository = "https://github.com/kanidm/kanidm/" [dependencies] -serde = { version = "1", features = ["derive"] } -serde_json = "1.0" -uuid = { version = "0.8", features = ["serde", "wasm-bindgen"] } -base32 = "0.4" -webauthn-rs = { version = "0.3", default-features = false, features = ["wasm"] } -time = { version = "0.2", features = ["serde", "std"] } -url = { version = "2", features = ["serde"] } -# zxcvbn = { version = "2.0", features = ["ser"] } - -[dev-dependencies] -serde_json = "1.0" +serde = { version = "^1.0.136", features = ["derive"] } +serde_json = "^1.0.79" +uuid = { version = "^1.0.0", features = ["serde"] } +base32 = "^0.4.0" +webauthn-rs = { version = "^0.3.2", default-features = false, features = ["wasm"] } +# Can not upgrade due to breaking timezone apis. +time = { version = "=0.2.27", features = ["serde", "std"] } +url = { version = "^2.2.2", features = ["serde"] } diff --git a/kanidm_tools/Cargo.toml b/kanidm_tools/Cargo.toml index d555a04a2..d8e7c8cc7 100644 --- a/kanidm_tools/Cargo.toml +++ b/kanidm_tools/Cargo.toml @@ -29,26 +29,26 @@ name = "kanidm_badlist_preprocess" path = "src/badlist_preprocess.rs" [dependencies] -kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha.4" } -kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha.4" } -tracing = "0.1" -tracing-subscriber = { version = "0.3", features = ["env-filter", "fmt"] } -rpassword = "5.0" -structopt = { version = "0.3", default-features = false } -libc = "0.2" -serde = { version = "1", features = ["derive"] } -serde_json = "1.0" -shellexpand = "2.0" -rayon = "1.2" -time = { version = "0.2", features = ["serde", "std"] } -qrcode = { version = "0.12", default-features = false } -compact_jwt = "^0.2.0" +kanidm_client = { path = "../kanidm_client" } +kanidm_proto = { path = "../kanidm_proto" } +tracing = "^0.1.34" +tracing-subscriber = { version = "^0.3.11", features = ["env-filter", "fmt"] } +rpassword = "^6.0.1" +structopt = { version = "^0.3.26", default-features = false } +libc = "^0.2.124" +serde = { version = "^1.0.136", features = ["derive"] } +serde_json = "^1.0.79" +shellexpand = "^2.1.0" +rayon = "^1.5.2" +time = { version = "=0.2.27", features = ["serde", "std"] } +qrcode = { version = "^0.12.0", default-features = false } +compact_jwt = "^0.2.1" -zxcvbn = "2.0" +zxcvbn = "^2.2.1" -dialoguer = "0.9" +dialoguer = "^0.10.0" webauthn-authenticator-rs = "^0.3.0-alpha.12" [build-dependencies] -structopt = { version = "0.3", default-features = false } +structopt = { version = "^0.3.26", default-features = false } diff --git a/kanidm_tools/src/cli/lib.rs b/kanidm_tools/src/cli/lib.rs index fe646ded5..bc993759f 100644 --- a/kanidm_tools/src/cli/lib.rs +++ b/kanidm_tools/src/cli/lib.rs @@ -60,7 +60,7 @@ impl SelfOpt { SelfOpt::SetPassword(copt) => { let client = copt.to_client(); - let password = match rpassword::prompt_password_stderr("Enter new password: ") { + let password = match rpassword::prompt_password("Enter new password: ") { Ok(p) => p, Err(e) => { error!("Error -> {:?}", e); @@ -124,10 +124,10 @@ impl KanidmClientOpt { pub(crate) fn password_prompt(prompt: &str) -> Option { for _ in 0..3 { - let password = rpassword::prompt_password_stderr(prompt).ok()?; + let password = rpassword::prompt_password(prompt).ok()?; let password_confirm = - rpassword::prompt_password_stderr("Retype the new password to confirm: ").ok()?; + rpassword::prompt_password("Retype the new password to confirm: ").ok()?; if password == password_confirm { return Some(password); diff --git a/kanidm_tools/src/cli/session.rs b/kanidm_tools/src/cli/session.rs index 55b384f1c..70e2dbffb 100644 --- a/kanidm_tools/src/cli/session.rs +++ b/kanidm_tools/src/cli/session.rs @@ -143,7 +143,7 @@ impl LoginOpt { } fn do_password(&self, client: &mut KanidmClient) -> Result { - let password = rpassword::prompt_password_stderr("Enter password: ").unwrap_or_else(|e| { + let password = rpassword::prompt_password("Enter password: ").unwrap_or_else(|e| { error!("Failed to create password prompt -- {:?}", e); std::process::exit(1); }); diff --git a/kanidm_tools/src/ssh_authorizedkeys.rs b/kanidm_tools/src/ssh_authorizedkeys.rs index 58f55908f..58d43aa39 100644 --- a/kanidm_tools/src/ssh_authorizedkeys.rs +++ b/kanidm_tools/src/ssh_authorizedkeys.rs @@ -65,7 +65,7 @@ fn main() { let r = if opt.username == "anonymous" { client.auth_anonymous() } else { - let password = rpassword::prompt_password_stderr("Enter password: ").unwrap_or_else(|e| { + let password = rpassword::prompt_password("Enter password: ").unwrap_or_else(|e| { error!("Failed to retrieve password - {:?}", e); std::process::exit(1); }); diff --git a/kanidm_unix_int/Cargo.toml b/kanidm_unix_int/Cargo.toml index 486753205..9d895e1aa 100644 --- a/kanidm_unix_int/Cargo.toml +++ b/kanidm_unix_int/Cargo.toml @@ -43,38 +43,38 @@ name = "kanidm_test_auth" path = "src/test_auth.rs" [dependencies] -kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha" } -kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" } -kanidm = { path = "../kanidmd/idm", version = "1.1.0-alpha" } +kanidm_client = { path = "../kanidm_client" } +kanidm_proto = { path = "../kanidm_proto" } +kanidm = { path = "../kanidmd/idm" } -tracing = "0.1" -tracing-subscriber = "0.3" +tracing = "^0.1.34" +tracing-subscriber = "^0.3.11" -toml = "0.5" -rpassword = "5.0" -tokio = { version = "1", features = ["rt", "macros", "sync", "time", "net", "io-util"] } -tokio-util = { version = "0.6", features = ["codec"] } +toml = "^0.5.9" +rpassword = "^6.0.1" +tokio = { version = "^1.17.0", features = ["rt", "macros", "sync", "time", "net", "io-util"] } +tokio-util = { version = "^0.7.1", features = ["codec"] } -futures = "0.3" -bytes = "1.0" +futures = "^0.3.21" +bytes = "^1.1.0" -libc = "0.2" -serde = { version = "1", features = ["derive"] } -serde_cbor = "0.11" -structopt = { version = "0.3", default-features = false } +libc = "^0.2.124" +serde = { version = "^1.0.136", features = ["derive"] } +serde_cbor = "^0.11.2" +structopt = { version = "0.3.26", default-features = false } -libsqlite3-sys = { version = "0.23" } -rusqlite = { version = "0.26", features = ["backup"] } -r2d2 = "0.8" -r2d2_sqlite = "0.19" +libsqlite3-sys = "0.24.2" +rusqlite = "^0.27.0" +r2d2 = "^0.8.9" +r2d2_sqlite = "^0.20.0" -reqwest = { version = "0.11" } +reqwest = "^0.11.10" -users = "0.11" -async-std = { version = "1.6", features = ["tokio1"] } +users = "^0.11.0" +async-std = { version = "^1.11.0", features = ["tokio1"] } -lru = "0.7" +lru = "^0.7.5" [features] # default = [ "libsqlite3-sys/bundled" ] @@ -84,6 +84,6 @@ lru = "0.7" score = { path = "../kanidmd/score" } [build-dependencies] -structopt = { version = "0.3", default-features = false } +structopt = { version = "^0.3.26", default-features = false } profiles = { path = "../profiles" } diff --git a/kanidm_unix_int/nss_kanidm/Cargo.toml b/kanidm_unix_int/nss_kanidm/Cargo.toml index 06257a7e3..09e34c10a 100644 --- a/kanidm_unix_int/nss_kanidm/Cargo.toml +++ b/kanidm_unix_int/nss_kanidm/Cargo.toml @@ -11,10 +11,9 @@ crate-type = [ "cdylib" ] path = "src/lib.rs" [dependencies] -kanidm_unix_int = { path = "../", version = "1.1.0-alpha" } -libnss = "0.4" -# libnss = { git = "https://github.com/csnewman/libnss-rs.git", rev = "eab2d93d2438652773699b0807d558ce75b1e748" } -libc = "0.2.0" -paste = "1.0" -lazy_static = "1.3" +kanidm_unix_int = { path = "../" } +libnss = "^0.4.0" +libc = "^0.2.124" +paste = "^1.0.7" +lazy_static = "^1.4.0" diff --git a/kanidm_unix_int/pam_kanidm/Cargo.toml b/kanidm_unix_int/pam_kanidm/Cargo.toml index ba0b2a57f..ecac123f4 100644 --- a/kanidm_unix_int/pam_kanidm/Cargo.toml +++ b/kanidm_unix_int/pam_kanidm/Cargo.toml @@ -12,8 +12,8 @@ crate-type = [ "cdylib" ] path = "src/lib.rs" [dependencies] -kanidm_unix_int = { path = "../", version = "1.1.0-alpha" } -libc = "0.2" +kanidm_unix_int = { path = "../" } +libc = "^0.2.124" [build-dependencies] -pkg-config = "0.3.25" +pkg-config = "^0.3.25" diff --git a/kanidm_unix_int/pam_tester/Cargo.toml b/kanidm_unix_int/pam_tester/Cargo.toml index 45b9016d0..b8634f588 100644 --- a/kanidm_unix_int/pam_tester/Cargo.toml +++ b/kanidm_unix_int/pam_tester/Cargo.toml @@ -8,6 +8,4 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -pam = "0.7.0" - -[workspace] +pam = "^0.7.0" diff --git a/kanidm_unix_int/src/test_auth.rs b/kanidm_unix_int/src/test_auth.rs index 3e07e2e94..11733e548 100644 --- a/kanidm_unix_int/src/test_auth.rs +++ b/kanidm_unix_int/src/test_auth.rs @@ -32,7 +32,7 @@ async fn main() { .read_options_from_optional_config("/etc/kanidm/unixd") .expect("Failed to parse /etc/kanidm/unixd"); - let password = rpassword::prompt_password_stderr("Enter unix password: ").unwrap(); + let password = rpassword::prompt_password("Enter unix password: ").unwrap(); let req = ClientRequest::PamAuthenticate(opt.account_id.clone(), password); let sereq = ClientRequest::PamAccountAllowed(opt.account_id); diff --git a/kanidmd/daemon/Cargo.toml b/kanidmd/daemon/Cargo.toml index 0a0d3866c..53c665a16 100644 --- a/kanidmd/daemon/Cargo.toml +++ b/kanidmd/daemon/Cargo.toml @@ -19,11 +19,11 @@ path = "src/main.rs" [dependencies] kanidm = { path = "../idm" } score = { path = "../score" } -structopt = { version = "0.3", default-features = false } -users = "0.11" -serde = { version = "1", features = ["derive"] } -tokio = { version = "1", features = ["full"] } -toml = "0.5" +structopt = { version = "^0.3.26", default-features = false } +users = "^0.11.0" +serde = { version = "^1.0.136", features = ["derive"] } +tokio = { version = "^1.17.0", features = ["rt-multi-thread", "macros", "signal"] } +toml = "0.5.9" [build-dependencies] serde = { version = "1", features = ["derive"] } diff --git a/kanidmd/idm/Cargo.toml b/kanidmd/idm/Cargo.toml index e6805cf5d..ed20bafe4 100644 --- a/kanidmd/idm/Cargo.toml +++ b/kanidmd/idm/Cargo.toml @@ -15,86 +15,83 @@ name = "kanidm" path = "src/lib.rs" [dependencies] -kanidm_proto = { path = "../../kanidm_proto", version = "1.1.0-alpha" } -tracing = { version = "0.1", features = ["attributes"] } -tracing-subscriber = { version = "0.3", features = ["env-filter"] } -tracing-serde = "0.1" +kanidm_proto = { path = "../../kanidm_proto" } +tracing = { version = "^0.1.34", features = ["attributes"] } +tracing-subscriber = { version = "^0.3.11", features = ["env-filter"] } +tracing-serde = "^0.1.3" -jemallocator = { version = "0.3.0", optional = true } -either = "1.6" +jemallocator = { version = "0.3.2", optional = true } +either = "^1.6.1" -url = { version = "2", features = ["serde"] } -tide = "0.16" -async-trait = "0.1" -async-h1 = "2.0" +url = { version = "^2.2.2", features = ["serde"] } +tide = "^0.16.0" +async-trait = "^0.1.53" fernet = { version = "^0.1.4", features = ["fernet_danger_timestamps"] } -compact_jwt = "^0.2.0" +compact_jwt = "^0.2.1" -async-std = { version = "1.6", features = ["tokio1"] } +async-std = { version = "^1.11.0", features = ["tokio1"] } -rand = "0.8" -toml = "0.5" +rand = "^0.8.5" +toml = "^0.5.9" -chrono = "0.4" -saffron = "0.1.0" -regex = "1" -lazy_static = "1.2.0" +chrono = "^0.4.19" +saffron = "^0.1.0" +regex = "^1.5.5" +lazy_static = "^1.4.0" -futures = "0.3" -futures-util = "0.3" -tokio = { version = "1", features = ["full"] } -tokio-util = { version = "0.6", features = ["codec"] } -openssl = "0.10" +futures = "^0.3.21" +futures-util = "^0.3.21" +tokio = { version = "^1.17.0", features = ["net", "sync", "time"] } +tokio-util = { version = "^0.7.1", features = ["codec"] } +openssl = "^0.10.38" -uuid = { version = "0.8", features = ["serde", "v4" ] } +uuid = { version = "^1.0.0", features = ["serde", "v4" ] } compiled-uuid = "0.1.2" -serde = { version = "1", features = ["derive"] } -serde_cbor = "0.11" -serde_json = "1.0" +serde = { version = "^1.0.136", features = ["derive"] } +serde_cbor = "^0.11.2" +serde_json = "^1.0.79" -libsqlite3-sys = { version = "0.23" } -rusqlite = { version = "0.26", features = ["backup"] } -r2d2 = "0.8" -r2d2_sqlite = "0.19" +libsqlite3-sys = "0.24.2" +rusqlite = "^0.27.0" +r2d2 = "^0.8.9" +r2d2_sqlite = "^0.20.0" -time = { version = "0.2", features = ["serde", "std"] } +time = { version = "=0.2.27", features = ["serde", "std"] } -hashbrown = { version = "0.11", features = ["serde", "inline-more", "ahash"] } -concread = "^0.3" -smolset = "1.3" +hashbrown = { version = "0.12.0", features = ["serde", "inline-more", "ahash"] } +concread = "^0.3.1" +smolset = "^1.3.1" sshkeys = "^0.3.1" -zxcvbn = "2.0" -base64 = "0.13" +zxcvbn = "^2.2.1" +base64 = "^0.13.0" -idlset = { version = "^0.2" } +idlset = { version = "^0.2.3" } -# Needs to be ldap3_proto! -ldap3_proto = "0.2.2" +ldap3_proto = "^0.2.3" -webauthn-rs = "0.3" +webauthn-rs = "^0.3.2" -libc = "0.2" -users = "0.11" +libc = "^0.2.124" +users = "^0.11.0" -smartstring = { version = "0.2", features = ["serde"] } +smartstring = { version = "^1.0.1", features = ["serde"] } -validator = { version = "0.14", features = ["phone"] } +validator = { version = "^0.14.0", features = ["phone"] } -touch = "0.0.1" -filetime = "0.2" - -num_enum = "0.5" +touch = "^0.0.1" +filetime = "^0.2.16" +num_enum = "^0.5.7" [features] # default = [ "libsqlite3-sys/bundled", "openssl/vendored" ] [dev-dependencies] -criterion = { version = "0.3", features = ["html_reports"] } +criterion = { version = "^0.3.5", features = ["html_reports"] } # For testing webauthn -webauthn-authenticator-rs = "0.3.0-alpha.12" +webauthn-authenticator-rs = "^0.3.2" [build-dependencies] profiles = { path = "../../profiles" } diff --git a/kanidmd/idm/src/be/idl_sqlite.rs b/kanidmd/idm/src/be/idl_sqlite.rs index 2c9c2bc07..06e67feea 100644 --- a/kanidmd/idm/src/be/idl_sqlite.rs +++ b/kanidmd/idm/src/be/idl_sqlite.rs @@ -273,7 +273,7 @@ pub trait IdlSqliteTransaction { fn uuid2spn(&mut self, uuid: &Uuid) -> Result, OperationError> { spanned!("be::idl_sqlite::uuid2spn", { - let uuids = uuid.to_hyphenated_ref().to_string(); + let uuids = uuid.as_hyphenated().to_string(); // The table exists - lets now get the actual index itself. let mut stmt = self .get_conn() @@ -304,7 +304,7 @@ pub trait IdlSqliteTransaction { fn uuid2rdn(&mut self, uuid: &Uuid) -> Result, OperationError> { spanned!("be::idl_sqlite::uuid2rdn", { - let uuids = uuid.to_hyphenated_ref().to_string(); + let uuids = uuid.as_hyphenated().to_string(); // The table exists - lets now get the actual index itself. let mut stmt = self .get_conn() @@ -777,7 +777,7 @@ impl IdlSqliteWriteTransaction { } pub fn write_name2uuid_add(&self, name: &str, uuid: &Uuid) -> Result<(), OperationError> { - let uuids = uuid.to_hyphenated_ref().to_string(); + let uuids = uuid.as_hyphenated().to_string(); self.conn .prepare("INSERT OR REPLACE INTO idx_name2uuid (name, uuid) VALUES(:name, :uuid)") @@ -810,7 +810,7 @@ impl IdlSqliteWriteTransaction { } pub fn write_uuid2spn(&self, uuid: &Uuid, k: Option<&Value>) -> Result<(), OperationError> { - let uuids = uuid.to_hyphenated_ref().to_string(); + let uuids = uuid.as_hyphenated().to_string(); match k { Some(k) => { let dbv1 = k.to_supplementary_db_valuev1(); @@ -846,7 +846,7 @@ impl IdlSqliteWriteTransaction { } pub fn write_uuid2rdn(&self, uuid: &Uuid, k: Option<&String>) -> Result<(), OperationError> { - let uuids = uuid.to_hyphenated_ref().to_string(); + let uuids = uuid.as_hyphenated().to_string(); match k { Some(k) => self .conn diff --git a/kanidmd/idm/src/entry.rs b/kanidmd/idm/src/entry.rs index b2231bb8a..b2822551f 100644 --- a/kanidmd/idm/src/entry.rs +++ b/kanidmd/idm/src/entry.rs @@ -977,7 +977,7 @@ impl Entry { .get("name") .and_then(|vs| vs.to_proto_string_single().map(|v| format!("name={}", v))) }) - .unwrap_or_else(|| format!("uuid={}", self.get_uuid().to_hyphenated_ref())) + .unwrap_or_else(|| format!("uuid={}", self.get_uuid().as_hyphenated())) } #[inline] diff --git a/kanidmd/idm/src/identity.rs b/kanidmd/idm/src/identity.rs index 5a1c65193..f2b398609 100644 --- a/kanidmd/idm/src/identity.rs +++ b/kanidmd/idm/src/identity.rs @@ -91,7 +91,7 @@ impl std::fmt::Display for Identity { f, "User( {}, {} ) ", nv.to_proto_string_clone(), - u.entry.get_uuid().to_hyphenated_ref() + u.entry.get_uuid().as_hyphenated() ) } } diff --git a/kanidmd/idm/src/idm/group.rs b/kanidmd/idm/src/idm/group.rs index 861ea280d..e430cfc87 100644 --- a/kanidmd/idm/src/idm/group.rs +++ b/kanidmd/idm/src/idm/group.rs @@ -110,7 +110,7 @@ impl Group { pub fn to_proto(&self) -> ProtoGroup { ProtoGroup { name: self.name.clone(), - uuid: self.uuid.to_hyphenated_ref().to_string(), + uuid: self.uuid.as_hyphenated().to_string(), } } } diff --git a/kanidmd/idm/src/idm/radius.rs b/kanidmd/idm/src/idm/radius.rs index 49260d684..3d3ab17f9 100644 --- a/kanidmd/idm/src/idm/radius.rs +++ b/kanidmd/idm/src/idm/radius.rs @@ -112,7 +112,7 @@ impl RadiusAccount { Ok(RadiusAuthToken { name: self.name.clone(), displayname: self.displayname.clone(), - uuid: self.uuid.to_hyphenated_ref().to_string(), + uuid: self.uuid.as_hyphenated().to_string(), secret: self.radius_secret.clone(), groups: self.groups.iter().map(|g| g.to_proto()).collect(), }) diff --git a/kanidmd/idm/src/idm/unix.rs b/kanidmd/idm/src/idm/unix.rs index 7871ed792..41cac7cbb 100644 --- a/kanidmd/idm/src/idm/unix.rs +++ b/kanidmd/idm/src/idm/unix.rs @@ -158,7 +158,7 @@ impl UnixUserAccount { spn: self.spn.clone(), displayname: self.displayname.clone(), gidnumber: self.gidnumber, - uuid: self.uuid.to_hyphenated_ref().to_string(), + uuid: self.uuid.as_hyphenated().to_string(), shell: self.shell.clone(), groups, sshkeys: self.sshkeys.clone(), @@ -439,7 +439,7 @@ impl UnixGroup { Ok(UnixGroupToken { name: self.name.clone(), spn: self.spn.clone(), - uuid: self.uuid.to_hyphenated_ref().to_string(), + uuid: self.uuid.as_hyphenated().to_string(), gidnumber: self.gidnumber, }) } diff --git a/kanidmd/idm/src/server.rs b/kanidmd/idm/src/server.rs index afccaee77..0a823a180 100644 --- a/kanidmd/idm/src/server.rs +++ b/kanidmd/idm/src/server.rs @@ -298,7 +298,7 @@ pub trait QueryServerTransaction<'a> { // If we have a some, pass it on, else unwrap into a default. self.get_be_txn() .uuid2rdn(uuid) - .map(|v| v.unwrap_or_else(|| format!("uuid={}", uuid.to_hyphenated_ref()))) + .map(|v| v.unwrap_or_else(|| format!("uuid={}", uuid.as_hyphenated()))) } // From internal, generate an exists event and dispatch diff --git a/kanidmd/idm/src/utils.rs b/kanidmd/idm/src/utils.rs index a538b4f59..ea12a2f35 100644 --- a/kanidmd/idm/src/utils.rs +++ b/kanidmd/idm/src/utils.rs @@ -41,7 +41,7 @@ fn uuid_from_u64_u32(a: u64, b: u32, sid: Sid) -> Uuid { #[allow(clippy::expect_used)] Builder::from_slice(v.as_slice()) .expect("invalid slice for uuid builder") - .build() + .into_uuid() } pub fn uuid_from_duration(d: Duration, sid: Sid) -> Uuid { @@ -193,13 +193,13 @@ mod tests { let u1 = uuid_from_duration(Duration::from_secs(1), [0xff; 4]); assert_eq!( "00000000-0000-0001-0000-0000ffffffff", - u1.to_hyphenated().to_string() + u1.as_hyphenated().to_string() ); let u2 = uuid_from_duration(Duration::from_secs(1000), [0xff; 4]); assert_eq!( "00000000-0000-03e8-0000-0000ffffffff", - u2.to_hyphenated().to_string() + u2.as_hyphenated().to_string() ); } diff --git a/kanidmd/idm/src/value.rs b/kanidmd/idm/src/value.rs index e44b5d0c5..d344c023c 100644 --- a/kanidmd/idm/src/value.rs +++ b/kanidmd/idm/src/value.rs @@ -677,7 +677,7 @@ impl PartialValue { | PartialValue::Nsuniqueid(s) | PartialValue::EmailAddress(s) | PartialValue::RestrictedString(s) => s.clone(), - PartialValue::Refer(u) | PartialValue::Uuid(u) => u.to_hyphenated_ref().to_string(), + PartialValue::Refer(u) | PartialValue::Uuid(u) => u.as_hyphenated().to_string(), PartialValue::Bool(b) => b.to_string(), PartialValue::Syntax(syn) => syn.to_string(), PartialValue::Index(it) => it.to_string(), @@ -701,12 +701,12 @@ impl PartialValue { } PartialValue::Url(u) => u.to_string(), PartialValue::OauthScope(u) => u.to_string(), - PartialValue::OauthScopeMap(u) => u.to_hyphenated_ref().to_string(), + PartialValue::OauthScopeMap(u) => u.as_hyphenated().to_string(), PartialValue::Address(a) => a.to_string(), PartialValue::PhoneNumber(a) => a.to_string(), - PartialValue::IntentToken(u) => u.to_hyphenated_ref().to_string(), - PartialValue::TrustedDeviceEnrollment(u) => u.to_hyphenated_ref().to_string(), - PartialValue::AuthSession(u) => u.to_hyphenated_ref().to_string(), + PartialValue::IntentToken(u) => u.as_hyphenated().to_string(), + PartialValue::TrustedDeviceEnrollment(u) => u.as_hyphenated().to_string(), + PartialValue::AuthSession(u) => u.as_hyphenated().to_string(), } } @@ -1472,7 +1472,7 @@ impl Value { pub(crate) fn to_proto_string_clone(&self) -> String { match &self { Value::Iname(s) => s.clone(), - Value::Uuid(u) => u.to_hyphenated_ref().to_string(), + Value::Uuid(u) => u.as_hyphenated().to_string(), // We display the tag and fingerprint. Value::SshKey(tag, key) => // Check it's really an sshkey in the diff --git a/kanidmd/idm/src/valueset.rs b/kanidmd/idm/src/valueset.rs index 771436245..ebfac39b7 100644 --- a/kanidmd/idm/src/valueset.rs +++ b/kanidmd/idm/src/valueset.rs @@ -244,7 +244,7 @@ impl TryFrom for ValueSet { impl ValueSet { pub fn uuid_to_proto_string(u: &Uuid) -> String { - u.to_hyphenated_ref().to_string() + u.as_hyphenated().to_string() } pub fn new(value: Value) -> Self { @@ -1060,14 +1060,14 @@ impl ValueSet { I::Iname(set) => set.iter().cloned().collect(), I::Uuid(set) => set .iter() - .map(|u| u.to_hyphenated_ref().to_string()) + .map(|u| u.as_hyphenated().to_string()) .collect(), I::Bool(set) => set.iter().map(|u| u.to_string()).collect(), I::Syntax(set) => set.iter().map(|u| u.to_string()).collect(), I::Index(set) => set.iter().map(|u| u.to_string()).collect(), I::Refer(set) => set .iter() - .map(|u| u.to_hyphenated_ref().to_string()) + .map(|u| u.as_hyphenated().to_string()) .collect(), I::JsonFilt(set) => set .iter() @@ -1102,22 +1102,22 @@ impl ValueSet { I::OauthScope(_set) => vec![], I::OauthScopeMap(map) => map .keys() - .map(|u| u.to_hyphenated_ref().to_string()) + .map(|u| u.as_hyphenated().to_string()) .collect(), I::PrivateBinary(_set) => vec![], I::PublicBinary(map) => map.keys().cloned().collect(), I::RestrictedString(set) => set.iter().cloned().collect(), I::IntentToken(map) => map .keys() - .map(|u| u.to_hyphenated_ref().to_string()) + .map(|u| u.as_hyphenated().to_string()) .collect(), I::TrustedDeviceEnrollment(map) => map .keys() - .map(|u| u.to_hyphenated_ref().to_string()) + .map(|u| u.as_hyphenated().to_string()) .collect(), I::AuthSession(map) => map .keys() - .map(|u| u.to_hyphenated_ref().to_string()) + .map(|u| u.as_hyphenated().to_string()) .collect(), } } diff --git a/kanidmd/score/Cargo.toml b/kanidmd/score/Cargo.toml index 042d25a63..746870fe3 100644 --- a/kanidmd/score/Cargo.toml +++ b/kanidmd/score/Cargo.toml @@ -15,43 +15,42 @@ repository = "https://github.com/kanidm/kanidm/" [dependencies] kanidm = { path = "../idm" } kanidm_proto = { path = "../../kanidm_proto" } -libc = "0.2" +libc = "^0.2.124" -uuid = { version = "0.8", features = ["serde", "v4" ] } +uuid = { version = "^1.0.0", features = ["serde", "v4" ] } -tide = "0.16" +tide = "^0.16.0" tide-openssl = "^0.1.1" -futures-util = "0.3" -tokio = { version = "1", features = ["full"] } -tokio-util = { version = "0.6", features = ["codec"] } -tokio-openssl = "0.6" -openssl = "0.10" -ldap3_proto = "0.2.2" +futures-util = "^0.3.21" +tokio = { version = "^1.17.0", features = ["net", "sync", "io-util"] } +tokio-util = { version = "^0.7.1", features = ["codec"] } +tokio-openssl = "^0.6.3" +openssl = "^0.10.38" +ldap3_proto = "^0.2.3" -tracing = { version = "0.1", features = ["attributes"] } -serde = { version = "1", features = ["derive"] } -async-trait = "0.1" -async-std = { version = "1.6", features = ["tokio1"] } -compact_jwt = "^0.2.0" +tracing = { version = "^0.1.34", features = ["attributes"] } +serde = { version = "^1.0.136", features = ["derive"] } +async-trait = "^0.1.53" +async-std = { version = "^1.11.0", features = ["tokio1"] } +compact_jwt = "^0.2.1" [build-dependencies] profiles = { path = "../../profiles" } [dev-dependencies] -tracing-subscriber = "0.3" +tracing-subscriber = "^0.3.11" # tokio = { version = "1", features = ["rt", "net", "time", "macros", "sync", "signal"] } # kanidm = { path = "../kanidmd" } # score = { path = "../kanidmd/score" } -futures = "0.3" -serde_json = "1.0" +futures = "^0.3.21" +serde_json = "^1.0.79" # async-std = { version = "1.6", features = ["tokio1"] } -webauthn-authenticator-rs = "0.3.0-alpha.12" -oauth2_ext = { package = "oauth2", version = "4.0", default-features = false } -base64 = "0.13" -# compact_jwt = "^0.1.5" +webauthn-authenticator-rs = "^0.3.2" +oauth2_ext = { package = "oauth2", version = "^4.1.0", default-features = false } +base64 = "^0.13.0" kanidm_client = { path = "../../kanidm_client" } -url = { version = "2", features = ["serde"] } -reqwest = { version = "0.11", features=["cookies", "json", "native-tls"] } +url = { version = "^2.2.2", features = ["serde"] } +reqwest = { version = "0.11.10", features=["cookies", "json", "native-tls"] } diff --git a/kanidmd/score/src/https/mod.rs b/kanidmd/score/src/https/mod.rs index 1d5d58a73..48b9eb8fc 100644 --- a/kanidmd/score/src/https/mod.rs +++ b/kanidmd/score/src/https/mod.rs @@ -100,7 +100,7 @@ impl RequestExtensions for tide::Request { fn new_eventid(&self) -> (Uuid, String) { let eventid = kanidm::tracing_tree::operation_id().unwrap(); - let hv = eventid.to_hyphenated().to_string(); + let hv = eventid.as_hyphenated().to_string(); (eventid, hv) } } diff --git a/kanidmd_web_ui/Cargo.toml b/kanidmd_web_ui/Cargo.toml index a14dc6549..2c5b78c3c 100644 --- a/kanidmd_web_ui/Cargo.toml +++ b/kanidmd_web_ui/Cargo.toml @@ -17,23 +17,22 @@ repository = "https://github.com/kanidm/kanidm/" crate-type = ["cdylib", "rlib"] [dependencies] -serde = { version = "1", features = ["derive"] } -serde_json = "1.0" +serde = { version = "^1.0.136", features = ["derive"] } +serde_json = "^1.0.79" -wasm-bindgen = { version = "0.2", features = ["serde-serialize"] } -wasm-bindgen-futures = { version = "0.4" } -kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" } -# anyhow = "1" +wasm-bindgen = { version = "^0.2.80", features = ["serde-serialize"] } +wasm-bindgen-futures = { version = "^0.4.30" } +kanidm_proto = { path = "../kanidm_proto" } -webauthn-rs = { version = "0.3", default-features = false, features = ["wasm"] } +webauthn-rs = { version = "^0.3.2", default-features = false, features = ["wasm"] } -yew-router = "0.16" -yew = "0.19" -gloo = "0.5" -js-sys = "0.3" +yew-router = "^0.16.0" +yew = "^0.19.3" +gloo = "^0.7.0" +js-sys = "^0.3.57" [dependencies.web-sys] -version = "0.3" +version = "^0.3.57" features = [ "AuthenticationExtensionsClientOutputs", "AuthenticatorResponse", diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui.d.ts b/kanidmd_web_ui/pkg/kanidmd_web_ui.d.ts index 232b97ee8..181c1515e 100644 --- a/kanidmd_web_ui/pkg/kanidmd_web_ui.d.ts +++ b/kanidmd_web_ui/pkg/kanidmd_web_ui.d.ts @@ -12,9 +12,9 @@ export interface InitOutput { readonly __wbindgen_malloc: (a: number) => number; readonly __wbindgen_realloc: (a: number, b: number, c: number) => number; readonly __wbindgen_export_2: WebAssembly.Table; - readonly _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h79af8eb94e22cb43: (a: number, b: number, c: number) => void; - readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1c17030d49aa8a7b: (a: number, b: number, c: number) => void; - readonly _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb210817f7291cc2b: (a: number, b: number, c: number) => void; + readonly _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h82f2f6511a22593f: (a: number, b: number, c: number) => void; + readonly _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h62c0974bc69b817a: (a: number, b: number, c: number) => void; + readonly _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd28867f91ff91e2f: (a: number, b: number, c: number) => void; readonly __wbindgen_add_to_stack_pointer: (a: number) => number; readonly __wbindgen_free: (a: number, b: number) => void; readonly __wbindgen_exn_store: (a: number) => void; diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui.js b/kanidmd_web_ui/pkg/kanidmd_web_ui.js index 0e44dab0d..783eb043d 100644 --- a/kanidmd_web_ui/pkg/kanidmd_web_ui.js +++ b/kanidmd_web_ui/pkg/kanidmd_web_ui.js @@ -17,7 +17,7 @@ function getUint8Memory0() { return cachegetUint8Memory0; } -let cachedTextEncoder = new TextEncoder('utf-8'); +const cachedTextEncoder = new TextEncoder('utf-8'); const encodeString = (typeof cachedTextEncoder.encodeInto === 'function' ? function (arg, view) { @@ -80,7 +80,7 @@ function getInt32Memory0() { return cachegetInt32Memory0; } -let cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); +const cachedTextDecoder = new TextDecoder('utf-8', { ignoreBOM: true, fatal: true }); cachedTextDecoder.decode(); @@ -240,7 +240,7 @@ function logError(f, args) { function __wbg_adapter_30(arg0, arg1, arg2) { _assertNum(arg0); _assertNum(arg1); - wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h79af8eb94e22cb43(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h82f2f6511a22593f(arg0, arg1, addHeapObject(arg2)); } function makeMutClosure(arg0, arg1, dtor, f) { @@ -270,7 +270,7 @@ function makeMutClosure(arg0, arg1, dtor, f) { function __wbg_adapter_33(arg0, arg1, arg2) { _assertNum(arg0); _assertNum(arg1); - wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1c17030d49aa8a7b(arg0, arg1, addHeapObject(arg2)); + wasm._dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h62c0974bc69b817a(arg0, arg1, addHeapObject(arg2)); } let stack_pointer = 32; @@ -284,7 +284,7 @@ function __wbg_adapter_36(arg0, arg1, arg2) { try { _assertNum(arg0); _assertNum(arg1); - wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb210817f7291cc2b(arg0, arg1, addBorrowedObject(arg2)); + wasm._dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd28867f91ff91e2f(arg0, arg1, addBorrowedObject(arg2)); } finally { heap[stack_pointer++] = undefined; } @@ -371,59 +371,56 @@ async function init(input) { imports.wbg = {}; imports.wbg.__wbindgen_json_serialize = function(arg0, arg1) { const obj = getObject(arg1); - var ret = JSON.stringify(obj === undefined ? null : obj); - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; + const ret = JSON.stringify(obj === undefined ? null : obj); + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }; imports.wbg.__wbindgen_string_new = function(arg0, arg1) { - var ret = getStringFromWasm0(arg0, arg1); + const ret = getStringFromWasm0(arg0, arg1); return addHeapObject(ret); }; imports.wbg.__wbindgen_string_get = function(arg0, arg1) { const obj = getObject(arg1); - var ret = typeof(obj) === 'string' ? obj : undefined; + const ret = typeof(obj) === 'string' ? obj : undefined; var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); var len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }; imports.wbg.__wbindgen_object_clone_ref = function(arg0) { - var ret = getObject(arg0); + const ret = getObject(arg0); return addHeapObject(ret); }; imports.wbg.__wbindgen_json_parse = function(arg0, arg1) { - var ret = JSON.parse(getStringFromWasm0(arg0, arg1)); + const ret = JSON.parse(getStringFromWasm0(arg0, arg1)); return addHeapObject(ret); }; imports.wbg.__wbindgen_boolean_get = function(arg0) { const v = getObject(arg0); - var ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2; + const ret = typeof(v) === 'boolean' ? (v ? 1 : 0) : 2; _assertNum(ret); return ret; }; imports.wbg.__wbindgen_is_undefined = function(arg0) { - var ret = getObject(arg0) === undefined; + const ret = getObject(arg0) === undefined; _assertBoolean(ret); return ret; }; imports.wbg.__wbindgen_number_new = function(arg0) { - var ret = arg0; + const ret = arg0; return addHeapObject(ret); }; imports.wbg.__wbindgen_number_get = function(arg0, arg1) { const obj = getObject(arg1); - var ret = typeof(obj) === 'number' ? obj : undefined; + const ret = typeof(obj) === 'number' ? obj : undefined; if (!isLikeNone(ret)) { _assertNum(ret); } getFloat64Memory0()[arg0 / 8 + 1] = isLikeNone(ret) ? 0 : ret; getInt32Memory0()[arg0 / 4 + 0] = !isLikeNone(ret); }; - imports.wbg.__wbindgen_object_drop_ref = function(arg0) { - takeObject(arg0); - }; imports.wbg.__wbg_error_09919627ac0992f5 = function() { return logError(function (arg0, arg1) { try { console.error(getStringFromWasm0(arg0, arg1)); @@ -432,23 +429,26 @@ async function init(input) { } }, arguments) }; imports.wbg.__wbg_new_693216e109162396 = function() { return logError(function () { - var ret = new Error(); + const ret = new Error(); return addHeapObject(ret); }, arguments) }; imports.wbg.__wbg_stack_0ddaca5d1abfb52f = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg1).stack; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; + const ret = getObject(arg1).stack; + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }, arguments) }; + imports.wbg.__wbindgen_object_drop_ref = function(arg0) { + takeObject(arg0); + }; imports.wbg.__wbindgen_cb_drop = function(arg0) { const obj = takeObject(arg0).original; if (obj.cnt-- == 1) { obj.a = 0; return true; } - var ret = false; + const ret = false; _assertBoolean(ret); return ret; }; @@ -462,396 +462,396 @@ async function init(input) { wasm.__wbindgen_free(arg0, arg1 * 4); console.warn(...v0); }, arguments) }; - imports.wbg.__wbg_instanceof_Window_434ce1849eb4e0fc = function() { return logError(function (arg0) { - var ret = getObject(arg0) instanceof Window; + imports.wbg.__wbg_instanceof_Window_0e6c0f1096d66c3c = function() { return logError(function (arg0) { + const ret = getObject(arg0) instanceof Window; _assertBoolean(ret); return ret; }, arguments) }; - imports.wbg.__wbg_document_5edd43643d1060d9 = function() { return logError(function (arg0) { - var ret = getObject(arg0).document; + imports.wbg.__wbg_document_99eddbbc11ec831e = function() { return logError(function (arg0) { + const ret = getObject(arg0).document; return isLikeNone(ret) ? 0 : addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_location_11472bb76bf5bbca = function() { return logError(function (arg0) { - var ret = getObject(arg0).location; + imports.wbg.__wbg_location_fa9019d2eb2195e8 = function() { return logError(function (arg0) { + const ret = getObject(arg0).location; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_history_52cfc93c824e772b = function() { return handleError(function (arg0) { - var ret = getObject(arg0).history; + imports.wbg.__wbg_history_dd96d7b18f9170a6 = function() { return handleError(function (arg0) { + const ret = getObject(arg0).history; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_navigator_0e0588c949560476 = function() { return logError(function (arg0) { - var ret = getObject(arg0).navigator; + imports.wbg.__wbg_navigator_1f72d7edb7b4c387 = function() { return logError(function (arg0) { + const ret = getObject(arg0).navigator; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_localStorage_2b7091e6919605e2 = function() { return handleError(function (arg0) { - var ret = getObject(arg0).localStorage; + imports.wbg.__wbg_localStorage_6e9ba4e9a3771427 = function() { return handleError(function (arg0) { + const ret = getObject(arg0).localStorage; return isLikeNone(ret) ? 0 : addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_sessionStorage_fdaffb6b65d0b064 = function() { return handleError(function (arg0) { - var ret = getObject(arg0).sessionStorage; + imports.wbg.__wbg_sessionStorage_ac0b57844426d0d8 = function() { return handleError(function (arg0) { + const ret = getObject(arg0).sessionStorage; return isLikeNone(ret) ? 0 : addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_fetch_427498e0ccea81f4 = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg0).fetch(getObject(arg1)); + imports.wbg.__wbg_fetch_ef7a6623d1fcd3b8 = function() { return logError(function (arg0, arg1) { + const ret = getObject(arg0).fetch(getObject(arg1)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_body_7538539844356c1c = function() { return logError(function (arg0) { - var ret = getObject(arg0).body; + imports.wbg.__wbg_body_2a1ff14b05042a51 = function() { return logError(function (arg0) { + const ret = getObject(arg0).body; return isLikeNone(ret) ? 0 : addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_createElement_d017b8d2af99bab9 = function() { return handleError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).createElement(getStringFromWasm0(arg1, arg2)); + imports.wbg.__wbg_createElement_3c9b5f3aa42457a1 = function() { return handleError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).createElement(getStringFromWasm0(arg1, arg2)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_createElementNS_fd4a7e49f74039e1 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - var ret = getObject(arg0).createElementNS(arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); + imports.wbg.__wbg_createElementNS_a0904ea4c02292f4 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + const ret = getObject(arg0).createElementNS(arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_createTextNode_39a0de25d14bcde5 = function() { return logError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).createTextNode(getStringFromWasm0(arg1, arg2)); + imports.wbg.__wbg_createTextNode_72cf3c22f1eed9ee = function() { return logError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).createTextNode(getStringFromWasm0(arg1, arg2)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_getElementById_b30e88aff96f66a1 = function() { return logError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2)); + imports.wbg.__wbg_getElementById_f83c5de20dc455d6 = function() { return logError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).getElementById(getStringFromWasm0(arg1, arg2)); return isLikeNone(ret) ? 0 : addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_querySelector_cc714d0aa0b868ed = function() { return handleError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).querySelector(getStringFromWasm0(arg1, arg2)); + imports.wbg.__wbg_querySelector_c03126fc82664294 = function() { return handleError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).querySelector(getStringFromWasm0(arg1, arg2)); return isLikeNone(ret) ? 0 : addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_pathname_7affbcff36f35c0e = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg1).pathname; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_new_4473c9af1cac368b = function() { return handleError(function (arg0, arg1) { - var ret = new URL(getStringFromWasm0(arg0, arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_value_d3a30bc2c7caf357 = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg1).value; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_setvalue_6a34bab301f38bf2 = function() { return logError(function (arg0, arg1, arg2) { - getObject(arg0).value = getStringFromWasm0(arg1, arg2); - }, arguments) }; - imports.wbg.__wbg_get_5835a17331a9d8f2 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg0).get(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_add_c1e566b20be6badb = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).add(getStringFromWasm0(arg1, arg2)); - }, arguments) }; - imports.wbg.__wbg_remove_b4d29ca5eb7db54e = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).remove(getStringFromWasm0(arg1, arg2)); - }, arguments) }; - imports.wbg.__wbg_href_cad8f02caf39f2fb = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg1).href; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_headers_1a60dec7fbd28a3b = function() { return logError(function (arg0) { - var ret = getObject(arg0).headers; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_newwithstrandinit_c07f0662ece15bc6 = function() { return handleError(function (arg0, arg1, arg2) { - var ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_instanceof_Event_39e54e1fe6593f4c = function() { return logError(function (arg0) { - var ret = getObject(arg0) instanceof Event; - _assertBoolean(ret); - return ret; - }, arguments) }; - imports.wbg.__wbg_target_e560052e31e4567c = function() { return logError(function (arg0) { - var ret = getObject(arg0).target; - return isLikeNone(ret) ? 0 : addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_cancelBubble_17d7988ab2fbe4c9 = function() { return logError(function (arg0) { - var ret = getObject(arg0).cancelBubble; - _assertBoolean(ret); - return ret; - }, arguments) }; - imports.wbg.__wbg_preventDefault_fa00541ff125b78c = function() { return logError(function (arg0) { - getObject(arg0).preventDefault(); - }, arguments) }; - imports.wbg.__wbg_getClientExtensionResults_37549795564cd9d3 = function() { return logError(function (arg0) { - var ret = getObject(arg0).getClientExtensionResults(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_instanceof_HtmlInputElement_8969541a2a0bded0 = function() { return logError(function (arg0) { - var ret = getObject(arg0) instanceof HTMLInputElement; - _assertBoolean(ret); - return ret; - }, arguments) }; - imports.wbg.__wbg_setchecked_f6ead3490df88a7f = function() { return logError(function (arg0, arg1) { - getObject(arg0).checked = arg1 !== 0; - }, arguments) }; - imports.wbg.__wbg_value_fc1c354d1a0e9714 = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg1).value; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_setvalue_ce4a23f487065c07 = function() { return logError(function (arg0, arg1, arg2) { - getObject(arg0).value = getStringFromWasm0(arg1, arg2); - }, arguments) }; - imports.wbg.__wbg_addEventListener_55682f77717d7665 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), getObject(arg4)); - }, arguments) }; - imports.wbg.__wbg_removeEventListener_9cd36e5806463d5d = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).removeEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), arg4 !== 0); - }, arguments) }; - imports.wbg.__wbg_instanceof_HtmlDocument_395ec6365cabde6c = function() { return logError(function (arg0) { - var ret = getObject(arg0) instanceof HTMLDocument; - _assertBoolean(ret); - return ret; - }, arguments) }; - imports.wbg.__wbg_cookie_66f4449cc764fcb2 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg1).cookie; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_instanceof_Element_c9423704dd5d9b1d = function() { return logError(function (arg0) { - var ret = getObject(arg0) instanceof Element; - _assertBoolean(ret); - return ret; - }, arguments) }; - imports.wbg.__wbg_namespaceURI_e9a971e6c1ce68db = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg1).namespaceURI; - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_classList_5086913f676eb3f3 = function() { return logError(function (arg0) { - var ret = getObject(arg0).classList; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_removeAttribute_1adaecf6b4d35a09 = function() { return handleError(function (arg0, arg1, arg2) { - getObject(arg0).removeAttribute(getStringFromWasm0(arg1, arg2)); - }, arguments) }; - imports.wbg.__wbg_setAttribute_1776fcc9b98d464e = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - }, arguments) }; - imports.wbg.__wbg_instanceof_HtmlElement_d3e8f1c1d6788b24 = function() { return logError(function (arg0) { - var ret = getObject(arg0) instanceof HTMLElement; - _assertBoolean(ret); - return ret; - }, arguments) }; - imports.wbg.__wbg_focus_4434360545ac99cf = function() { return handleError(function (arg0) { - getObject(arg0).focus(); - }, arguments) }; - imports.wbg.__wbg_credentials_403bf2de10e8f1c3 = function() { return logError(function (arg0) { - var ret = getObject(arg0).credentials; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_pushState_89ce908020e1d6aa = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) { + imports.wbg.__wbg_pushState_b0c96c33f80b8f64 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4, arg5) { getObject(arg0).pushState(getObject(arg1), getStringFromWasm0(arg2, arg3), arg4 === 0 ? undefined : getStringFromWasm0(arg4, arg5)); }, arguments) }; - imports.wbg.__wbg_pathname_d0014089875ea691 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg1).pathname; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; + imports.wbg.__wbg_pathname_805641640383ca79 = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg1).pathname; + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }, arguments) }; - imports.wbg.__wbg_search_7e1c9ba7f3985c36 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg1).search; - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; + imports.wbg.__wbg_search_083c5449552cf16e = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg1).search; + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }, arguments) }; - imports.wbg.__wbg_replace_ec236a3e3182c4da = function() { return handleError(function (arg0, arg1, arg2) { + imports.wbg.__wbg_replace_345170f940d047af = function() { return handleError(function (arg0, arg1, arg2) { getObject(arg0).replace(getStringFromWasm0(arg1, arg2)); }, arguments) }; - imports.wbg.__wbg_parentElement_96e1e07348340043 = function() { return logError(function (arg0) { - var ret = getObject(arg0).parentElement; - return isLikeNone(ret) ? 0 : addHeapObject(ret); + imports.wbg.__wbg_instanceof_Response_ccfeb62399355bcd = function() { return logError(function (arg0) { + const ret = getObject(arg0) instanceof Response; + _assertBoolean(ret); + return ret; }, arguments) }; - imports.wbg.__wbg_lastChild_e2b014abab089e08 = function() { return logError(function (arg0) { - var ret = getObject(arg0).lastChild; - return isLikeNone(ret) ? 0 : addHeapObject(ret); + imports.wbg.__wbg_status_600fd8b881393898 = function() { return logError(function (arg0) { + const ret = getObject(arg0).status; + _assertNum(ret); + return ret; }, arguments) }; - imports.wbg.__wbg_setnodeValue_f175b74a390f8fda = function() { return logError(function (arg0, arg1, arg2) { - getObject(arg0).nodeValue = arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2); - }, arguments) }; - imports.wbg.__wbg_appendChild_3fe5090c665d3bb4 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg0).appendChild(getObject(arg1)); + imports.wbg.__wbg_headers_9e7f2c05a9b962ea = function() { return logError(function (arg0) { + const ret = getObject(arg0).headers; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_insertBefore_4f09909023feac91 = function() { return handleError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).insertBefore(getObject(arg1), getObject(arg2)); + imports.wbg.__wbg_json_df9259ba758ea2fe = function() { return handleError(function (arg0) { + const ret = getObject(arg0).json(); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_removeChild_f4a83c9698136bbb = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg0).removeChild(getObject(arg1)); + imports.wbg.__wbg_text_2612fbe0b9d32220 = function() { return handleError(function (arg0) { + const ret = getObject(arg0).text(); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_get_bee69a0c35eec41c = function() { return handleError(function (arg0, arg1, arg2, arg3) { - var ret = getObject(arg1).get(getStringFromWasm0(arg2, arg3)); + imports.wbg.__wbg_getItem_eb6e17b18b890a47 = function() { return handleError(function (arg0, arg1, arg2, arg3) { + const ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3)); var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); var len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }, arguments) }; - imports.wbg.__wbg_set_f9448486a94c9aef = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { - getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); - }, arguments) }; - imports.wbg.__wbg_getItem_f92ef607397e96b1 = function() { return handleError(function (arg0, arg1, arg2, arg3) { - var ret = getObject(arg1).getItem(getStringFromWasm0(arg2, arg3)); - var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; - getInt32Memory0()[arg0 / 4 + 1] = len0; - getInt32Memory0()[arg0 / 4 + 0] = ptr0; - }, arguments) }; - imports.wbg.__wbg_removeItem_ccc2014f87a14e1b = function() { return handleError(function (arg0, arg1, arg2) { + imports.wbg.__wbg_removeItem_be0233b7e0822d46 = function() { return handleError(function (arg0, arg1, arg2) { getObject(arg0).removeItem(getStringFromWasm0(arg1, arg2)); }, arguments) }; - imports.wbg.__wbg_setItem_279b13e5ad0b82cb = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + imports.wbg.__wbg_setItem_ed2ea572329ab721 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { getObject(arg0).setItem(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); }, arguments) }; - imports.wbg.__wbg_instanceof_Response_ea36d565358a42f7 = function() { return logError(function (arg0) { - var ret = getObject(arg0) instanceof Response; + imports.wbg.__wbg_get_85a5f49f8e22030b = function() { return handleError(function (arg0, arg1, arg2, arg3) { + const ret = getObject(arg1).get(getStringFromWasm0(arg2, arg3)); + var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }, arguments) }; + imports.wbg.__wbg_set_6884dcc6cdd65022 = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).set(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); + }, arguments) }; + imports.wbg.__wbg_headers_0a71906114661592 = function() { return logError(function (arg0) { + const ret = getObject(arg0).headers; + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_newwithstrandinit_fd99688f189f053e = function() { return handleError(function (arg0, arg1, arg2) { + const ret = new Request(getStringFromWasm0(arg0, arg1), getObject(arg2)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_pathname_704bbbf916a0727d = function() { return logError(function (arg0, arg1) { + const ret = getObject(arg1).pathname; + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }, arguments) }; + imports.wbg.__wbg_new_25e89e4c66f17ba3 = function() { return handleError(function (arg0, arg1) { + const ret = new URL(getStringFromWasm0(arg0, arg1)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_get_63177ea11cf74f5a = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).get(getObject(arg1)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_add_0e4449143d6e7625 = function() { return handleError(function (arg0, arg1, arg2) { + getObject(arg0).add(getStringFromWasm0(arg1, arg2)); + }, arguments) }; + imports.wbg.__wbg_remove_90cd0eb3c01b4900 = function() { return handleError(function (arg0, arg1, arg2) { + getObject(arg0).remove(getStringFromWasm0(arg1, arg2)); + }, arguments) }; + imports.wbg.__wbg_href_fbf5127aa00a8b86 = function() { return logError(function (arg0, arg1) { + const ret = getObject(arg1).href; + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }, arguments) }; + imports.wbg.__wbg_value_f232184bd0e27b00 = function() { return logError(function (arg0, arg1) { + const ret = getObject(arg1).value; + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }, arguments) }; + imports.wbg.__wbg_setvalue_8efcd1f77232ee9b = function() { return logError(function (arg0, arg1, arg2) { + getObject(arg0).value = getStringFromWasm0(arg1, arg2); + }, arguments) }; + imports.wbg.__wbg_instanceof_Element_4fafc1ceb4cdee77 = function() { return logError(function (arg0) { + const ret = getObject(arg0) instanceof Element; _assertBoolean(ret); return ret; }, arguments) }; - imports.wbg.__wbg_status_3a55bb50e744b834 = function() { return logError(function (arg0) { - var ret = getObject(arg0).status; - _assertNum(ret); - return ret; + imports.wbg.__wbg_namespaceURI_3bb5841c365214c8 = function() { return logError(function (arg0, arg1) { + const ret = getObject(arg1).namespaceURI; + var ptr0 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + var len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; }, arguments) }; - imports.wbg.__wbg_headers_e4204c6775f7b3b4 = function() { return logError(function (arg0) { - var ret = getObject(arg0).headers; + imports.wbg.__wbg_classList_557a7b717387d03d = function() { return logError(function (arg0) { + const ret = getObject(arg0).classList; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_json_4ab99130d1a5b3a9 = function() { return handleError(function (arg0) { - var ret = getObject(arg0).json(); - return addHeapObject(ret); + imports.wbg.__wbg_removeAttribute_8a8f459a4b627ec4 = function() { return handleError(function (arg0, arg1, arg2) { + getObject(arg0).removeAttribute(getStringFromWasm0(arg1, arg2)); }, arguments) }; - imports.wbg.__wbg_text_aeba5a5bbfef7f15 = function() { return handleError(function (arg0) { - var ret = getObject(arg0).text(); - return addHeapObject(ret); + imports.wbg.__wbg_setAttribute_8d90e00d652037be = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).setAttribute(getStringFromWasm0(arg1, arg2), getStringFromWasm0(arg3, arg4)); }, arguments) }; - imports.wbg.__wbg_new_16f24b0728c5e67b = function() { return logError(function () { - var ret = new Array(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_push_a72df856079e6930 = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg0).push(getObject(arg1)); - _assertNum(ret); - return ret; - }, arguments) }; - imports.wbg.__wbg_instanceof_Error_4287ce7d75f0e3a2 = function() { return logError(function (arg0) { - var ret = getObject(arg0) instanceof Error; + imports.wbg.__wbg_instanceof_HtmlElement_806c643943ab20c1 = function() { return logError(function (arg0) { + const ret = getObject(arg0) instanceof HTMLElement; _assertBoolean(ret); return ret; }, arguments) }; - imports.wbg.__wbg_message_1dfe93b595be8811 = function() { return logError(function (arg0) { - var ret = getObject(arg0).message; - return addHeapObject(ret); + imports.wbg.__wbg_focus_42ad8e77a7a0b22a = function() { return handleError(function (arg0) { + getObject(arg0).focus(); }, arguments) }; - imports.wbg.__wbg_name_66305ab387468967 = function() { return logError(function (arg0) { - var ret = getObject(arg0).name; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_toString_3e854a6a919f2996 = function() { return logError(function (arg0) { - var ret = getObject(arg0).toString(); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_newnoargs_f579424187aa1717 = function() { return logError(function (arg0, arg1) { - var ret = new Function(getStringFromWasm0(arg0, arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_call_89558c3e96703ca1 = function() { return handleError(function (arg0, arg1) { - var ret = getObject(arg0).call(getObject(arg1)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_valueOf_39e0d6bc7e4232b9 = function() { return logError(function (arg0) { - var ret = getObject(arg0).valueOf(); - return ret; - }, arguments) }; - imports.wbg.__wbg_is_3d73f4d91adacc37 = function() { return logError(function (arg0, arg1) { - var ret = Object.is(getObject(arg0), getObject(arg1)); + imports.wbg.__wbg_instanceof_Event_2311550b7d159b6e = function() { return logError(function (arg0) { + const ret = getObject(arg0) instanceof Event; _assertBoolean(ret); return ret; }, arguments) }; - imports.wbg.__wbg_new_d3138911a89329b0 = function() { return logError(function () { - var ret = new Object(); + imports.wbg.__wbg_target_46fd3a29f64b0e43 = function() { return logError(function (arg0) { + const ret = getObject(arg0).target; + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_cancelBubble_7446704fccad1780 = function() { return logError(function (arg0) { + const ret = getObject(arg0).cancelBubble; + _assertBoolean(ret); + return ret; + }, arguments) }; + imports.wbg.__wbg_preventDefault_747982fd5fe3b6d0 = function() { return logError(function (arg0) { + getObject(arg0).preventDefault(); + }, arguments) }; + imports.wbg.__wbg_instanceof_HtmlInputElement_750fccab172eab35 = function() { return logError(function (arg0) { + const ret = getObject(arg0) instanceof HTMLInputElement; + _assertBoolean(ret); + return ret; + }, arguments) }; + imports.wbg.__wbg_setchecked_e37cbc4fab363e71 = function() { return logError(function (arg0, arg1) { + getObject(arg0).checked = arg1 !== 0; + }, arguments) }; + imports.wbg.__wbg_value_14b43f7df5bd6160 = function() { return logError(function (arg0, arg1) { + const ret = getObject(arg1).value; + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }, arguments) }; + imports.wbg.__wbg_setvalue_649eb7de76d4a493 = function() { return logError(function (arg0, arg1, arg2) { + getObject(arg0).value = getStringFromWasm0(arg1, arg2); + }, arguments) }; + imports.wbg.__wbg_getClientExtensionResults_8400549e426a9259 = function() { return logError(function (arg0) { + const ret = getObject(arg0).getClientExtensionResults(); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_resolve_4f8f547f26b30b27 = function() { return logError(function (arg0) { - var ret = Promise.resolve(getObject(arg0)); + imports.wbg.__wbg_addEventListener_be0c061a1359c1dd = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).addEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), getObject(arg4)); + }, arguments) }; + imports.wbg.__wbg_removeEventListener_3e7319b5d7c8be8f = function() { return handleError(function (arg0, arg1, arg2, arg3, arg4) { + getObject(arg0).removeEventListener(getStringFromWasm0(arg1, arg2), getObject(arg3), arg4 !== 0); + }, arguments) }; + imports.wbg.__wbg_credentials_f81f9e33f9789a54 = function() { return logError(function (arg0) { + const ret = getObject(arg0).credentials; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_then_a6860c82b90816ca = function() { return logError(function (arg0, arg1) { - var ret = getObject(arg0).then(getObject(arg1)); + imports.wbg.__wbg_instanceof_HtmlDocument_a4a9eb971e2c2b02 = function() { return logError(function (arg0) { + const ret = getObject(arg0) instanceof HTMLDocument; + _assertBoolean(ret); + return ret; + }, arguments) }; + imports.wbg.__wbg_cookie_4b5805da6b19c329 = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg1).cookie; + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; + getInt32Memory0()[arg0 / 4 + 1] = len0; + getInt32Memory0()[arg0 / 4 + 0] = ptr0; + }, arguments) }; + imports.wbg.__wbg_parentElement_d078cf0bd5c4b641 = function() { return logError(function (arg0) { + const ret = getObject(arg0).parentElement; + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_lastChild_84687239bfef7d2f = function() { return logError(function (arg0) { + const ret = getObject(arg0).lastChild; + return isLikeNone(ret) ? 0 : addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_setnodeValue_77a78d32cf9e9152 = function() { return logError(function (arg0, arg1, arg2) { + getObject(arg0).nodeValue = arg1 === 0 ? undefined : getStringFromWasm0(arg1, arg2); + }, arguments) }; + imports.wbg.__wbg_appendChild_a86c0da8d152eae4 = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).appendChild(getObject(arg1)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_then_58a04e42527f52c6 = function() { return logError(function (arg0, arg1, arg2) { - var ret = getObject(arg0).then(getObject(arg1), getObject(arg2)); + imports.wbg.__wbg_insertBefore_4df558a2aa0435c1 = function() { return handleError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).insertBefore(getObject(arg1), getObject(arg2)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_globalThis_d61b1f48a57191ae = function() { return handleError(function () { - var ret = globalThis.globalThis; + imports.wbg.__wbg_removeChild_b4ce6c8d6e5d47be = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).removeChild(getObject(arg1)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_self_e23d74ae45fb17d1 = function() { return handleError(function () { - var ret = self.self; + imports.wbg.__wbg_new_94fb1279cf6afea5 = function() { return logError(function () { + const ret = new Array(); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_window_b4be7f48b24ac56e = function() { return handleError(function () { - var ret = window.window; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_global_e7669da72fd7f239 = function() { return handleError(function () { - var ret = global.global; - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_new_e3b800e570795b3c = function() { return logError(function (arg0) { - var ret = new Uint8Array(getObject(arg0)); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_newwithbyteoffsetandlength_278ec7532799393a = function() { return logError(function (arg0, arg1, arg2) { - var ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0); - return addHeapObject(ret); - }, arguments) }; - imports.wbg.__wbg_length_30803400a8f15c59 = function() { return logError(function (arg0) { - var ret = getObject(arg0).length; + imports.wbg.__wbg_push_40c6a90f1805aa90 = function() { return logError(function (arg0, arg1) { + const ret = getObject(arg0).push(getObject(arg1)); _assertNum(ret); return ret; }, arguments) }; - imports.wbg.__wbg_set_5b8081e9d002f0df = function() { return logError(function (arg0, arg1, arg2) { + imports.wbg.__wbg_instanceof_Error_b074c76f6096db9b = function() { return logError(function (arg0) { + const ret = getObject(arg0) instanceof Error; + _assertBoolean(ret); + return ret; + }, arguments) }; + imports.wbg.__wbg_message_dcca38fbff239fbf = function() { return logError(function (arg0) { + const ret = getObject(arg0).message; + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_name_642dd84602f48d65 = function() { return logError(function (arg0) { + const ret = getObject(arg0).name; + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_toString_eec28c54c24b830b = function() { return logError(function (arg0) { + const ret = getObject(arg0).toString(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_newnoargs_e23b458e372830de = function() { return logError(function (arg0, arg1) { + const ret = new Function(getStringFromWasm0(arg0, arg1)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_call_ae78342adc33730a = function() { return handleError(function (arg0, arg1) { + const ret = getObject(arg0).call(getObject(arg1)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_valueOf_a08afc4df5d92043 = function() { return logError(function (arg0) { + const ret = getObject(arg0).valueOf(); + return ret; + }, arguments) }; + imports.wbg.__wbg_is_40969b082b54c84d = function() { return logError(function (arg0, arg1) { + const ret = Object.is(getObject(arg0), getObject(arg1)); + _assertBoolean(ret); + return ret; + }, arguments) }; + imports.wbg.__wbg_new_36359baae5a47e27 = function() { return logError(function () { + const ret = new Object(); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_resolve_a9a87bdd64e9e62c = function() { return logError(function (arg0) { + const ret = Promise.resolve(getObject(arg0)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_then_ce526c837d07b68f = function() { return logError(function (arg0, arg1) { + const ret = getObject(arg0).then(getObject(arg1)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_then_842e65b843962f56 = function() { return logError(function (arg0, arg1, arg2) { + const ret = getObject(arg0).then(getObject(arg1), getObject(arg2)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_globalThis_8e275ef40caea3a3 = function() { return handleError(function () { + const ret = globalThis.globalThis; + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_self_99737b4dcdf6f0d8 = function() { return handleError(function () { + const ret = self.self; + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_window_9b61fbbf3564c4fb = function() { return handleError(function () { + const ret = window.window; + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_global_5de1e0f82bddcd27 = function() { return handleError(function () { + const ret = global.global; + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_new_cc9018bd6f283b6f = function() { return logError(function (arg0) { + const ret = new Uint8Array(getObject(arg0)); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_newwithbyteoffsetandlength_ce1e75f0ce5f7974 = function() { return logError(function (arg0, arg1, arg2) { + const ret = new Uint8Array(getObject(arg0), arg1 >>> 0, arg2 >>> 0); + return addHeapObject(ret); + }, arguments) }; + imports.wbg.__wbg_length_0acb1cf9bbaf8519 = function() { return logError(function (arg0) { + const ret = getObject(arg0).length; + _assertNum(ret); + return ret; + }, arguments) }; + imports.wbg.__wbg_set_f25e869e4565d2a2 = function() { return logError(function (arg0, arg1, arg2) { getObject(arg0).set(getObject(arg1), arg2 >>> 0); }, arguments) }; - imports.wbg.__wbg_buffer_5e74a88a1424a2e0 = function() { return logError(function (arg0) { - var ret = getObject(arg0).buffer; + imports.wbg.__wbg_buffer_7af23f65f6c64548 = function() { return logError(function (arg0) { + const ret = getObject(arg0).buffer; return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_get_8bbb82393651dd9c = function() { return handleError(function (arg0, arg1) { - var ret = Reflect.get(getObject(arg0), getObject(arg1)); + imports.wbg.__wbg_get_a9cab131e3152c49 = function() { return handleError(function (arg0, arg1) { + const ret = Reflect.get(getObject(arg0), getObject(arg1)); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbg_set_c42875065132a932 = function() { return handleError(function (arg0, arg1, arg2) { - var ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2)); + imports.wbg.__wbg_set_93b1c87ee2af852e = function() { return handleError(function (arg0, arg1, arg2) { + const ret = Reflect.set(getObject(arg0), getObject(arg1), getObject(arg2)); _assertBoolean(ret); return ret; }, arguments) }; imports.wbg.__wbindgen_debug_string = function(arg0, arg1) { - var ret = debugString(getObject(arg1)); - var ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); - var len0 = WASM_VECTOR_LEN; + const ret = debugString(getObject(arg1)); + const ptr0 = passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc); + const len0 = WASM_VECTOR_LEN; getInt32Memory0()[arg0 / 4 + 1] = len0; getInt32Memory0()[arg0 / 4 + 0] = ptr0; }; @@ -859,19 +859,19 @@ async function init(input) { throw new Error(getStringFromWasm0(arg0, arg1)); }; imports.wbg.__wbindgen_memory = function() { - var ret = wasm.memory; + const ret = wasm.memory; return addHeapObject(ret); }; - imports.wbg.__wbindgen_closure_wrapper12230 = function() { return logError(function (arg0, arg1, arg2) { - var ret = makeClosure(arg0, arg1, 856, __wbg_adapter_30); + imports.wbg.__wbindgen_closure_wrapper12105 = function() { return logError(function (arg0, arg1, arg2) { + const ret = makeClosure(arg0, arg1, 848, __wbg_adapter_30); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbindgen_closure_wrapper15845 = function() { return logError(function (arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 884, __wbg_adapter_33); + imports.wbg.__wbindgen_closure_wrapper15823 = function() { return logError(function (arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 885, __wbg_adapter_33); return addHeapObject(ret); }, arguments) }; - imports.wbg.__wbindgen_closure_wrapper16308 = function() { return logError(function (arg0, arg1, arg2) { - var ret = makeMutClosure(arg0, arg1, 913, __wbg_adapter_36); + imports.wbg.__wbindgen_closure_wrapper16232 = function() { return logError(function (arg0, arg1, arg2) { + const ret = makeMutClosure(arg0, arg1, 904, __wbg_adapter_36); return addHeapObject(ret); }, arguments) }; diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm index 207b02780..34e45a595 100644 Binary files a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm and b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm differ diff --git a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm.d.ts b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm.d.ts index 57759cb18..ceabdff18 100644 --- a/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm.d.ts +++ b/kanidmd_web_ui/pkg/kanidmd_web_ui_bg.wasm.d.ts @@ -5,9 +5,9 @@ export function run_app(a: number): void; export function __wbindgen_malloc(a: number): number; export function __wbindgen_realloc(a: number, b: number, c: number): number; export const __wbindgen_export_2: WebAssembly.Table; -export function _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h79af8eb94e22cb43(a: number, b: number, c: number): void; -export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h1c17030d49aa8a7b(a: number, b: number, c: number): void; -export function _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hb210817f7291cc2b(a: number, b: number, c: number): void; +export function _dyn_core__ops__function__Fn__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h82f2f6511a22593f(a: number, b: number, c: number): void; +export function _dyn_core__ops__function__FnMut__A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__h62c0974bc69b817a(a: number, b: number, c: number): void; +export function _dyn_core__ops__function__FnMut___A____Output___R_as_wasm_bindgen__closure__WasmClosure___describe__invoke__hd28867f91ff91e2f(a: number, b: number, c: number): void; export function __wbindgen_add_to_stack_pointer(a: number): number; export function __wbindgen_free(a: number, b: number): void; export function __wbindgen_exn_store(a: number): void; diff --git a/orca/Cargo.toml b/orca/Cargo.toml index 20a1a1791..8cc6525e3 100644 --- a/orca/Cargo.toml +++ b/orca/Cargo.toml @@ -16,35 +16,34 @@ path = "src/main.rs" [dependencies] jemallocator = { version = "0.3.0", optional = true } -tracing = "0.1" -tracing-subscriber = "0.3" +tracing = "^0.1.34" +tracing-subscriber = "^0.3.11" -structopt = { version = "0.3", default-features = false } +structopt = { version = "^0.3.26", default-features = false } -uuid = { version = "0.8", features = ["serde", "v4" ] } -csv = "1.1" -serde = { version = "1", features = ["derive"] } -serde_json = "1.0" +uuid = { version = "^1.0.0", features = ["serde", "v4" ] } +csv = "1.1.6" +serde = { version = "^1.0.136", features = ["derive"] } +serde_json = "^1.0.79" -rand = "0.8" -toml = "0.5" +rand = "^0.8.5" +toml = "^0.5.9" -kanidm_proto = { path = "../kanidm_proto", version = "1.1.0-alpha" } -kanidm_client = { path = "../kanidm_client", version = "1.1.0-alpha" } +kanidm_proto = { path = "../kanidm_proto" } +kanidm_client = { path = "../kanidm_client" } -tokio = { version = "1", features = ["full"] } -tokio-util = { version = "0.6", features = ["codec"] } -tokio-openssl = "0.6" -futures-util = "0.3" -openssl = "0.10" +tokio = { version = "^1.17.0", features = ["rt-multi-thread"] } +tokio-util = { version = "^0.7.1", features = ["codec"] } +tokio-openssl = "^0.6.3" +futures-util = { version = "^0.3.21", features = ["sink"] } +openssl = "^0.10.38" -ldap3_server = "^0.1.7" -# ldap3_server = { version = "0.1", path = "../../ldap3_server" } +ldap3_proto = "^0.2.3" -crossbeam = "0.8" -async-std = { version = "1.6", features = ["tokio1"] } +crossbeam = "0.8.1" +async-std = { version = "^1.11.0", features = ["tokio1"] } -mathru = "0.11" +mathru = "^0.12.0" [build-dependencies] profiles = { path = "../profiles" } diff --git a/orca/src/ds.rs b/orca/src/ds.rs index d18241142..fa8db1979 100644 --- a/orca/src/ds.rs +++ b/orca/src/ds.rs @@ -2,7 +2,7 @@ use crate::data::*; use crate::ldap::{LdapClient, LdapSchema}; use crate::profile::DsConfig; use crate::{TargetServer, TargetServerBuilder}; -use ldap3_server::proto::*; +use ldap3_proto::proto::*; use std::collections::{HashMap, HashSet}; use std::time::{Duration, Instant}; use uuid::Uuid; diff --git a/orca/src/ldap.rs b/orca/src/ldap.rs index c96468cd6..88c0fca44 100644 --- a/orca/src/ldap.rs +++ b/orca/src/ldap.rs @@ -11,8 +11,8 @@ use tokio::sync::Mutex; use tokio_openssl::SslStream; use tokio_util::codec::Framed; -use ldap3_server::proto::*; -use ldap3_server::LdapCodec; +use ldap3_proto::proto::*; +use ldap3_proto::LdapCodec; struct LdapInner { pub framed: Framed, LdapCodec>, diff --git a/profiles/Cargo.toml b/profiles/Cargo.toml index f714daed4..ab37c42bc 100644 --- a/profiles/Cargo.toml +++ b/profiles/Cargo.toml @@ -15,10 +15,9 @@ name = "profiles" path = "src/lib.rs" [dependencies] -serde = { version = "1", features = ["derive"] } -toml = "0.5" -base64 = "0.13" -rustc_version = "0.4.0" +serde = { version = "^1.0.136", features = ["derive"] } +toml = "^0.5.9" +base64 = "^0.13.0" [build-dependencies] -base64 = "0.13" +base64 = "^0.13.0"