Chore: upgrade dependencies

ilyvion · ilyvion · commit fdd82d8475b3 · 2022-09-04T14:23:11.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -9,8 +9,8 @@ publish = false
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-actix-web = "4.0.0-beta.9"
-actix-http = "3.0.0-beta.9"
+actix-web = "4.1"
+actix-http = "3.2"
 arc-swap = "1.5"
 futures = "0.3"
 anyhow = "1.0"
@@ -19,24 +19,24 @@ pretty_env_logger = "0.4"
 dotenv = "0.15"
 once_cell = "1.8"
 serde = "1.0"
-uuid = { version = "0.8", features = ["serde"] }
+uuid = { version = "1.1", features = ["serde"] }
 chrono = { version = "0.4", features = ["serde"] }
 bitflags = "1.3"
 tokio = "1.12"
 reqwest = { version = "0.11", features = ["json"] }
-scraper = "0.12"
+scraper = "0.13"
 ego-tree = "0.6"
 regex = "1.5"
 const_format = "0.2"
 chrono-tz = "0.6"
-ilyvion-util = { version = "0.6", features = ["chrono"] }
+ilyvion-util = { version = "0.8", features = ["chrono"] }
 actix-web-grants = "3.0.0-beta.3"
 serde_json = "1.0"
 actix-multipart = "0.4.0-beta.6"
 crc32c = "0.6"
 actix-files = "0.6.0-beta.7"
-semval = "0.1"
-parse-display = "0.5"
+semval = "0.4"
+parse-display = "0.6"
 rand = "0.8"
 shared = { path = "./shared" }
 database = { path = "./database" }
diff --git a/Dockerfile b/Dockerfile
@@ -56,9 +56,10 @@ FROM debian:bullseye-slim AS binary
 
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
     ca-certificates
+RUN apt-get clean
 
 COPY --from=build /usr/src/qcext-server/target/release/qcext-server /usr/local/bin/
 COPY --from=build /usr/src/qcext-server/build /build
 
 ENV RUST_LOG=info
-CMD qcext-server
+CMD ["/usr/local/bin/qcext-server"]
diff --git a/src/controllers/api/comic/add_item.rs b/src/controllers/api/comic/add_item.rs
@@ -6,7 +6,7 @@ use anyhow::anyhow;
 use database::models::{Comic as DatabaseComic, Item as DatabaseItem, LogEntry, Occurrence};
 use database::DbPool;
 use parse_display::Display;
-use semval::{context::Context as ValidationContext, Result as ValidationResult, Validate};
+use semval::{context::Context as ValidationContext, Validate};
 use serde::Deserialize;
 use shared::token_permissions;
 
@@ -138,7 +138,7 @@ pub(crate) struct AddItemToComicBody {
 
 impl Validate for AddItemToComicBody {
     type Invalidity = AddItemToComicBodyInvalidity;
-    fn validate(&self) -> ValidationResult<Self::Invalidity> {
+    fn validate(&self) -> semval::ValidationResult<Self::Invalidity> {
         ValidationContext::new()
             .validate_with(&self.comic_id, AddItemToComicBodyInvalidity::ComicId)
             .invalidate_if(
diff --git a/src/controllers/api/comic/remove_item.rs b/src/controllers/api/comic/remove_item.rs
@@ -8,7 +8,7 @@ use database::models::{
 };
 use database::DbPool;
 use parse_display::Display;
-use semval::{context::Context as ValidationContext, Result as ValidationResult, Validate};
+use semval::{context::Context as ValidationContext, Validate};
 use serde::Deserialize;
 use shared::token_permissions;
 
@@ -84,7 +84,7 @@ pub(crate) struct RemoveItemFromComicBody {
 impl Validate for RemoveItemFromComicBody {
     type Invalidity = RemoveItemFromComicBodyInvalidity;
 
-    fn validate(&self) -> ValidationResult<Self::Invalidity> {
+    fn validate(&self) -> semval::ValidationResult<Self::Invalidity> {
         ValidationContext::new()
             .validate_with(&self.comic_id, RemoveItemFromComicBodyInvalidity::ComicId)
             .validate_with(&self.item_id, RemoveItemFromComicBodyInvalidity::ItemId)
diff --git a/src/controllers/api/comic/set_flags.rs b/src/controllers/api/comic/set_flags.rs
@@ -220,7 +220,7 @@ pub(crate) struct SetFlagBody {
 impl Validate for SetFlagBody {
     type Invalidity = SetFlagBodyInvalidity;
 
-    fn validate(&self) -> semval::Result<Self::Invalidity> {
+    fn validate(&self) -> semval::ValidationResult<Self::Invalidity> {
         ValidationContext::new()
             .validate_with(&self.comic_id, SetFlagBodyInvalidity::ComicId)
             .into()
diff --git a/src/controllers/api/comic/set_publish_date.rs b/src/controllers/api/comic/set_publish_date.rs
@@ -95,7 +95,7 @@ pub(crate) struct SetPublishDateBody {
 impl Validate for SetPublishDateBody {
     type Invalidity = SetPublishDateBodyInvalidity;
 
-    fn validate(&self) -> semval::Result<Self::Invalidity> {
+    fn validate(&self) -> semval::ValidationResult<Self::Invalidity> {
         ValidationContext::new()
             .validate_with(&self.comic_id, SetPublishDateBodyInvalidity::ComicId)
             .invalidate_if(
diff --git a/src/controllers/api/comic/set_tagline.rs b/src/controllers/api/comic/set_tagline.rs
@@ -87,7 +87,7 @@ pub(crate) struct SetTaglineBody {
 impl Validate for SetTaglineBody {
     type Invalidity = SetTaglineBodyInvalidity;
 
-    fn validate(&self) -> semval::Result<Self::Invalidity> {
+    fn validate(&self) -> semval::ValidationResult<Self::Invalidity> {
         ValidationContext::new()
             .validate_with(&self.comic_id, SetTaglineBodyInvalidity::ComicId)
             .into()
diff --git a/src/controllers/api/comic/set_title.rs b/src/controllers/api/comic/set_title.rs
@@ -84,7 +84,7 @@ pub(crate) struct SetTitleBody {
 impl Validate for SetTitleBody {
     type Invalidity = SetTitleBodyInvalidity;
 
-    fn validate(&self) -> semval::Result<Self::Invalidity> {
+    fn validate(&self) -> semval::ValidationResult<Self::Invalidity> {
         ValidationContext::new()
             .validate_with(&self.comic_id, SetTitleBodyInvalidity::ComicId)
             .into()
diff --git a/src/controllers/api/item/image_upload.rs b/src/controllers/api/item/image_upload.rs
@@ -23,9 +23,7 @@ pub(crate) async fn image_upload(
     while let Some(item) = image_upload_form.next().await {
         let mut field = item.map_err(error::ErrorBadRequest)?;
 
-        let content_disposition = field.content_disposition().ok_or_else(|| {
-            error::ErrorBadRequest(anyhow!("Content-Disposition header was missing"))
-        })?;
+        let content_disposition = field.content_disposition();
         let name = content_disposition
             .get_name()
             .ok_or_else(|| error::ErrorBadRequest(anyhow!("A form field was missing a name")))?;
diff --git a/src/main.rs b/src/main.rs
@@ -171,6 +171,8 @@ async fn main() -> Result<()> {
     }
 
     let http_server = start_http_server()?;
+    let http_server_handle = http_server.handle();
+    tokio::spawn(http_server);
 
     let ctrl_c = tokio::signal::ctrl_c();
     if shutdown_futures.is_empty() {
@@ -195,7 +197,7 @@ async fn main() -> Result<()> {
     info!("Shutting down HTTP server!");
     let _ = shutdown_sender.send(());
 
-    shutdown_futures.push(Either::Left(http_server.stop(true)));
+    shutdown_futures.push(Either::Left(http_server_handle.stop(true)));
 
     while let Some(either) = shutdown_futures.next().await {
         if let Either::Right(result) = either {
@@ -226,7 +228,7 @@ async fn extract_permissions(request: &mut ServiceRequest) -> Result<Vec<String>
 
             // Now that we've grabbed the payload, we need to restore the payload
             // for the rest of the Actix machinery to do its thing.
-            let mut payload = actix_http::h1::Payload::empty();
+            let (_, mut payload) = actix_http::h1::Payload::create(true);
             payload.unread_data(bytes);
             request.set_payload(payload.into());
 
@@ -253,9 +255,7 @@ async fn extract_permissions(request: &mut ServiceRequest) -> Result<Vec<String>
         .await
         .map_err(error::ErrorInternalServerError)?;
 
-    Ok(
-        DatabaseToken::get_permissions_for_token(&mut conn, token.to_string())
-            .await
-            .map_err(error::ErrorInternalServerError)?,
-    )
+    DatabaseToken::get_permissions_for_token(&mut conn, token.to_string())
+        .await
+        .map_err(error::ErrorInternalServerError)
 }
diff --git a/src/models/comic_id.rs b/src/models/comic_id.rs
@@ -1,5 +1,5 @@
 use parse_display::Display;
-use semval::{context::Context as ValidationContext, Result as ValidationResult, Validate};
+use semval::{context::Context as ValidationContext,  Validate};
 use serde::{Deserialize, Serialize};
 
 #[derive(
@@ -48,7 +48,7 @@ impl TryFrom<i16> for ComicId {
 impl Validate for ComicId {
     type Invalidity = ComicIdInvalidity;
 
-    fn validate(&self) -> ValidationResult<Self::Invalidity> {
+    fn validate(&self) -> semval::ValidationResult<Self::Invalidity> {
         ValidationContext::new()
             .invalidate_if(self.0 < 1, ComicIdInvalidity::MinValue)
             .into()
diff --git a/src/models/item_id.rs b/src/models/item_id.rs
@@ -1,5 +1,5 @@
 use parse_display::Display;
-use semval::{context::Context as ValidationContext, Result as ValidationResult, Validate};
+use semval::{context::Context as ValidationContext, Validate};
 use serde::{Deserialize, Serialize};
 
 #[derive(
@@ -36,7 +36,7 @@ impl From<u16> for ItemId {
 impl Validate for ItemId {
     type Invalidity = ItemIdInvalidity;
 
-    fn validate(&self) -> ValidationResult<Self::Invalidity> {
+    fn validate(&self) -> semval::ValidationResult<Self::Invalidity> {
         ValidationContext::new()
             .invalidate_if(self.0 < 1, ItemIdInvalidity::MinValue)
             .into()
