Merge remote-tracking branch 'origin/main' into fix-timeout

.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>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
+    - image: <<#parameters.postgres>>cimg/postgres:14.2<</parameters.postgres>><<^parameters.postgres>>alpine:latest<</parameters.postgres>>
       environment:
         POSTGRES_USER: postgres
         POSTGRES_DB: plume

Cargo.lock

@@ -2924,18 +2924,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"
@@ -2944,9 +2956,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.1.0",
  "cc",
@@ -4275,9 +4287,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",

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"

plume-common/Cargo.toml

@@ -12,12 +12,12 @@ 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.11.10", features = ["blocking", "json", "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"
 regex-syntax = { version = "0.6.17", default-features = false, features = ["unicode-perl"] }

plume-models/Cargo.toml

@@ -13,14 +13,14 @@ 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.11.10"
 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"

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::NotFound | Error::Unauthorized | Error::Db(diesel::result::Error::NotFound) => {
-            Error::Unauthorized => Err(Status::NotFound),
+                Err(Status::NotFound)
+            }
             _ => Err(Status::InternalServerError),
         }
     }