From b7ea154e510977257dae822d4643cba845a4e196 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Wed, 4 May 2022 21:21:58 +0900 Subject: [PATCH 1/4] Render 404 when page not found --- src/routes/errors.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/routes/errors.rs b/src/routes/errors.rs index 74dc4dd5..8d69d0b5 100644 --- a/src/routes/errors.rs +++ b/src/routes/errors.rs @@ -21,8 +21,9 @@ impl<'r> Responder<'r> for ErrorPage { warn!("{:?}", self.0); match self.0 { - Error::NotFound => Err(Status::NotFound), - Error::Unauthorized => Err(Status::NotFound), + Error::NotFound | Error::Unauthorized | Error::Db(diesel::result::Error::NotFound) => { + Err(Status::NotFound) + } _ => Err(Status::InternalServerError), } } From 712ee30a1f22d63b8bf8c7c3248d66fd5a9ed2f7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 19:25:29 +0000 Subject: [PATCH 2/4] Bump openssl from 0.10.38 to 0.10.40 Bumps [openssl](https://github.com/sfackler/rust-openssl) from 0.10.38 to 0.10.40. - [Release notes](https://github.com/sfackler/rust-openssl/releases) - [Commits](https://github.com/sfackler/rust-openssl/compare/openssl-v0.10.38...openssl-v0.10.40) --- updated-dependencies: - dependency-name: openssl dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 20 ++++++++++++++++---- plume-common/Cargo.toml | 2 +- plume-models/Cargo.toml | 2 +- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51ebe624..0e0fad77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2825,18 +2825,30 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "fb81a6430ac911acb25fe5ac8f1d2af1b4ea8a4fdfda0f1ee4292af2e2d8eb0e" dependencies = [ "bitflags 1.3.2", "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 1.0.36", + "quote 1.0.15", + "syn 1.0.92", +] + [[package]] name = "openssl-probe" version = "0.1.5" @@ -2845,9 +2857,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.72" +version = "0.9.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e46109c383602735fa0a2e48dd2b7c892b048e1bf69e5c3b1d804b7d9c203cb" +checksum = "9d5fd19fb3e0a8191c1e34935718976a3e70c112ab9a24af6d7cadccd9d90bc0" dependencies = [ "autocfg 1.0.1", "cc", diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 32db34d3..b14d41ba 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -12,7 +12,7 @@ array_tool = "1.0" base64 = "0.13" heck = "0.4.0" hex = "0.4" -openssl = "0.10.22" +openssl = "0.10.40" rocket = "0.4.6" reqwest = { version = "0.9", features = ["socks"] } serde = "1.0" diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index bb0e8925..925695ed 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -13,7 +13,7 @@ itertools = "0.10.3" lazy_static = "1.0" ldap3 = "0.10.4" migrations_internals= "1.4.0" -openssl = "0.10.22" +openssl = "0.10.40" rocket = "0.4.6" rocket_i18n = "0.4.1" reqwest = "0.9" From 853a1db02872182fde5c3b005f2f4b7f24919cb4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 May 2022 19:25:50 +0000 Subject: [PATCH 3/4] Bump serde_json from 1.0.80 to 1.0.81 Bumps [serde_json](https://github.com/serde-rs/json) from 1.0.80 to 1.0.81. - [Release notes](https://github.com/serde-rs/json/releases) - [Commits](https://github.com/serde-rs/json/compare/v1.0.80...v1.0.81) --- updated-dependencies: - dependency-name: serde_json dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- plume-common/Cargo.toml | 2 +- plume-models/Cargo.toml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 51ebe624..f3a3d6c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4114,9 +4114,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.80" +version = "1.0.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f972498cf015f7c0746cac89ebe1d6ef10c293b94175a243a2d9442c163d9944" +checksum = "9b7ce2b32a1aed03c558dc61a5cd328f15aff2dbc17daad8fb8af04d2100e15c" dependencies = [ "itoa 1.0.1", "ryu", diff --git a/Cargo.toml b/Cargo.toml index 72f3b9c9..3244c1d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,7 @@ rocket_contrib = { version = "0.4.5", features = ["json"] } rocket_i18n = "0.4.1" scheduled-thread-pool = "0.2.2" serde = "1.0" -serde_json = "1.0.80" +serde_json = "1.0.81" shrinkwraprs = "0.3.0" validator = { version = "0.15", features = ["derive"] } webfinger = "0.4.1" diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 32db34d3..4ad24744 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -17,7 +17,7 @@ rocket = "0.4.6" reqwest = { version = "0.9", features = ["socks"] } serde = "1.0" serde_derive = "1.0" -serde_json = "1.0.80" +serde_json = "1.0.81" shrinkwraprs = "0.3.0" syntect = "4.5.0" tokio = "0.1.22" diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index bb0e8925..ad5a66ed 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -20,7 +20,7 @@ reqwest = "0.9" scheduled-thread-pool = "0.2.2" serde = "1.0" serde_derive = "1.0" -serde_json = "1.0.80" +serde_json = "1.0.81" tantivy = "0.13.3" url = "2.1" walkdir = "2.2" From f06f444a134a35ea7f20fc73a26358b86d9c2ff1 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Thu, 5 May 2022 11:28:22 +0900 Subject: [PATCH 4/4] Update CircleCI image See https://discuss.circleci.com/t/legacy-convenience-image-deprecation/41034 --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cd7f2d06..d6b208ec 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ executors: default: false docker: - image: plumeorg/plume-buildenv:v0.4.0 - - image: <<#parameters.postgres>>circleci/postgres:9.6-alpine<><<^parameters.postgres>>alpine:latest<> + - image: <<#parameters.postgres>>cimg/postgres:14.2<><<^parameters.postgres>>alpine:latest<> environment: POSTGRES_USER: postgres POSTGRES_DB: plume