From 23ec9aeb3669deb39381f9568981233b11f2e70d Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Tue, 12 Sep 2023 10:37:25 -0700 Subject: [PATCH 1/3] chore: tag 0.13.7 --- CHANGELOG.md | 8 ++++++++ Cargo.lock | 14 +++++++------- syncserver-common/Cargo.toml | 2 +- syncserver-db-common/Cargo.toml | 2 +- syncserver-settings/Cargo.toml | 2 +- syncserver/Cargo.toml | 2 +- syncstorage-settings/Cargo.toml | 2 +- tokenserver-common/Cargo.toml | 2 +- tokenserver-settings/Cargo.toml | 2 +- 9 files changed, 22 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d9a80a77..e080695d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ + +## 0.13.7 (2023-09-12) + + +* Re-tag 0.13.6 + + + ## 0.13.6 (2023-03-07) diff --git a/Cargo.lock b/Cargo.lock index 00406a87..6a38f033 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3043,7 +3043,7 @@ dependencies = [ [[package]] name = "syncserver" -version = "0.13.6" +version = "0.13.7" dependencies = [ "actix-cors", "actix-http", @@ -3115,7 +3115,7 @@ dependencies = [ [[package]] name = "syncserver-common" -version = "0.13.6" +version = "0.13.7" dependencies = [ "hkdf", "sha2", @@ -3123,7 +3123,7 @@ dependencies = [ [[package]] name = "syncserver-db-common" -version = "0.13.6" +version = "0.13.7" dependencies = [ "async-trait", "backtrace", @@ -3145,7 +3145,7 @@ dependencies = [ [[package]] name = "syncserver-settings" -version = "0.13.6" +version = "0.13.7" dependencies = [ "config 0.11.0", "num_cpus", @@ -3159,7 +3159,7 @@ dependencies = [ [[package]] name = "syncstorage-settings" -version = "0.13.6" +version = "0.13.7" dependencies = [ "rand 0.8.5", "serde 1.0.135", @@ -3339,7 +3339,7 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" [[package]] name = "tokenserver-common" -version = "0.13.6" +version = "0.13.7" dependencies = [ "actix-web", "backtrace", @@ -3352,7 +3352,7 @@ dependencies = [ [[package]] name = "tokenserver-settings" -version = "0.13.6" +version = "0.13.7" dependencies = [ "serde 1.0.135", "tokenserver-common", diff --git a/syncserver-common/Cargo.toml b/syncserver-common/Cargo.toml index 2ceb8e86..2303e3fd 100644 --- a/syncserver-common/Cargo.toml +++ b/syncserver-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "syncserver-common" -version = "0.13.6" +version = "0.13.7" edition = "2021" [dependencies] diff --git a/syncserver-db-common/Cargo.toml b/syncserver-db-common/Cargo.toml index 23775087..3ee7425b 100644 --- a/syncserver-db-common/Cargo.toml +++ b/syncserver-db-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "syncserver-db-common" -version = "0.13.6" +version = "0.13.7" edition = "2021" [dependencies] diff --git a/syncserver-settings/Cargo.toml b/syncserver-settings/Cargo.toml index 3145ba09..839e7bc6 100644 --- a/syncserver-settings/Cargo.toml +++ b/syncserver-settings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "syncserver-settings" -version = "0.13.6" +version = "0.13.7" edition = "2021" [dependencies] diff --git a/syncserver/Cargo.toml b/syncserver/Cargo.toml index 916969e4..de269bc5 100644 --- a/syncserver/Cargo.toml +++ b/syncserver/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "syncserver" -version = "0.13.6" +version = "0.13.7" license = "MPL-2.0" authors = [ "Ben Bangert ", diff --git a/syncstorage-settings/Cargo.toml b/syncstorage-settings/Cargo.toml index 97503404..bca756fa 100644 --- a/syncstorage-settings/Cargo.toml +++ b/syncstorage-settings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "syncstorage-settings" -version = "0.13.6" +version = "0.13.7" edition = "2021" [dependencies] diff --git a/tokenserver-common/Cargo.toml b/tokenserver-common/Cargo.toml index 6e924ac8..f0e8f0ec 100644 --- a/tokenserver-common/Cargo.toml +++ b/tokenserver-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tokenserver-common" -version = "0.13.6" +version = "0.13.7" edition = "2021" [dependencies] diff --git a/tokenserver-settings/Cargo.toml b/tokenserver-settings/Cargo.toml index ccacd23f..591c932f 100644 --- a/tokenserver-settings/Cargo.toml +++ b/tokenserver-settings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tokenserver-settings" -version = "0.13.6" +version = "0.13.7" edition = "2021" [dependencies] From 0ccaa4ed0205d57c12d3c86b38ffda0a27653f9d Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Tue, 12 Sep 2023 11:32:03 -0700 Subject: [PATCH 2/3] chore: bump the rust version and some crates per the latest cargo audit requiring rust >= 1.65 bump openssl per multiple RUSTSECs and ignore the h2 and webpki audits --- .cargo/audit.toml | 1 + .circleci/config.yml | 4 ++-- Cargo.lock | 47 ++++++++++++++++++++++++++++++-------------- Dockerfile | 3 ++- 4 files changed, 37 insertions(+), 18 deletions(-) diff --git a/.cargo/audit.toml b/.cargo/audit.toml index 5d299077..08df02c4 100644 --- a/.cargo/audit.toml +++ b/.cargo/audit.toml @@ -6,4 +6,5 @@ ignore = [ "RUSTSEC-2020-0159", "RUSTSEC-2020-0071", "RUSTSEC-2021-0124", + "RUSTSEC-2023-0034", # Bound by actix-http 2.2, Reqwest 0.10 ] diff --git a/.circleci/config.yml b/.circleci/config.yml index f13e3629..be668990 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -160,7 +160,7 @@ commands: jobs: checks: docker: - - image: cimg/rust:1.65.0 + - image: cimg/rust:1.72.0 auth: username: $DOCKER_USER password: $DOCKER_PASS @@ -176,7 +176,7 @@ jobs: build-and-test: docker: - - image: cimg/rust:1.65.0 + - image: cimg/rust:1.72.0 auth: username: $DOCKER_USER password: $DOCKER_PASS diff --git a/Cargo.lock b/Cargo.lock index 6a38f033..09a5318b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,7 +8,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "78d1833b3838dbe990df0f1f87baf640cf6146e898166afe401839d1b001e570" dependencies = [ - "bitflags", + "bitflags 1.3.2", "bytes 0.5.6", "futures-core", "futures-sink", @@ -64,7 +64,7 @@ dependencies = [ "actix-threadpool", "actix-utils", "base64 0.13.0", - "bitflags", + "bitflags 1.3.2", "brotli", "bytes 0.5.6", "cookie", @@ -216,7 +216,7 @@ dependencies = [ "actix-codec", "actix-rt", "actix-service", - "bitflags", + "bitflags 1.3.2", "bytes 0.5.6", "either", "futures-channel", @@ -446,7 +446,7 @@ version = "0.57.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", @@ -465,6 +465,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" + [[package]] name = "bitmaps" version = "2.1.0" @@ -1089,7 +1095,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fuchsia-zircon-sys", ] @@ -1654,7 +1660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6607c62aa161d23d17a9072cc5da0be67cdfc89d3afb1e8d9c842bebc2525ffe" dependencies = [ "arrayvec", - "bitflags", + "bitflags 1.3.2", "cfg-if 1.0.0", "ryu", "static_assertions", @@ -1987,18 +1993,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.0", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -2007,11 +2025,10 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ - "autocfg", "cc", "libc", "pkg-config", @@ -2355,7 +2372,7 @@ version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2492,7 +2509,7 @@ version = "0.36.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fd5c6ff11fecd55b40746d1995a02f2eb375bf8c00d192d521ee09f42bef37bc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno", "io-lifetimes", "libc", @@ -2575,7 +2592,7 @@ version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d09d3c15d814eda1d6a836f2f2b56a6abc1446c8a34351cb3180d3db92ffe4ce" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", diff --git a/Dockerfile b/Dockerfile index 7a613456..38f608b2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM rust:1.65-buster as builder +# NOTE: Ensure builder's Rust version matches CI's in .circleci/config.yml +FROM rust:1.72-buster as builder WORKDIR /app ADD . /app ENV PATH=$PATH:/root/.cargo/bin From dc98e95ff3a59c267df7807ce9320d8b5a348b63 Mon Sep 17 00:00:00 2001 From: Philip Jenvey Date: Mon, 25 Sep 2023 12:24:16 -0700 Subject: [PATCH 3/3] refactor: quiet latest clippy warnings --- syncserver/src/web/middleware/sentry.rs | 2 +- syncstorage-db/src/tests/db.rs | 2 +- syncstorage-mysql/src/models.rs | 2 ++ syncstorage-spanner/src/models.rs | 3 +++ tokenserver-db/src/models.rs | 2 ++ 5 files changed, 9 insertions(+), 2 deletions(-) diff --git a/syncserver/src/web/middleware/sentry.rs b/syncserver/src/web/middleware/sentry.rs index 6fff74a1..424a8d63 100644 --- a/syncserver/src/web/middleware/sentry.rs +++ b/syncserver/src/web/middleware/sentry.rs @@ -22,7 +22,7 @@ pub fn report( extra: HashMap, mut event: Event<'static>, ) { - event.tags.extend(tags.into_iter()); + event.tags.extend(tags); event .extra .extend(extra.into_iter().map(|(k, v)| (k, Value::from(v)))); diff --git a/syncstorage-db/src/tests/db.rs b/syncstorage-db/src/tests/db.rs index e1a00a84..4e479d09 100644 --- a/syncstorage-db/src/tests/db.rs +++ b/syncstorage-db/src/tests/db.rs @@ -866,7 +866,7 @@ async fn get_bsos() -> Result<(), DbError> { let uid = 2; let coll = "clients"; - let sortindexes = vec![1, 3, 4, 2, 0]; + let sortindexes = [1, 3, 4, 2, 0]; for (i, (revi, sortindex)) in sortindexes.iter().enumerate().rev().enumerate() { let bso = pbso( uid, diff --git a/syncstorage-mysql/src/models.rs b/syncstorage-mysql/src/models.rs index a5cb255c..3ff2793a 100644 --- a/syncstorage-mysql/src/models.rs +++ b/syncstorage-mysql/src/models.rs @@ -130,6 +130,8 @@ impl MysqlDb { conn: LoggingConnection::new(conn), session: RefCell::new(Default::default()), }; + // https://github.com/mozilla-services/syncstorage-rs/issues/1480 + #[allow(clippy::arc_with_non_send_sync)] MysqlDb { inner: Arc::new(inner), coll_cache, diff --git a/syncstorage-spanner/src/models.rs b/syncstorage-spanner/src/models.rs index fd7c73a8..fb56702d 100644 --- a/syncstorage-spanner/src/models.rs +++ b/syncstorage-spanner/src/models.rs @@ -113,6 +113,9 @@ impl SpannerDb { session: RefCell::new(Default::default()), }; SpannerDb { + // We can probably move this to Rc: + // https://github.com/mozilla-services/syncstorage-rs/issues/1480 + #[allow(clippy::arc_with_non_send_sync)] inner: Arc::new(inner), coll_cache, metrics: metrics.clone(), diff --git a/tokenserver-db/src/models.rs b/tokenserver-db/src/models.rs index f1cc51de..e7832831 100644 --- a/tokenserver-db/src/models.rs +++ b/tokenserver-db/src/models.rs @@ -76,6 +76,8 @@ impl TokenserverDb { conn: LoggingConnection::new(conn), }; + // https://github.com/mozilla-services/syncstorage-rs/issues/1480 + #[allow(clippy::arc_with_non_send_sync)] Self { inner: Arc::new(inner), metrics: metrics.clone(),