From 7c8fe2f779000898d1ac218399aa4af3ed4c5af5 Mon Sep 17 00:00:00 2001 From: klensy Date: Wed, 9 Oct 2024 13:20:33 +0300 Subject: [PATCH 1/6] resolve cargo audit errors --- Cargo.lock | 291 ++++++++++++++++++++++++++++------------------------- Cargo.toml | 9 +- 2 files changed, 160 insertions(+), 140 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c3c551a..8bc1661 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -137,9 +137,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "aws-config" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdcf0d683fe9c23d32cf5b53c9918ea0a500375a9fb20109802552658e576c9" +checksum = "fc6b3804dca60326e07205179847f17a4fce45af3a1106939177ad41ac08a6de" dependencies = [ "aws-credential-types", "aws-http", @@ -153,7 +153,7 @@ dependencies = [ "aws-smithy-types", "aws-types", "bytes", - "fastrand 1.9.0", + "fastrand", "hex", "http", "hyper", @@ -167,69 +167,77 @@ dependencies = [ [[package]] name = "aws-credential-types" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fcdb2f7acbc076ff5ad05e7864bdb191ca70a6fd07668dc3a1a8bcd051de5ae" +checksum = "70a66ac8ef5fa9cf01c2d999f39d16812e90ec1467bd382cbbb74ba23ea86201" dependencies = [ "aws-smithy-async", "aws-smithy-types", - "fastrand 1.9.0", + "fastrand", "tokio", "tracing", "zeroize", ] [[package]] -name = "aws-endpoint" -version = "0.55.3" +name = "aws-http" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cce1c41a6cfaa726adee9ebb9a56fcd2bbfd8be49fd8a04c5e20fd968330b04" +checksum = "3e626370f9ba806ae4c439e49675fd871f5767b093075cdf4fef16cac42ba900" dependencies = [ + "aws-credential-types", "aws-smithy-http", "aws-smithy-types", "aws-types", + "bytes", "http", - "regex", + "http-body", + "lazy_static", + "percent-encoding", + "pin-project-lite", "tracing", ] [[package]] -name = "aws-http" -version = "0.55.3" +name = "aws-runtime" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aadbc44e7a8f3e71c8b374e03ecd972869eb91dd2bc89ed018954a52ba84bc44" +checksum = "07ac5cf0ff19c1bca0cea7932e11b239d1025a45696a4f44f72ea86e2b8bdd07" dependencies = [ "aws-credential-types", + "aws-http", + "aws-sigv4", + "aws-smithy-async", + "aws-smithy-eventstream", "aws-smithy-http", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", - "bytes", + "fastrand", "http", - "http-body", - "lazy_static", "percent-encoding", - "pin-project-lite", "tracing", + "uuid", ] [[package]] name = "aws-sdk-s3" -version = "0.26.0" +version = "0.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4b64fc8b7d76d09e53f4a64ebe2cd44894adb902011a26878aebd0576234d41" +checksum = "42f7a233b27af6e70094eafd43d9ee11da6e78eb2c1a31e5a7de737b782c627d" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-sigv4", "aws-smithy-async", "aws-smithy-checksums", "aws-smithy-client", "aws-smithy-eventstream", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", @@ -240,82 +248,63 @@ dependencies = [ "percent-encoding", "regex", "tokio-stream", - "tower", "tracing", "url", ] [[package]] name = "aws-sdk-sso" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8b812340d86d4a766b2ca73f740dfd47a97c2dff0c06c8517a16d88241957e4" +checksum = "903f888ff190e64f6f5c83fb0f8d54f9c20481f1dc26359bb8896f5d99908949" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-types", "bytes", "http", "regex", "tokio-stream", - "tower", "tracing", ] [[package]] name = "aws-sdk-sts" -version = "0.28.0" +version = "0.30.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "265fac131fbfc188e5c3d96652ea90ecc676a934e3174eaaee523c6cec040b3b" +checksum = "a47ad6bf01afc00423d781d464220bf69fb6a674ad6629cbbcb06d88cdc2be82" dependencies = [ "aws-credential-types", - "aws-endpoint", "aws-http", - "aws-sig-auth", + "aws-runtime", "aws-smithy-async", "aws-smithy-client", "aws-smithy-http", - "aws-smithy-http-tower", "aws-smithy-json", "aws-smithy-query", + "aws-smithy-runtime", + "aws-smithy-runtime-api", "aws-smithy-types", "aws-smithy-xml", "aws-types", - "bytes", "http", "regex", - "tower", - "tracing", -] - -[[package]] -name = "aws-sig-auth" -version = "0.55.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b94acb10af0c879ecd5c7bdf51cda6679a0a4f4643ce630905a77673bfa3c61" -dependencies = [ - "aws-credential-types", - "aws-sigv4", - "aws-smithy-eventstream", - "aws-smithy-http", - "aws-types", - "http", "tracing", ] [[package]] name = "aws-sigv4" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d2ce6f507be68e968a33485ced670111d1cbad161ddbbab1e313c03d37d8f4c" +checksum = "b7b28f4910bb956b7ab320b62e98096402354eca976c587d1eeccd523d9bac03" dependencies = [ "aws-smithy-eventstream", "aws-smithy-http", @@ -334,9 +323,9 @@ dependencies = [ [[package]] name = "aws-smithy-async" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "13bda3996044c202d75b91afeb11a9afae9db9a721c6a7a427410018e286b880" +checksum = "2cdb73f85528b9d19c23a496034ac53703955a59323d581c06aa27b4e4e247af" dependencies = [ "futures-util", "pin-project-lite", @@ -346,9 +335,9 @@ dependencies = [ [[package]] name = "aws-smithy-checksums" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07ed8b96d95402f3f6b8b57eb4e0e45ee365f78b1a924faf20ff6e97abf1eae6" +checksum = "afb15946af1b8d3beeff53ad991d9bff68ac22426b6d40372b958a75fa61eaed" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -367,16 +356,16 @@ dependencies = [ [[package]] name = "aws-smithy-client" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a86aa6e21e86c4252ad6a0e3e74da9617295d8d6e374d552be7d3059c41cedd" +checksum = "c27b2756264c82f830a91cb4d2d485b2d19ad5bea476d9a966e03d27f27ba59a" dependencies = [ "aws-smithy-async", "aws-smithy-http", "aws-smithy-http-tower", "aws-smithy-types", "bytes", - "fastrand 1.9.0", + "fastrand", "http", "http-body", "hyper", @@ -391,9 +380,9 @@ dependencies = [ [[package]] name = "aws-smithy-eventstream" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "460c8da5110835e3d9a717c61f5556b20d03c32a1dec57f8fc559b360f733bb8" +checksum = "850233feab37b591b7377fd52063aa37af615687f5896807abe7f49bd4e1d25b" dependencies = [ "aws-smithy-types", "bytes", @@ -402,9 +391,9 @@ dependencies = [ [[package]] name = "aws-smithy-http" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b3b693869133551f135e1f2c77cb0b8277d9e3e17feaf2213f735857c4f0d28" +checksum = "54cdcf365d8eee60686885f750a34c190e513677db58bbc466c44c588abf4199" dependencies = [ "aws-smithy-eventstream", "aws-smithy-types", @@ -425,9 +414,9 @@ dependencies = [ [[package]] name = "aws-smithy-http-tower" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ae4f6c5798a247fac98a867698197d9ac22643596dc3777f0c76b91917616b9" +checksum = "822de399d0ce62829a69dfa8c5cd08efdbe61a7426b953e2268f8b8b52a607bd" dependencies = [ "aws-smithy-http", "aws-smithy-types", @@ -441,50 +430,88 @@ dependencies = [ [[package]] name = "aws-smithy-json" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23f9f42fbfa96d095194a632fbac19f60077748eba536eb0b9fecc28659807f8" +checksum = "4fb1e7ab8fa7ad10c193af7ae56d2420989e9f4758bf03601a342573333ea34f" dependencies = [ "aws-smithy-types", ] [[package]] name = "aws-smithy-query" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "98819eb0b04020a1c791903533b638534ae6c12e2aceda3e6e6fba015608d51d" +checksum = "28556a3902091c1f768a34f6c998028921bdab8d47d92586f363f14a4a32d047" dependencies = [ "aws-smithy-types", "urlencoding", ] +[[package]] +name = "aws-smithy-runtime" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "745e096b3553e7e0f40622aa04971ce52765af82bebdeeac53aa6fc82fe801e6" +dependencies = [ + "aws-smithy-async", + "aws-smithy-client", + "aws-smithy-http", + "aws-smithy-runtime-api", + "aws-smithy-types", + "bytes", + "fastrand", + "http", + "http-body", + "once_cell", + "pin-project-lite", + "pin-utils", + "tokio", + "tracing", +] + +[[package]] +name = "aws-smithy-runtime-api" +version = "0.56.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93d0ae0c9cfd57944e9711ea610b48a963fb174a53aabacc08c5794a594b1d02" +dependencies = [ + "aws-smithy-async", + "aws-smithy-http", + "aws-smithy-types", + "bytes", + "http", + "tokio", + "tracing", +] + [[package]] name = "aws-smithy-types" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16a3d0bf4f324f4ef9793b86a1701d9700fbcdbd12a846da45eed104c634c6e8" +checksum = "d90dbc8da2f6be461fa3c1906b20af8f79d14968fe47f2b7d29d086f62a51728" dependencies = [ "base64-simd", "itoa", "num-integer", "ryu", + "serde", "time", ] [[package]] name = "aws-smithy-xml" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1b9d12875731bd07e767be7baad95700c3137b56730ec9ddeedb52a5e5ca63b" +checksum = "e01d2dedcdd8023043716cfeeb3c6c59f2d447fce365d8e194838891794b23b6" dependencies = [ "xmlparser", ] [[package]] name = "aws-types" -version = "0.55.3" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dd209616cc8d7bfb82f87811a5c655dc97537f592689b18743bddf5dc5c4829" +checksum = "85aa0451bf8af1bf22a4f028d5d28054507a14be43cb8ac0597a8471fba9edfe" dependencies = [ "aws-credential-types", "aws-smithy-async", @@ -824,15 +851,6 @@ dependencies = [ "windows-sys 0.52.0", ] -[[package]] -name = "fastrand" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" -dependencies = [ - "instant", -] - [[package]] name = "fastrand" version = "2.0.1" @@ -886,9 +904,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" dependencies = [ "futures-core", "futures-sink", @@ -896,9 +914,9 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" [[package]] name = "futures-executor" @@ -913,15 +931,15 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" [[package]] name = "futures-macro" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" dependencies = [ "proc-macro2", "quote", @@ -930,21 +948,21 @@ dependencies = [ [[package]] name = "futures-sink" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" [[package]] name = "futures-task" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" [[package]] name = "futures-util" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" dependencies = [ "futures-channel", "futures-core", @@ -987,9 +1005,9 @@ checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" [[package]] name = "h2" -version = "0.3.25" +version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fbd2820c5e49886948654ab546d0688ff24530286bdcf8fca3cefb16d4618eb" +checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ "bytes", "fnv", @@ -1106,10 +1124,11 @@ dependencies = [ [[package]] name = "hyper-rustls" -version = "0.23.2" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1788965e61b367cd03a62950836d5cd41560c3577d90e40e0819373194d1661c" +checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590" dependencies = [ + "futures-util", "http", "hyper", "log", @@ -1152,15 +1171,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - [[package]] name = "ipnet" version = "2.9.0" @@ -1336,9 +1346,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.64" +version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f" +checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ "bitflags 2.5.0", "cfg-if", @@ -1368,9 +1378,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.101" +version = "0.9.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dda2b0f344e78efc2facf7d195d098df0dd72151b26ab98da807afc26c198dff" +checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" dependencies = [ "cc", "libc", @@ -1637,14 +1647,14 @@ dependencies = [ [[package]] name = "rustls" -version = "0.20.9" +version = "0.21.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b80e3dec595989ea8510028f30c408a4630db12c9cbb8de34203b89d6577e99" +checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e" dependencies = [ "log", - "ring 0.16.20", + "ring 0.17.8", + "rustls-webpki", "sct", - "webpki", ] [[package]] @@ -1668,6 +1678,16 @@ dependencies = [ "base64", ] +[[package]] +name = "rustls-webpki" +version = "0.101.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765" +dependencies = [ + "ring 0.17.8", + "untrusted 0.9.0", +] + [[package]] name = "ryu" version = "1.0.17" @@ -1908,7 +1928,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" dependencies = [ "cfg-if", - "fastrand 2.0.1", + "fastrand", "rustix", "windows-sys 0.52.0", ] @@ -1934,9 +1954,9 @@ dependencies = [ [[package]] name = "time" -version = "0.3.34" +version = "0.3.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749" +checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885" dependencies = [ "deranged", "num-conv", @@ -1954,9 +1974,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3" [[package]] name = "time-macros" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774" +checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf" dependencies = [ "num-conv", "time-core", @@ -2018,13 +2038,12 @@ dependencies = [ [[package]] name = "tokio-rustls" -version = "0.23.4" +version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" +checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081" dependencies = [ "rustls", "tokio", - "webpki", ] [[package]] @@ -2210,6 +2229,12 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +[[package]] +name = "uuid" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" + [[package]] name = "valuable" version = "0.1.0" @@ -2335,16 +2360,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "webpki" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" -dependencies = [ - "ring 0.17.8", - "untrusted 0.9.0", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/Cargo.toml b/Cargo.toml index a07a1cd..682a1b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -33,5 +33,10 @@ tracing-subscriber = { version = "0.3.16", features = ["env-filter"] } atty = "0.2.14" clap = { version = "4.1.8", features = ["derive"] } tokio = { version = "1.26.0", features = ["rt-multi-thread", "rt", "signal", "macros"] } -aws-sdk-s3 = "0.26.0" -aws-config = "0.55.1" + +# aws release of https://github.com/awslabs/aws-sdk-rust/releases/tag/release-2023-10-26 +aws-sdk-s3 = "0.34.0" +aws-config = "0.56.1" + +[dev-dependencies] +pretty_assertions = "1.0" From e68b3b358f484007de5a45d66e74dea1338c8d5c Mon Sep 17 00:00:00 2001 From: klensy Date: Wed, 9 Oct 2024 13:44:06 +0300 Subject: [PATCH 2/6] update aho-corasick --- Cargo.lock | 17 ++++------------- Cargo.toml | 2 +- src/extract.rs | 4 ++-- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8bc1661..e91770b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -17,15 +17,6 @@ version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" -[[package]] -name = "aho-corasick" -version = "0.7.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac" -dependencies = [ - "memchr", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -1474,7 +1465,7 @@ version = "1.10.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" dependencies = [ - "aho-corasick 1.1.3", + "aho-corasick", "memchr", "regex-automata 0.4.6", "regex-syntax 0.8.2", @@ -1495,7 +1486,7 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" dependencies = [ - "aho-corasick 1.1.3", + "aho-corasick", "memchr", "regex-syntax 0.8.2", ] @@ -1586,7 +1577,7 @@ dependencies = [ name = "rust-log-analyzer" version = "0.1.0" dependencies = [ - "aho-corasick 0.7.20", + "aho-corasick", "anyhow", "atomicwrites", "atty", diff --git a/Cargo.toml b/Cargo.toml index 682a1b8..9f0575e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" edition = "2021" [dependencies] -aho-corasick = "0.7" +aho-corasick = "1.1" atomicwrites = "0.4" bincode = "1.0" brotli = "3.3" diff --git a/src/extract.rs b/src/extract.rs index aede22a..2f5460d 100644 --- a/src/extract.rs +++ b/src/extract.rs @@ -36,13 +36,13 @@ static IGNORE_BLOCK: &[(&str, &str)] = &[ lazy_static! { static ref IGNORE_BLOCK_START: AhoCorasick = - AhoCorasick::new(IGNORE_BLOCK.iter().map(|x| &x.0).cloned()); + AhoCorasick::new(IGNORE_BLOCK.iter().map(|x| &x.0).cloned()).unwrap(); } lazy_static! { static ref IGNORE_BLOCK_END: Vec = IGNORE_BLOCK .iter() - .map(|&s| AhoCorasick::new(iter::once(s.1))) + .map(|&s| AhoCorasick::new(iter::once(s.1)).unwrap()) .collect(); } From 718abfe7aae26a3b040a5added5b0c2b8c362d12 Mon Sep 17 00:00:00 2001 From: klensy Date: Wed, 9 Oct 2024 15:52:56 +0300 Subject: [PATCH 3/6] precommit test and add pretty_assertions --- Cargo.lock | 23 ++++++++ tests/test.rs | 65 +++++++++++++++++++++ tests/test_missing_line.txt | 109 ++++++++++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 tests/test.rs create mode 100644 tests/test_missing_line.txt diff --git a/Cargo.lock b/Cargo.lock index e91770b..4b8e0c8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -794,6 +794,12 @@ dependencies = [ "powerfmt", ] +[[package]] +name = "diff" +version = "0.1.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8" + [[package]] name = "digest" version = "0.10.7" @@ -1441,6 +1447,16 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391" +[[package]] +name = "pretty_assertions" +version = "1.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ae130e2f271fbc2ac3a40fb1d07180839cdbbe443c7a27e1e3c13c5cac0116d" +dependencies = [ + "diff", + "yansi", +] + [[package]] name = "proc-macro2" version = "1.0.79" @@ -1595,6 +1611,7 @@ dependencies = [ "hyper", "lazy_static", "percent-encoding", + "pretty_assertions", "regex", "reqwest", "serde", @@ -2530,6 +2547,12 @@ version = "0.13.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4" +[[package]] +name = "yansi" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfe53a6657fd280eaa890a3bc59152892ffa3e30101319d168b781ed6529b049" + [[package]] name = "zeroize" version = "1.7.0" diff --git a/tests/test.rs b/tests/test.rs new file mode 100644 index 0000000..4971eca --- /dev/null +++ b/tests/test.rs @@ -0,0 +1,65 @@ +use pretty_assertions::assert_eq; + +use std::path::Path; + +use rust_log_analyzer as rla; + +const TEST_LOCATION: &str = concat!(env!("CARGO_MANIFEST_DIR"), "/tests"); + +#[test] +fn test_missing_line() { + let log = std::fs::read(Path::new(TEST_LOCATION).join("test_missing_line.txt")).unwrap(); + let lines = rla::sanitize::split_lines(&log) + .iter() + .map(|l| { + rla::index::Sanitized(rla::sanitize::clean( + &rla::ci::GitHubActions::new("DUMMY_TOKEN"), + l, + )) + }) + .collect::>(); + let blocks = rla::extract::extract( + &rla::extract::Config::default(), + &rla::index::Index::default(), + &lines, + ); + + let expected = r###"Current runner version: '2.320.0' +Runner name: 'ubuntu-20.04-4core-16gb_f6653e6045ce' +Runner group name: 'Default Larger Runners' +Machine name: 'runner' +##[group]Operating System +Ubuntu +LTS +LTS +##[endgroup] +##[group]Runner Image +Image: ubuntu-20.04 +Version: 20240922.1.0 +Included Software: https://github.com/actions/runner-images/blob/ubuntu20/20240922.1/images/ubuntu/Ubuntu2004-Readme.md +Image Release: https://github.com/actions/runner-images/releases/tag/ubuntu20%2F20240922.1 +##[endgroup] +##[group]GITHUB_TOKEN Permissions +Contents: read +Metadata: read +Packages: read +##[endgroup] +Secret source: None +Prepare workflow directory +Prepare all required actions +Getting action download info +Download action repository 'msys2/setup-msys2@v2.22.0' (SHA:cc11e9188b693c2b100158c3322424c4cc1dadea) +Download action repository 'actions/checkout@v4' (SHA:eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) +Download action repository 'actions/upload-artifact@v4' (SHA:604373da6381bf24206979c74d06a550515601b9) +Complete job name: PR - mingw-check +##[group]Run git config --global core.autocrlf false +git config --global core.autocrlf false +shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}"###; + + let actual = blocks[0] + .iter() + .map(|line| String::from_utf8_lossy(&line.0).into_owned()) + .collect::>() + .join("\n"); + assert_eq!(actual, expected); +} diff --git a/tests/test_missing_line.txt b/tests/test_missing_line.txt new file mode 100644 index 0000000..781a9c3 --- /dev/null +++ b/tests/test_missing_line.txt @@ -0,0 +1,109 @@ +2024-10-08T13:24:44.9714395Z Current runner version: '2.320.0' +2024-10-08T13:24:44.9720211Z Runner name: 'ubuntu-20.04-4core-16gb_f6653e6045ce' +2024-10-08T13:24:44.9721030Z Runner group name: 'Default Larger Runners' +2024-10-08T13:24:44.9721819Z Machine name: 'runner' +2024-10-08T13:24:44.9737572Z ##[group]Operating System +2024-10-08T13:24:44.9738426Z Ubuntu +2024-10-08T13:24:44.9738831Z 20.04.6 +2024-10-08T13:24:44.9739117Z LTS +2024-10-08T13:24:44.9739465Z ##[endgroup] +2024-10-08T13:24:44.9739831Z ##[group]Runner Image +2024-10-08T13:24:44.9740250Z Image: ubuntu-20.04 +2024-10-08T13:24:44.9740641Z Version: 20240922.1.0 +2024-10-08T13:24:44.9741642Z Included Software: https://github.com/actions/runner-images/blob/ubuntu20/20240922.1/images/ubuntu/Ubuntu2004-Readme.md +2024-10-08T13:24:44.9743054Z Image Release: https://github.com/actions/runner-images/releases/tag/ubuntu20%2F20240922.1 +2024-10-08T13:24:44.9743919Z ##[endgroup] +2024-10-08T13:24:44.9758386Z ##[group]GITHUB_TOKEN Permissions +2024-10-08T13:24:44.9760178Z Contents: read +2024-10-08T13:24:44.9760679Z Metadata: read +2024-10-08T13:24:44.9761095Z Packages: read +2024-10-08T13:24:44.9761458Z ##[endgroup] +2024-10-08T13:24:44.9764576Z Secret source: None +2024-10-08T13:24:44.9765223Z Prepare workflow directory +2024-10-08T13:24:45.0790330Z Prepare all required actions +2024-10-08T13:24:45.0951557Z Getting action download info +2024-10-08T13:24:45.2809779Z Download action repository 'msys2/setup-msys2@v2.22.0' (SHA:cc11e9188b693c2b100158c3322424c4cc1dadea) +2024-10-08T13:24:45.7529926Z Download action repository 'actions/checkout@v4' (SHA:eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871) +2024-10-08T13:24:46.0510433Z Download action repository 'actions/upload-artifact@v4' (SHA:604373da6381bf24206979c74d06a550515601b9) +2024-10-08T13:24:46.6497915Z Complete job name: PR - mingw-check +2024-10-08T13:24:46.7427541Z ##[group]Run git config --global core.autocrlf false +2024-10-08T13:24:46.7428446Z git config --global core.autocrlf false +2024-10-08T13:24:46.7460563Z shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0} +2024-10-08T13:24:46.7461452Z env: +2024-10-08T13:24:46.7462007Z TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate +2024-10-08T13:24:46.7462649Z TOOLSTATE_REPO_ACCESS_TOKEN: +2024-10-08T13:24:46.7463065Z CI_JOB_NAME: mingw-check +2024-10-08T13:24:46.7463438Z CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse +2024-10-08T13:24:46.7463988Z HEAD_SHA: 8c5b0edbe8c46fc2cd42de2cfc4cce2790262401 +2024-10-08T13:24:46.7464778Z DOCKER_TOKEN: *** +2024-10-08T13:24:46.7465139Z SCCACHE_BUCKET: rust-lang-ci-sccache2 +2024-10-08T13:24:46.7465637Z CACHE_DOMAIN: ci-caches.rust-lang.org +2024-10-08T13:24:46.7466055Z ##[endgroup] +2024-10-08T13:24:47.1799712Z ##[group]Run actions/checkout@v4 +2024-10-08T13:24:47.1800134Z with: +2024-10-08T13:24:47.1800369Z fetch-depth: 2 +2024-10-08T13:24:47.1800641Z repository: rust-lang/rust +2024-10-08T13:24:47.1801140Z token: *** +2024-10-08T13:24:47.1801377Z ssh-strict: true +2024-10-08T13:24:47.1801626Z ssh-user: git +2024-10-08T13:24:47.1801876Z persist-credentials: true +2024-10-08T13:24:47.1802183Z clean: true +2024-10-08T13:24:47.1802438Z sparse-checkout-cone-mode: true +2024-10-08T13:24:47.1802751Z fetch-tags: false +2024-10-08T13:24:47.1802996Z show-progress: true +2024-10-08T13:24:47.1803253Z lfs: false +2024-10-08T13:24:47.1803479Z submodules: false +2024-10-08T13:24:47.1803724Z set-safe-directory: true +2024-10-08T13:24:47.1804006Z env: +2024-10-08T13:24:47.1804400Z TOOLSTATE_REPO: https://github.com/rust-lang-nursery/rust-toolstate +2024-10-08T13:24:47.1804896Z TOOLSTATE_REPO_ACCESS_TOKEN: +2024-10-08T13:24:47.1805217Z CI_JOB_NAME: mingw-check +2024-10-08T13:24:47.1805672Z CARGO_REGISTRIES_CRATES_IO_PROTOCOL: sparse +2024-10-08T13:24:47.1806109Z HEAD_SHA: 8c5b0edbe8c46fc2cd42de2cfc4cce2790262401 +2024-10-08T13:24:47.1806629Z DOCKER_TOKEN: *** +2024-10-08T13:24:47.1806904Z SCCACHE_BUCKET: rust-lang-ci-sccache2 +2024-10-08T13:24:47.1807265Z CACHE_DOMAIN: ci-caches.rust-lang.org +2024-10-08T13:24:47.1807593Z ##[endgroup] +2024-10-08T13:24:47.2929497Z Syncing repository: rust-lang/rust +2024-10-08T13:24:47.2931117Z ##[group]Getting Git version info +2024-10-08T13:24:47.2931684Z Working directory is '/home/runner/work/rust/rust' +2024-10-08T13:24:47.2932381Z [command]/usr/bin/git version +2024-10-08T13:24:47.2932678Z git version 2.46.1 +2024-10-08T13:24:47.2933764Z ##[endgroup] +2024-10-08T13:24:47.2945100Z Copying '/home/runner/.gitconfig' to '/home/runner/work/_temp/23e68be9-1b8b-4b10-8ace-ed08cab47f1e/.gitconfig' +2024-10-08T13:24:47.2951942Z Temporarily overriding HOME='/home/runner/work/_temp/23e68be9-1b8b-4b10-8ace-ed08cab47f1e' before making global git config changes +2024-10-08T13:24:47.2953149Z Adding repository directory to the temporary git global config as a safe directory +2024-10-08T13:24:47.2957354Z [command]/usr/bin/git config --global --add safe.directory /home/runner/work/rust/rust +2024-10-08T13:24:47.2987507Z Deleting the contents of '/home/runner/work/rust/rust' +2024-10-08T13:24:47.2990999Z ##[group]Initializing the repository +2024-10-08T13:24:47.2995629Z [command]/usr/bin/git init /home/runner/work/rust/rust +2024-10-08T13:24:47.3680602Z hint: Using 'master' as the name for the initial branch. This default branch name +2024-10-08T13:24:47.3681927Z hint: is subject to change. To configure the initial branch name to use in all +2024-10-08T13:24:47.3683101Z hint: of your new repositories, which will suppress this warning, call: +2024-10-08T13:24:47.3683909Z hint: +2024-10-08T13:24:47.3684561Z hint: git config --global init.defaultBranch +2024-10-08T13:24:47.3685224Z hint: +2024-10-08T13:24:47.3685726Z hint: Names commonly chosen instead of 'master' are 'main', 'trunk' and +2024-10-08T13:24:47.3686482Z hint: 'development'. The just-created branch can be renamed via this command: +2024-10-08T13:24:47.3686984Z hint: +2024-10-08T13:24:47.3687251Z hint: git branch -m +2024-10-08T13:24:47.3687907Z Initialized empty Git repository in /home/runner/work/rust/rust/.git/ +2024-10-08T13:24:47.3694337Z [command]/usr/bin/git remote add origin https://github.com/rust-lang/rust +2024-10-08T13:24:47.3788184Z ##[endgroup] +2024-10-08T13:24:47.3789110Z ##[group]Disabling automatic garbage collection +2024-10-08T13:24:47.3793450Z [command]/usr/bin/git config --local gc.auto 0 +2024-10-08T13:24:47.3821131Z ##[endgroup] +2024-10-08T13:24:47.3821981Z ##[group]Setting up auth +2024-10-08T13:24:47.3828842Z [command]/usr/bin/git config --local --name-only --get-regexp core\.sshCommand +2024-10-08T13:24:47.3859866Z [command]/usr/bin/git submodule foreach --recursive sh -c "git config --local --name-only --get-regexp 'core\.sshCommand' && git config --local --unset-all 'core.sshCommand' || :" +2024-10-08T13:24:47.7730825Z [command]/usr/bin/git config --local --name-only --get-regexp http\.https\:\/\/github\.com\/\.extraheader +2024-10-08T13:24:47.7758099Z [command]/usr/bin/git submodule foreach --recursive sh -c "git config --local --name-only --get-regexp 'http\.https\:\/\/github\.com\/\.extraheader' && git config --local --unset-all 'http.https://github.com/.extraheader' || :" +2024-10-08T13:24:47.7977189Z [command]/usr/bin/git config --local http.https://github.com/.extraheader AUTHORIZATION: basic *** +2024-10-08T13:24:47.8011736Z ##[endgroup] +2024-10-08T13:24:47.8012475Z ##[group]Fetching the repository +2024-10-08T13:24:47.8020846Z [command]/usr/bin/git -c protocol.version=2 fetch --no-tags --prune --no-recurse-submodules --depth=2 origin +d7844ebeec0d4ff6b742a4f303ec63e2bfe74a0e:refs/remotes/pull/131375/merge +2024-10-08T13:24:53.8717035Z From https://github.com/rust-lang/rust +2024-10-08T13:24:53.8718509Z * [new ref] d7844ebeec0d4ff6b742a4f303ec63e2bfe74a0e -> pull/131375/merge +2024-10-08T13:24:53.8739637Z ##[endgroup] +2024-10-08T13:24:53.8740518Z ##[group]Determining the checkout info +2024-10-08T13:24:53.8741825Z ##[endgroup] From eaddfee2f1c0a0bc5ef43ad02f6b8cd56ffe6bab Mon Sep 17 00:00:00 2001 From: klensy Date: Wed, 9 Oct 2024 16:58:07 +0300 Subject: [PATCH 4/6] convert ifs with state transitions into match, to simplify debugging --- src/extract.rs | 134 ++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/src/extract.rs b/src/extract.rs index 2f5460d..561cb8f 100644 --- a/src/extract.rs +++ b/src/extract.rs @@ -129,97 +129,97 @@ pub fn extract<'i, I: IndexData + 'i>( continue; } - if let State::Ignoring(a) = state { - if a.find(lines[i].line.sanitized()).is_some() { - state = State::SearchingSectionStart; - } - - i += 1; - continue; - } - - if let State::SearchingSectionStart = state { - if lines[i].score > config.block_separator_max_score { - state = State::SearchingOutlier; - section_start = i; - } else { - if trailing_context > 0 { - trailing_context -= 1; - blocks.last_mut().unwrap().push(lines[i].line); - prev_section_end = i; + match state { + State::Ignoring(a) => { + if a.find(lines[i].line.sanitized()).is_some() { + state = State::SearchingSectionStart; } i += 1; continue; } - } - if let State::SearchingOutlier = state { - if lines[i].score <= config.block_separator_max_score { - if trailing_context > 0 { - trailing_context -= 1; - blocks.last_mut().unwrap().push(lines[i].line); - prev_section_end = i; - } + State::SearchingSectionStart => { + if lines[i].score > config.block_separator_max_score { + state = State::SearchingOutlier; + section_start = i; + } else { + if trailing_context > 0 { + trailing_context -= 1; + blocks.last_mut().unwrap().push(lines[i].line); + prev_section_end = i; + } - state = State::SearchingSectionStart; - i += 1; - continue; + i += 1; + continue; + } } - if lines[i].score >= config.unique_line_min_score { - trailing_context = 0; + State::SearchingOutlier => { + if lines[i].score <= config.block_separator_max_score { + if trailing_context > 0 { + trailing_context -= 1; + blocks.last_mut().unwrap().push(lines[i].line); + prev_section_end = i; + } + + state = State::SearchingSectionStart; + i += 1; + continue; + } - let start_printing; + if lines[i].score >= config.unique_line_min_score { + trailing_context = 0; - if prev_section_end + config.block_merge_distance >= section_start { - if !blocks.is_empty() { - let last_idx = blocks.len() - 1; - active_block = blocks.remove(last_idx); + let start_printing; + + if prev_section_end + config.block_merge_distance >= section_start { + if !blocks.is_empty() { + let last_idx = blocks.len() - 1; + active_block = blocks.remove(last_idx); + } + start_printing = prev_section_end; + } else { + start_printing = section_start.saturating_sub(config.context_lines); } - start_printing = prev_section_end; + + for j in start_printing..i { + active_block.push(lines[j].line); + } + + state = State::Printing; } else { - start_printing = section_start.saturating_sub(config.context_lines); - } + if trailing_context > 0 { + trailing_context -= 1; + blocks.last_mut().unwrap().push(lines[i].line); + prev_section_end = i; + + // No need to update section_start since we'll trigger the `merge` case above + // anyway (prev_section_end >= section_start). + } - for j in start_printing..i { - active_block.push(lines[j].line); + i += 1; + continue; } + } - state = State::Printing; - } else { - if trailing_context > 0 { - trailing_context -= 1; - blocks.last_mut().unwrap().push(lines[i].line); + State::Printing => { + if lines[i].score <= config.block_separator_max_score { + if !active_block.is_empty() { + blocks.push(mem::replace(&mut active_block, vec![])); + } prev_section_end = i; + state = State::SearchingSectionStart; - // No need to update section_start since we'll trigger the `merge` case above - // anyway (prev_section_end >= section_start). + trailing_context = config.context_lines; + } else { + active_block.push(lines[i].line); } i += 1; continue; } } - - if let State::Printing = state { - if lines[i].score <= config.block_separator_max_score { - if !active_block.is_empty() { - blocks.push(mem::replace(&mut active_block, vec![])); - } - prev_section_end = i; - state = State::SearchingSectionStart; - - trailing_context = config.context_lines; - } else { - active_block.push(lines[i].line); - } - - i += 1; - continue; - } - - unreachable!(); } if !active_block.is_empty() { From 04dd84c0f8e8424f7c9d21d344be9a9086bf3d48 Mon Sep 17 00:00:00 2001 From: klensy Date: Wed, 9 Oct 2024 17:11:52 +0300 Subject: [PATCH 5/6] fix missing/duped line case --- src/extract.rs | 6 +++++- tests/test.rs | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/extract.rs b/src/extract.rs index 561cb8f..0d83132 100644 --- a/src/extract.rs +++ b/src/extract.rs @@ -178,7 +178,10 @@ pub fn extract<'i, I: IndexData + 'i>( let last_idx = blocks.len() - 1; active_block = blocks.remove(last_idx); } - start_printing = prev_section_end; + // prev_section_end' line already contained in some block, so start + // from next one. (Except from case from State::Printing and empty active_block, + // idk?). + start_printing = prev_section_end + 1; } else { start_printing = section_start.saturating_sub(config.context_lines); } @@ -206,6 +209,7 @@ pub fn extract<'i, I: IndexData + 'i>( State::Printing => { if lines[i].score <= config.block_separator_max_score { if !active_block.is_empty() { + active_block.push(lines[i].line); blocks.push(mem::replace(&mut active_block, vec![])); } prev_section_end = i; diff --git a/tests/test.rs b/tests/test.rs index 4971eca..433da2b 100644 --- a/tests/test.rs +++ b/tests/test.rs @@ -30,7 +30,7 @@ Runner group name: 'Default Larger Runners' Machine name: 'runner' ##[group]Operating System Ubuntu -LTS +20.04.6 LTS ##[endgroup] ##[group]Runner Image From 3cca4c843d7a1e0f264bd2acc45c2b4581a15d78 Mon Sep 17 00:00:00 2001 From: klensy Date: Wed, 5 Mar 2025 11:00:16 +0300 Subject: [PATCH 6/6] resolve more cargo audit Crate: openssl Version: 0.10.66 Title: ssl::select_next_proto use after free Date: 2025-02-02 ID: RUSTSEC-2025-0004 URL: https://rustsec.org/advisories/RUSTSEC-2025-0004 Solution: Upgrade to >=0.10.70 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4b8e0c8..eb66cce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1343,9 +1343,9 @@ checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" -version = "0.10.66" +version = "0.10.71" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" +checksum = "5e14130c6a98cd258fdcb0fb6d744152343ff729cbfcb28c656a9d12b999fbcd" dependencies = [ "bitflags 2.5.0", "cfg-if", @@ -1375,9 +1375,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.103" +version = "0.9.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6" +checksum = "8bb61ea9811cc39e3c2069f40b8b8e2e70d8569b361f879786cc7ed48b777cdd" dependencies = [ "cc", "libc",