From ea9c53603400146d8411bb270eebbdc610a75159 Mon Sep 17 00:00:00 2001 From: Brian Caswell Date: Fri, 18 Jun 2021 10:19:45 -0400 Subject: [PATCH 1/4] update rust dependencies --- src/agent/Cargo.lock | 295 ++++++++++++--------- src/agent/coverage/Cargo.toml | 8 +- src/agent/debugger/Cargo.toml | 6 +- src/agent/onefuzz-agent/Cargo.toml | 22 +- src/agent/onefuzz-agent/src/local/tui.rs | 2 +- src/agent/onefuzz-supervisor/Cargo.toml | 6 +- src/agent/onefuzz/Cargo.toml | 24 +- src/agent/onefuzz/src/jitter.rs | 4 +- src/agent/reqwest-retry/Cargo.toml | 4 +- src/agent/storage-queue/Cargo.toml | 12 +- src/agent/storage-queue/src/azure_queue.rs | 2 +- src/agent/win-util/Cargo.toml | 2 +- src/proxy-manager/Cargo.lock | 133 +++++----- src/proxy-manager/Cargo.toml | 6 +- 14 files changed, 289 insertions(+), 237 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 7711c1f3a1..c3634a9a19 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -35,9 +35,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" +checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" [[package]] name = "appinsights" @@ -89,7 +89,7 @@ checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -128,8 +128,8 @@ dependencies = [ "getrandom 0.2.3", "instant", "pin-project", - "rand 0.8.3", - "tokio 1.6.1", + "rand 0.8.4", + "tokio 1.7.0", ] [[package]] @@ -185,6 +185,9 @@ name = "bytes" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +dependencies = [ + "serde", +] [[package]] name = "cache-padded" @@ -414,25 +417,50 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb" +checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c" dependencies = [ "bitflags", - "crossterm_winapi", + "crossterm_winapi 0.7.0", "lazy_static", "libc", - "mio 0.7.11", + "mio 0.7.13", "parking_lot", - "signal-hook", + "signal-hook 0.1.17", + "winapi 0.3.9", +] + +[[package]] +name = "crossterm" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0ebde6a9dd5e331cd6c6f48253254d117642c31653baa475e394657c59c1f7d" +dependencies = [ + "bitflags", + "crossterm_winapi 0.8.0", + "libc", + "mio 0.7.13", + "parking_lot", + "signal-hook 0.3.9", + "signal-hook-mio", "winapi 0.3.9", ] [[package]] name = "crossterm_winapi" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db" +checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "crossterm_winapi" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3a6966607622438301997d3dac0d2f6e9a90c68bb6bc1785ea98456ab93c0507" dependencies = [ "winapi 0.3.9", ] @@ -444,7 +472,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e98e2ad1a782e33928b96fc3948e7c355e5af34ba4de7670fe8bac2a3b2006d" dependencies = [ "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -474,7 +502,7 @@ dependencies = [ "crossbeam-queue", "num_cpus", "serde", - "tokio 1.6.1", + "tokio 1.7.0", ] [[package]] @@ -487,7 +515,7 @@ dependencies = [ "iced-x86", "log", "memmap2", - "rand 0.7.3", + "rand 0.8.4", "serde", "win-util", "winapi 0.3.9", @@ -501,7 +529,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -533,9 +561,9 @@ checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" [[package]] name = "dunce" -version = "1.0.1" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2641c4a7c0c4101df53ea572bffdc561c146f6c2eb09e4df02bc4811e3feeb4" +checksum = "453440c271cf5577fd2a40e4942540cb7d0d2f85e27c8d07dd0023c925a67541" [[package]] name = "either" @@ -554,9 +582,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime", @@ -621,9 +649,9 @@ dependencies = [ [[package]] name = "fixedbitset" -version = "0.3.2" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45e780567ed7abc415d12fd464571d265eb4a5710ddc97cdb1a31a4c35bb479d" +checksum = "398ea4fabe40b9b0d885340a2a991a44c8a645624075ad966d21f88688e2b69e" [[package]] name = "flate2" @@ -639,9 +667,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.5" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9d66b91e902db43baefd8e40c8678ce29db2cf1d88ebd715174368d5fe70a9" +checksum = "ddad16e8529759736a9ce4cdf078ed702e45d3c5b0474a1c65f5149e9fa7f1eb" dependencies = [ "futures-core", "futures-sink", @@ -683,7 +711,7 @@ checksum = "63f713f8b2aa9e24fec85b0e290c56caee12e3b6ae0aeeda238a75b28251afd6" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -816,7 +844,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -906,9 +934,9 @@ checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" [[package]] name = "goblin" -version = "0.2.3" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d20fd25aa456527ce4f544271ae4fea65d2eda4a6561ea56f39fb3ee4f7e3884" +checksum = "ee05c709047abe5eb0571880d2887ac77299c5f0835f8e6b7f4d5404f8962921" dependencies = [ "log", "plain", @@ -949,7 +977,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-util 0.6.7", "tracing", ] @@ -962,9 +990,9 @@ checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" [[package]] name = "heck" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cbf45460356b7deeb5e3415b5563308c0a9b057c85e12b06ad551f98d0a6ac" +checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" dependencies = [ "unicode-segmentation", ] @@ -1098,9 +1126,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f71a7eea53a3f8257a7b4795373ff886397178cd634430ea94e12d7fe4fe34" +checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83" dependencies = [ "bytes 1.0.1", "futures-channel", @@ -1112,9 +1140,9 @@ dependencies = [ "httparse", "httpdate 1.0.1", "itoa", - "pin-project", + "pin-project-lite 0.2.6", "socket2 0.4.0", - "tokio 1.6.1", + "tokio 1.7.0", "tower-service", "tracing", "want", @@ -1140,17 +1168,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.0.1", - "hyper 0.14.8", + "hyper 0.14.9", "native-tls", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-native-tls", ] [[package]] name = "iced-x86" -version = "1.11.3" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d907dfc273d9ed0da940e8145ceb77759056a1fb2110b44b83d1b203cddb906" +checksum = "1ec039d142a47291ec551db1f67f689b599cc4b6d2b8cd6f430062ba46b2eb12" dependencies = [ "lazy_static", "static_assertions", @@ -1241,9 +1269,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "itoa" @@ -1297,9 +1325,9 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "libclusterfuzz" @@ -1373,9 +1401,9 @@ checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc" [[package]] name = "memmap2" -version = "0.2.3" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "723e3ebdcdc5c023db1df315364573789f8857c11b631a2fdfad7c00f5c046b4" +checksum = "20ff203f7bdc401350b1dbaa0355135777d25f41c0bbc601851bbd6cf61e8ff5" dependencies = [ "libc", ] @@ -1436,9 +1464,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ "libc", "log", @@ -1482,9 +1510,9 @@ dependencies = [ [[package]] name = "msvc-demangler" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6584cf122f02fc0396420a116cd395a9a776ec4347dffe1c5119c3fcc917c060" +checksum = "bfb67c6dd0fa9b00619c41c5700b6f92d5f418be49b45ddb9970fbd4569df3c8" dependencies = [ "bitflags", ] @@ -1620,9 +1648,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "onefuzz" @@ -1649,7 +1677,7 @@ dependencies = [ "pete", "proc-maps", "process_control", - "rand 0.7.3", + "rand 0.8.4", "regex", "reqwest 0.11.3", "reqwest-retry", @@ -1665,13 +1693,13 @@ dependencies = [ "strum_macros", "sysinfo", "tempfile", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-stream", "tokio-util 0.6.7", "url", "urlparse", "uuid", - "winreg 0.8.0", + "winreg 0.9.0", ] [[package]] @@ -1686,7 +1714,7 @@ dependencies = [ "backoff", "clap", "coverage", - "crossterm", + "crossterm 0.20.0", "env_logger", "flume", "futures", @@ -1705,7 +1733,7 @@ dependencies = [ "storage-queue", "tempfile", "thiserror", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-stream", "tokio-util 0.6.7", "tui", @@ -1733,7 +1761,7 @@ dependencies = [ "serde_json", "storage-queue", "structopt", - "tokio 1.6.1", + "tokio 1.7.0", "url", "users", "uuid", @@ -1748,7 +1776,7 @@ dependencies = [ "lazy_static", "log", "serde", - "tokio 1.6.1", + "tokio 1.7.0", "uuid", "z3-sys", ] @@ -1924,7 +1952,7 @@ checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -1984,7 +2012,7 @@ dependencies = [ "proc-macro-error-attr", "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", "version_check", ] @@ -2110,14 +2138,14 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", - "rand_chacha 0.3.0", - "rand_core 0.6.2", - "rand_hc 0.3.0", + "rand_chacha 0.3.1", + "rand_core 0.6.3", + "rand_hc 0.3.1", ] [[package]] @@ -2132,12 +2160,12 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -2151,9 +2179,9 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ "getrandom 0.2.3", ] @@ -2169,11 +2197,11 @@ dependencies = [ [[package]] name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ - "rand_core 0.6.2", + "rand_core 0.6.3", ] [[package]] @@ -2203,9 +2231,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" dependencies = [ "bitflags", ] @@ -2285,7 +2313,7 @@ dependencies = [ "futures-util", "http", "http-body 0.4.2", - "hyper 0.14.8", + "hyper 0.14.9", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -2298,7 +2326,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-native-tls", "url", "wasm-bindgen", @@ -2317,7 +2345,7 @@ dependencies = [ "log", "onefuzz-telemetry", "reqwest 0.11.3", - "tokio 1.6.1", + "tokio 1.7.0", "wiremock", ] @@ -2402,14 +2430,14 @@ checksum = "aaaae8f38bb311444cfb7f1979af0bc9240d95795f75f9ceddf6a59b79ceffa0" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] name = "security-framework" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" +checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" dependencies = [ "bitflags", "core-foundation", @@ -2420,9 +2448,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" +checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" dependencies = [ "core-foundation-sys", "libc", @@ -2457,7 +2485,7 @@ checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -2516,15 +2544,36 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729" dependencies = [ "libc", - "mio 0.7.11", + "mio 0.7.13", "signal-hook-registry", ] +[[package]] +name = "signal-hook" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "470c5a6397076fae0094aaf06a08e6ba6f37acb77d3b1b91ea92b4d6c8650c39" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29fd5867f1c4f2c5be079aee7a2adf1152ebb04a4bc4d341f504b7dece607ed4" +dependencies = [ + "libc", + "mio 0.7.13", + "signal-hook 0.3.9", +] + [[package]] name = "signal-hook-registry" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" dependencies = [ "libc", ] @@ -2579,7 +2628,7 @@ checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -2646,7 +2695,7 @@ dependencies = [ "async-trait", "backoff", "base64", - "bytes 0.5.6", + "bytes 1.0.1", "derivative", "flume", "num_cpus", @@ -2658,7 +2707,7 @@ dependencies = [ "serde-xml-rs", "serde_derive", "serde_json", - "tokio 1.6.1", + "tokio 1.7.0", "uuid", ] @@ -2689,25 +2738,25 @@ dependencies = [ "proc-macro-error", "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] name = "strum" -version = "0.20.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7318c509b5ba57f18533982607f24070a55d353e90d4cae30c467cdb2ad5ac5c" +checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2" [[package]] name = "strum_macros" -version = "0.20.1" +version = "0.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" +checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec" dependencies = [ "heck", "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -2723,9 +2772,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", @@ -2734,9 +2783,9 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.16.5" +version = "0.18.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "567e910ef0207be81a4e1bb0491e9a8d9866cf45b20fe1a52c03d347da9ea51b" +checksum = "d404aefa651a24a7f2a1190fec9fb6380ba84ac511a6fefad79eb0e63d39a97d" dependencies = [ "cfg-if 1.0.0", "core-foundation-sys", @@ -2756,7 +2805,7 @@ checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ "cfg-if 1.0.0", "libc", - "rand 0.8.3", + "rand 0.8.4", "redox_syscall", "remove_dir_all", "winapi 0.3.9", @@ -2797,7 +2846,7 @@ checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -2845,15 +2894,15 @@ dependencies = [ [[package]] name = "tokio" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975" +checksum = "c79ba603c337335df6ba6dd6afc38c38a7d5e1b0c871678439ea973cd62a118e" dependencies = [ "autocfg", "bytes 1.0.1", "libc", "memchr", - "mio 0.7.11", + "mio 0.7.13", "num_cpus", "once_cell", "parking_lot", @@ -2871,7 +2920,7 @@ checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -2881,7 +2930,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.6.1", + "tokio 1.7.0", ] [[package]] @@ -2892,7 +2941,7 @@ checksum = "f8864d706fdb3cc0843a49647ac892720dac98a6eeb818b77190592cf4994066" dependencies = [ "futures-core", "pin-project-lite 0.2.6", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-util 0.6.7", ] @@ -2933,7 +2982,7 @@ dependencies = [ "log", "pin-project-lite 0.2.6", "slab", - "tokio 1.6.1", + "tokio 1.7.0", ] [[package]] @@ -2981,13 +3030,13 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "tui" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9" +checksum = "861d8f3ad314ede6219bcb2ab844054b1de279ee37a9bc38e3d606f9d3fb2a71" dependencies = [ "bitflags", "cassowary", - "crossterm", + "crossterm 0.19.0", "unicode-segmentation", "unicode-width", ] @@ -3018,9 +3067,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33717dca7ac877f497014e10d73f3acf948c342bee31b5ca7892faf94ccc6b49" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] @@ -3118,9 +3167,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" +checksum = "70455df2fdf4e9bf580a92e443f1eb0303c390d682e2ea817312c9e81f8c3399" [[package]] name = "vec_map" @@ -3196,7 +3245,7 @@ dependencies = [ "log", "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", "wasm-bindgen-shared", ] @@ -3230,7 +3279,7 @@ checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -3260,7 +3309,7 @@ dependencies = [ "log", "os_pipe", "winapi 0.3.9", - "winreg 0.8.0", + "winreg 0.9.0", ] [[package]] @@ -3317,9 +3366,9 @@ dependencies = [ [[package]] name = "winreg" -version = "0.8.0" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d107f8c6e916235c4c01cabb3e8acf7bea8ef6a63ca2e7fa0527c049badfc48c" +checksum = "16cdb3898397cf7f624c294948669beafaeebc5577d5ec53d0afb76633593597" dependencies = [ "winapi 0.3.9", ] @@ -3335,13 +3384,13 @@ dependencies = [ "futures", "futures-timer", "http-types", - "hyper 0.14.8", + "hyper 0.14.9", "log", "once_cell", "regex", "serde", "serde_json", - "tokio 1.6.1", + "tokio 1.7.0", ] [[package]] diff --git a/src/agent/coverage/Cargo.toml b/src/agent/coverage/Cargo.toml index 28ded3278a..9e5c2ae7a5 100644 --- a/src/agent/coverage/Cargo.toml +++ b/src/agent/coverage/Cargo.toml @@ -15,12 +15,12 @@ bincode = "1.3" cpp_demangle = "0.3" debugger = { path = "../debugger" } dunce = "1.0" -fixedbitset = "0.3" -goblin = "0.2" +fixedbitset = "0.4" +goblin = "0.4" iced-x86 = { version = "1.1", features = ["decoder", "op_code_info", "instr_info", "masm"] } log = "0.4" -memmap2 = "0.2" -msvc-demangler = "0.8" +memmap2 = "0.3" +msvc-demangler = "0.9" regex = "1.4" rustc-demangle = "0.1" serde = { version = "1.0", features = ["derive"] } diff --git a/src/agent/debugger/Cargo.toml b/src/agent/debugger/Cargo.toml index 24560bac2a..165c31c4bc 100644 --- a/src/agent/debugger/Cargo.toml +++ b/src/agent/debugger/Cargo.toml @@ -8,11 +8,11 @@ license = "MIT" [dependencies] anyhow = "1.0" fnv = "1.0" -goblin = "0.2" +goblin = "0.4" iced-x86 = "1.1" log = "0.4" -memmap2 = "0.2" -rand = "0.7" +memmap2 = "0.3" +rand = "0.8" serde = { version = "1.0", features = ["derive"] } win-util = { path = "../win-util" } diff --git a/src/agent/onefuzz-agent/Cargo.toml b/src/agent/onefuzz-agent/Cargo.toml index 6bf202a44d..1b7495edb3 100644 --- a/src/agent/onefuzz-agent/Cargo.toml +++ b/src/agent/onefuzz-agent/Cargo.toml @@ -11,35 +11,35 @@ integration_test=[] [dependencies] anyhow = "1.0" -arraydeque = "0.4.5" +arraydeque = "0.4" appinsights = "0.1" async-trait = "0.1" atexit = { path = "../atexit" } backoff = { version = "0.3", features = ["tokio"] } clap = "2.33" coverage = { path = "../coverage" } -crossterm = "0.18" +crossterm = "0.20" env_logger = "0.8" -flume = "0.10.4" -futures = "0.3.14" +flume = "0.10" +futures = "0.3" hex = "0.4" lazy_static = "1.4" log = "0.4" num_cpus = "1.13" -reqwest = { version = "0.11.3", features = ["json", "stream"] } +reqwest = { version = "0.11", features = ["json", "stream"] } serde = "1.0" serde_json = "1.0" onefuzz = { path = "../onefuzz" } onefuzz-telemetry = { path = "../onefuzz-telemetry" } -path-absolutize = "3.0.10" +path-absolutize = "3.0" reqwest-retry = { path = "../reqwest-retry" } stacktrace-parser = { path = "../stacktrace-parser" } storage-queue = { path = "../storage-queue" } tempfile = "3.2" thiserror = "1.0" -tokio = { version = "1.5.0", features = ["full"] } -tokio-util = { version = "0.6.6", features = ["full"] } -tokio-stream = "0.1.5" -tui = { version = "0.14", default-features = false, features = ['crossterm'] } +tokio = { version = "1.7", features = ["full"] } +tokio-util = { version = "0.6", features = ["full"] } +tokio-stream = "0.1" +tui = { version = "0.15", default-features = false, features = ['crossterm'] } url = { version = "2.2", features = ["serde"] } -uuid = { version = "0.8", features = ["serde", "v4"] } \ No newline at end of file +uuid = { version = "0.8", features = ["serde", "v4"] } diff --git a/src/agent/onefuzz-agent/src/local/tui.rs b/src/agent/onefuzz-agent/src/local/tui.rs index 10435124eb..3d09bcd7a5 100644 --- a/src/agent/onefuzz-agent/src/local/tui.rs +++ b/src/agent/onefuzz-agent/src/local/tui.rs @@ -14,7 +14,7 @@ use onefuzz::utils::try_wait_all_join_handles; use onefuzz_telemetry::{self, EventData}; use std::{ collections::HashMap, - io::{self, Stdout, Write}, + io::{self, Stdout}, iter::once, mem::{discriminant, Discriminant}, path::PathBuf, diff --git a/src/agent/onefuzz-supervisor/Cargo.toml b/src/agent/onefuzz-supervisor/Cargo.toml index dbcdafb875..59ce51ceb2 100644 --- a/src/agent/onefuzz-supervisor/Cargo.toml +++ b/src/agent/onefuzz-supervisor/Cargo.toml @@ -12,15 +12,15 @@ appinsights = "0.1" async-trait = "0.1" downcast-rs = "1.2" env_logger = "0.8" -futures = "0.3.14" +futures = "0.3" log = "0.4" onefuzz = { path = "../onefuzz" } -reqwest = { version = "0.11.3", features = ["json", "stream"] } +reqwest = { version = "0.11", features = ["json", "stream"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" storage-queue = { path = "../storage-queue" } structopt = "0.3" -tokio = { version = "1.5.0", features = ["full"] } +tokio = { version = "1.7", features = ["full"] } url = { version = "2.2", features = ["serde"] } uuid = { version = "0.8", features = ["serde", "v4"] } clap = "2.33" diff --git a/src/agent/onefuzz/Cargo.toml b/src/agent/onefuzz/Cargo.toml index a1c8eb0eeb..4772cf9abd 100644 --- a/src/agent/onefuzz/Cargo.toml +++ b/src/agent/onefuzz/Cargo.toml @@ -11,32 +11,32 @@ anyhow = "1.0" appinsights = "0.1" async-trait = "0.1" base64 = "0.13" -bytes = "1.0.1" +bytes = "1.0" dunce = "1.0" -futures = "0.3.14" -futures-util = "0.3.14" +futures = "0.3" +futures-util = "0.3" hex = "0.4" lazy_static = "1.4" log = "0.4" notify = "4.0" regex = "1.4" -reqwest = { version = "0.11.3", features = ["json", "stream"] } +reqwest = { version = "0.11", features = ["json", "stream"] } sha2 = "0.9" url = { version = "2.2", features = ["serde"] } serde = "1.0" serde_json = "1.0" -rand = "0.7" +rand = "0.8" serde_derive = "1.0" -sysinfo = "0.16" -tokio = { version = "1.5.0", features = ["full"] } -tokio-stream = { version = "0.1.5", features = ["fs", "time", "tokio-util"] } -tokio-util = { version = "0.6.6", features = ["full"] } +sysinfo = "0.18" +tokio = { version = "1.7", features = ["full"] } +tokio-stream = { version = "0.1", features = ["fs", "time", "tokio-util"] } +tokio-util = { version = "0.6", features = ["full"] } uuid = { version = "0.8", features = ["serde", "v4"] } urlparse = "0.7" ring = "0.16" storage-queue = { path = "../storage-queue" } -strum = "0.20" -strum_macros = "0.20" +strum = "0.21" +strum_macros = "0.21" tempfile = "3.2" process_control = "3.0" reqwest-retry = { path = "../reqwest-retry"} @@ -45,7 +45,7 @@ stacktrace-parser = { path = "../stacktrace-parser" } backoff = { version = "0.3", features = ["tokio"] } [target.'cfg(target_os = "windows")'.dependencies] -winreg = "0.8" +winreg = "0.9" input-tester = { path = "../input-tester" } debugger = { path = "../debugger" } diff --git a/src/agent/onefuzz/src/jitter.rs b/src/agent/onefuzz/src/jitter.rs index 31505ae5e3..0e11f596a9 100644 --- a/src/agent/onefuzz/src/jitter.rs +++ b/src/agent/onefuzz/src/jitter.rs @@ -6,7 +6,7 @@ use std::time::Duration; use tokio::time::sleep; pub fn jitter(value: Duration) -> Duration { - let random: u64 = thread_rng().gen_range(0, 10); + let random: u64 = thread_rng().gen_range(0..10); Duration::from_secs(random) + value } @@ -15,7 +15,7 @@ pub async fn delay_with_jitter(value: Duration) { } pub async fn random_delay(value: Duration) { - let random: u64 = thread_rng().gen_range(0, value.as_secs()); + let random: u64 = thread_rng().gen_range(0..value.as_secs()); let delay = Duration::new(random, 0); sleep(delay).await } diff --git a/src/agent/reqwest-retry/Cargo.toml b/src/agent/reqwest-retry/Cargo.toml index d8fd12425e..ab7e6297cc 100644 --- a/src/agent/reqwest-retry/Cargo.toml +++ b/src/agent/reqwest-retry/Cargo.toml @@ -11,8 +11,8 @@ async-trait = "0.1" backoff = { version = "0.3", features = ["tokio"] } log = "0.4" onefuzz-telemetry = { path = "../onefuzz-telemetry" } -reqwest = { version = "0.11.3", features = ["json", "stream"] } +reqwest = { version = "0.11", features = ["json", "stream"] } [dev-dependencies] -tokio = { version = "1.5.0", features = ["macros"] } +tokio = { version = "1.7", features = ["macros"] } wiremock = "0.5" diff --git a/src/agent/storage-queue/Cargo.toml b/src/agent/storage-queue/Cargo.toml index 2377fd42ca..7782fab1ea 100644 --- a/src/agent/storage-queue/Cargo.toml +++ b/src/agent/storage-queue/Cargo.toml @@ -10,17 +10,17 @@ anyhow = "1.0" async-trait = "0.1" backoff = { version = "0.3", features = ["tokio"] } base64 = "0.13" -bytes = "0.5" -derivative = "2.2.0" -flume = "0.10.4" +bytes = { version = "1.0", features = ["serde"] } +derivative = "2.2" +flume = "0.10" num_cpus = "1.13" regex = "1.4" -reqwest = { version = "0.11.3", features = ["json", "stream"] } +reqwest = { version = "0.11", features = ["json", "stream"] } reqwest-retry = { path = "../reqwest-retry" } serde = { version = "1.0", features = ["derive"]} serde_derive = "1.0" serde_json = "1.0" serde-xml-rs = "0.4" -tokio = { version = "1.5.0" , features=["full"] } +tokio = { version = "1.7" , features=["full"] } queue-file = "1.1" -uuid = { version = "0.8", features = ["serde", "v4"] } \ No newline at end of file +uuid = { version = "0.8", features = ["serde", "v4"] } diff --git a/src/agent/storage-queue/src/azure_queue.rs b/src/agent/storage-queue/src/azure_queue.rs index d5da3595ac..4ef0877612 100644 --- a/src/agent/storage-queue/src/azure_queue.rs +++ b/src/agent/storage-queue/src/azure_queue.rs @@ -2,7 +2,7 @@ // Licensed under the MIT License. use anyhow::{Context, Result}; -use bytes::buf::BufExt; +use bytes::Buf; use reqwest::{Client, Url}; use reqwest_retry::SendRetry; use serde::{de::DeserializeOwned, Deserialize, Serialize}; diff --git a/src/agent/win-util/Cargo.toml b/src/agent/win-util/Cargo.toml index 334faf7472..676cf3b34a 100644 --- a/src/agent/win-util/Cargo.toml +++ b/src/agent/win-util/Cargo.toml @@ -12,7 +12,7 @@ log = "0.4" os_pipe = "0.9" [target.'cfg(windows)'.dependencies] -winreg = "0.8" +winreg = "0.9" [dependencies.winapi] version = "0.3" diff --git a/src/proxy-manager/Cargo.lock b/src/proxy-manager/Cargo.lock index fdd922ed17..669b2c2407 100644 --- a/src/proxy-manager/Cargo.lock +++ b/src/proxy-manager/Cargo.lock @@ -20,9 +20,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.40" +version = "1.0.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" +checksum = "15af2628f6890fe2609a3b91bef4c83450512802e59489f9c1cb1fa5df064a61" [[package]] name = "appinsights" @@ -51,7 +51,7 @@ checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -82,7 +82,7 @@ dependencies = [ "instant", "pin-project", "rand", - "tokio 1.6.1", + "tokio 1.7.0", ] [[package]] @@ -114,6 +114,9 @@ name = "bytes" version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b700ce4376041dcd0a327fd0097c41095743c4c8af8887265942faf1100bd040" +dependencies = [ + "serde", +] [[package]] name = "cc" @@ -206,7 +209,7 @@ checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -226,9 +229,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f" +checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3" dependencies = [ "atty", "humantime", @@ -239,9 +242,9 @@ dependencies = [ [[package]] name = "flume" -version = "0.10.5" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa9d66b91e902db43baefd8e40c8678ce29db2cf1d88ebd715174368d5fe70a9" +checksum = "ddad16e8529759736a9ce4cdf078ed702e45d3c5b0474a1c65f5149e9fa7f1eb" dependencies = [ "futures-core", "futures-sink", @@ -355,7 +358,7 @@ dependencies = [ "proc-macro-hack", "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -438,7 +441,7 @@ dependencies = [ "http", "indexmap", "slab", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-util 0.6.7", "tracing", ] @@ -551,9 +554,9 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.8" +version = "0.14.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3f71a7eea53a3f8257a7b4795373ff886397178cd634430ea94e12d7fe4fe34" +checksum = "07d6baa1b441335f3ce5098ac421fb6547c46dda735ca1bc6d0153c838f9dd83" dependencies = [ "bytes 1.0.1", "futures-channel", @@ -565,9 +568,9 @@ dependencies = [ "httparse", "httpdate 1.0.1", "itoa", - "pin-project", + "pin-project-lite 0.2.6", "socket2 0.4.0", - "tokio 1.6.1", + "tokio 1.7.0", "tower-service", "tracing", "want", @@ -593,9 +596,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ "bytes 1.0.1", - "hyper 0.14.8", + "hyper 0.14.9", "native-tls", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-native-tls", ] @@ -640,9 +643,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135" +checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" [[package]] name = "itoa" @@ -677,9 +680,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.95" +version = "0.2.97" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" +checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6" [[package]] name = "lock_api" @@ -760,9 +763,9 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.11" +version = "0.7.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf80d3e903b34e0bd7282b218398aec54e082c840d9baf8339e0080a0c542956" +checksum = "8c2bdb6314ec10835cd3293dd268473a835c02b7b352e788be788b3c6ca6bb16" dependencies = [ "libc", "log", @@ -870,9 +873,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.7.2" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" +checksum = "692fcb63b64b1758029e0a96ee63e049ce8c5948587f2f7208df04625e5f6b56" [[package]] name = "onefuzz-proxy-manager" @@ -890,7 +893,7 @@ dependencies = [ "serde_json", "storage-queue", "thiserror", - "tokio 1.6.1", + "tokio 1.7.0", "url", "uuid", ] @@ -903,7 +906,7 @@ dependencies = [ "lazy_static", "log", "serde", - "tokio 1.6.1", + "tokio 1.7.0", "uuid", ] @@ -1007,7 +1010,7 @@ checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -1100,9 +1103,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" +checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" dependencies = [ "libc", "rand_chacha", @@ -1112,9 +1115,9 @@ dependencies = [ [[package]] name = "rand_chacha" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", "rand_core", @@ -1122,27 +1125,27 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" +checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" dependencies = [ "getrandom", ] [[package]] name = "rand_hc" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" +checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" dependencies = [ "rand_core", ] [[package]] name = "redox_syscall" -version = "0.2.8" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc" +checksum = "5ab49abadf3f9e1c4bc499e8845e152ad87d2ad2d30371841171169e9d75feee" dependencies = [ "bitflags", ] @@ -1222,7 +1225,7 @@ dependencies = [ "futures-util", "http", "http-body 0.4.2", - "hyper 0.14.8", + "hyper 0.14.9", "hyper-tls 0.5.0", "ipnet", "js-sys", @@ -1235,7 +1238,7 @@ dependencies = [ "serde", "serde_json", "serde_urlencoded", - "tokio 1.6.1", + "tokio 1.7.0", "tokio-native-tls", "url", "wasm-bindgen", @@ -1280,9 +1283,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "security-framework" -version = "2.2.0" +version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84" +checksum = "23a2ac85147a3a11d77ecf1bc7166ec0b92febfa4461c37944e180f319ece467" dependencies = [ "bitflags", "core-foundation", @@ -1293,9 +1296,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339" +checksum = "7e4effb91b4b8b6fb7732e670b6cee160278ff8e6bf485c7805d9e319d76e284" dependencies = [ "core-foundation-sys", "libc", @@ -1330,7 +1333,7 @@ checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -1358,9 +1361,9 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16f1d0fef1604ba8f7a073c7e701f213e056707210e9020af4528e0101ce11a6" +checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" dependencies = [ "libc", ] @@ -1415,7 +1418,7 @@ checksum = "1508efa03c362e23817f96cde18abed596a25219a8b2c66e8db33c03543d315b" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -1456,7 +1459,7 @@ dependencies = [ "async-trait", "backoff", "base64", - "bytes 0.5.6", + "bytes 1.0.1", "derivative", "flume", "num_cpus", @@ -1468,7 +1471,7 @@ dependencies = [ "serde-xml-rs", "serde_derive", "serde_json", - "tokio 1.6.1", + "tokio 1.7.0", "uuid", ] @@ -1491,9 +1494,9 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.72" +version = "1.0.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82" +checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", @@ -1549,7 +1552,7 @@ checksum = "8a36768c0fbf1bb15eca10defa29526bda730a2376c2ab4393ccfa16fb1a318d" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -1597,15 +1600,15 @@ dependencies = [ [[package]] name = "tokio" -version = "1.6.1" +version = "1.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a38d31d7831c6ed7aad00aa4c12d9375fd225a6dd77da1d25b707346319a975" +checksum = "c79ba603c337335df6ba6dd6afc38c38a7d5e1b0c871678439ea973cd62a118e" dependencies = [ "autocfg", "bytes 1.0.1", "libc", "memchr", - "mio 0.7.11", + "mio 0.7.13", "num_cpus", "once_cell", "parking_lot", @@ -1623,7 +1626,7 @@ checksum = "c49e3df43841dafb86046472506755d8501c5615673955f6aa17181125d13c37" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", ] [[package]] @@ -1633,7 +1636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b" dependencies = [ "native-tls", - "tokio 1.6.1", + "tokio 1.7.0", ] [[package]] @@ -1671,7 +1674,7 @@ dependencies = [ "futures-sink", "log", "pin-project-lite 0.2.6", - "tokio 1.6.1", + "tokio 1.7.0", ] [[package]] @@ -1737,9 +1740,9 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.18" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33717dca7ac877f497014e10d73f3acf948c342bee31b5ca7892faf94ccc6b49" +checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" dependencies = [ "tinyvec", ] @@ -1787,9 +1790,9 @@ dependencies = [ [[package]] name = "vcpkg" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "025ce40a007e1907e58d5bc1a594def78e5573bb0b1160bc389634e8f12e4faa" +checksum = "70455df2fdf4e9bf580a92e443f1eb0303c390d682e2ea817312c9e81f8c3399" [[package]] name = "vec_map" @@ -1842,7 +1845,7 @@ dependencies = [ "log", "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", "wasm-bindgen-shared", ] @@ -1876,7 +1879,7 @@ checksum = "be2241542ff3d9f241f5e2cb6dd09b37efe786df8851c54957683a49f0987a97" dependencies = [ "proc-macro2 1.0.27", "quote 1.0.9", - "syn 1.0.72", + "syn 1.0.73", "wasm-bindgen-backend", "wasm-bindgen-shared", ] diff --git a/src/proxy-manager/Cargo.toml b/src/proxy-manager/Cargo.toml index ca1f364e54..46bd3a2b60 100644 --- a/src/proxy-manager/Cargo.toml +++ b/src/proxy-manager/Cargo.toml @@ -10,13 +10,13 @@ license = "MIT" anyhow = "1.0" clap = "2.33" env_logger = "0.8" -futures = "0.3.14" -reqwest = { version = "0.11.3", features = ["json", "stream"] } +futures = "0.3" +reqwest = { version = "0.11", features = ["json", "stream"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" storage-queue = { path = "../agent/storage-queue" } thiserror = "1.0" -tokio = { version = "1.5.0", features = ["macros", "rt-multi-thread", "fs", "process"] } +tokio = { version = "1.7", features = ["macros", "rt-multi-thread", "fs", "process"] } url = { version = "2.2", features = ["serde"] } reqwest-retry = { path = "../agent/reqwest-retry"} onefuzz-telemetry = { path = "../agent/onefuzz-telemetry" } From 300e9b42703956a753b25559df206d276220544c Mon Sep 17 00:00:00 2001 From: Brian Caswell Date: Fri, 18 Jun 2021 10:31:36 -0400 Subject: [PATCH 2/4] fix range --- src/agent/debugger/src/target.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/agent/debugger/src/target.rs b/src/agent/debugger/src/target.rs index ac7312dc53..fbcae4bcef 100644 --- a/src/agent/debugger/src/target.rs +++ b/src/agent/debugger/src/target.rs @@ -560,7 +560,7 @@ impl Target { } // Now pick a random thread to resume. - let idx = thread_rng().gen_range(0, self.single_step.len()); + let idx = thread_rng().gen_range(0..self.single_step.len()); let (handle, step_state) = self.single_step.iter().nth(idx).unwrap(); let thread_info = self.thread_info.get_mut(handle).unwrap(); From 474bc8dae26c9f1f1a78cf2b58fe403796fd97de Mon Sep 17 00:00:00 2001 From: Brian Caswell Date: Fri, 18 Jun 2021 10:31:47 -0400 Subject: [PATCH 3/4] update compile cache key --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d9cfad08aa..684f09de6b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: path: | sccache src/agent/target - key: agent-${{ runner.os }}-${{ hashFiles('src/agent/Cargo.lock') }}-2021-05-14-01 + key: agent-${{ runner.os }}-${{ hashFiles('src/agent/Cargo.lock') }}-2021-06-18-01 restore-keys: | agent-${{ runner.os }} - name: Linux Prereqs From 39918b778f75ff6fa388b93e3927a51ead56836d Mon Sep 17 00:00:00 2001 From: Brian Caswell Date: Fri, 18 Jun 2021 10:45:19 -0400 Subject: [PATCH 4/4] undo bump for goblin --- src/agent/coverage/Cargo.toml | 2 +- src/agent/debugger/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/agent/coverage/Cargo.toml b/src/agent/coverage/Cargo.toml index 9e5c2ae7a5..29b37d7cd9 100644 --- a/src/agent/coverage/Cargo.toml +++ b/src/agent/coverage/Cargo.toml @@ -16,7 +16,7 @@ cpp_demangle = "0.3" debugger = { path = "../debugger" } dunce = "1.0" fixedbitset = "0.4" -goblin = "0.4" +goblin = "0.2" iced-x86 = { version = "1.1", features = ["decoder", "op_code_info", "instr_info", "masm"] } log = "0.4" memmap2 = "0.3" diff --git a/src/agent/debugger/Cargo.toml b/src/agent/debugger/Cargo.toml index 165c31c4bc..96314a2c0b 100644 --- a/src/agent/debugger/Cargo.toml +++ b/src/agent/debugger/Cargo.toml @@ -8,7 +8,7 @@ license = "MIT" [dependencies] anyhow = "1.0" fnv = "1.0" -goblin = "0.4" +goblin = "0.2" iced-x86 = "1.1" log = "0.4" memmap2 = "0.3"