Merge branch 'master' of github.com:mdcpp/mdoj into staging

Author: Eason0729

Cargo.lock

@@ -37,11 +37,11 @@ version = "0.11.0"
 default-features = false
 
 [workspace.dependencies.sea-orm]
-version = "0.12.11"
+version = "1.0.0"
 default-features = false
 
 [workspace.dependencies.sea-orm-migration]
-version = "0.12.11"
+version = "1.0.0"
 default-features = false
 
 [profile.wasm-release]

Cargo.toml

@@ -19,7 +19,7 @@ futures = "0.3.29"
 bincode = "1.3.3"
 base64 = "0.21.5"
 tonic-web = { workspace = true }
-quick_cache = "0.4.0"
+quick_cache = "0.6.2"
 hickory-resolver = "0.24.0"
 crossbeam-queue = "0.3.8"
 dashmap = "5.5.3"
@@ -36,7 +36,6 @@ opentelemetry-semantic-conventions = "0.16.0"
 tracing-opentelemetry = { version = "0.24.0", features = ["metrics"] }
 tracing-core = "0.1.32"
 migration = { path = "./migration", optional = true }
-sea-orm-cli = { version = "0.12.12", optional = true }
 governor = "0.6.0"
 http = "^0.2"
 lazy_static = "1.5.0"
@@ -69,7 +68,7 @@ version = "^0.4"
 features = ["cors", "trace"]
 
 [dependencies.sea-query]
-version = "0.30.4"
+version = "0.31.0"
 features = ["thread-safe", "with-chrono", "backend-sqlite"]
 
 [dependencies.chrono]
@@ -102,7 +101,8 @@ workspace = true
 features = ["macros", "rt-multi-thread", "full", "time"]
 
 [dependencies.sea-orm]
-version = "0.12.11"
+workspace = true
+default-features = false
 features = [
   "runtime-tokio-rustls",
   "macros",
@@ -124,12 +124,12 @@ version = "0.9.8"
 features = ["mutex", "spin_mutex", "rwlock"]
 
 [dependencies.sea-orm-migration]
-# workspace = true
-version = "0.12.11"
+workspace = true
 optional = true
+default-features = false
 features = ["runtime-tokio-rustls", "sqlx-sqlite", "with-chrono"]
 
 [features]
 default = ["insecure-print"]
-standalone = ["dep:migration", "dep:sea-orm-migration", "dep:sea-orm-cli"]
+standalone = ["dep:migration", "dep:sea-orm-migration"]
 insecure-print = ["sea-orm/debug-print"]

backend/Cargo.toml

@@ -22,7 +22,7 @@ version = "1"
 features = ["attributes", "tokio1"]
 
 [dependencies.sea-orm]
-version = "0.12.11"
+workspace = true
 default-features = false
 features = [
     "runtime-async-std-rustls",
@@ -34,8 +34,7 @@ features = [
 ]
 
 [dependencies.sea-orm-migration]
-# workspace = true
-version = "0.12.11"
+workspace = true
 default-features = true
 features = [
   # Enable at least one `ASYNC_RUNTIME` and `DATABASE_DRIVER` feature if you want to run migration via CLI.

backend/migration/Cargo.toml

@@ -668,17 +668,25 @@ impl MigrationTrait for Migration {
         index!(manager, Problem, AcceptCount);
         index!(manager, Problem, Difficulty);
         index!(manager, Problem, Order);
+        index!(manager, Problem, Content);
+        index!(manager, Problem, Title);
+
         index!(manager, Submit, Committed);
         index!(manager, Submit, Time);
         index!(manager, Submit, Memory);
+        index!(manager, Submit, UserId);
+
         index!(manager, Contest, Hoster);
         index!(manager, Contest, Public);
         index!(manager, Contest, End);
         index!(manager, Contest, Begin);
+
         index!(manager, User, Score);
         index!(manager, User, Username);
+
         index!(manager, Token, Rand);
         index!(manager, Token, Expiry);
+
         index!(manager, Chat, CreateAt);
 
         manager

backend/migration/src/m20231207_000001_create_table.rs

@@ -21,7 +21,7 @@ pub struct Model {
     pub title: String,
     pub content: String,
     pub tags: String,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))", nullable)]
+    #[sea_orm(column_type = "Blob", nullable)]
     pub password: Option<Vec<u8>>,
     #[sea_orm(column_type = "Time")]
     pub create_at: chrono::NaiveDateTime,

backend/src/entity/contest.rs

@@ -17,7 +17,7 @@ pub struct Model {
     pub accuracy: Option<i64>,
     pub committed: bool,
     pub lang: String,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "Blob")]
     pub code: Vec<u8>,
     #[sea_orm(nullable)]
     pub memory: Option<i64>,

backend/src/entity/submit.rs

@@ -9,9 +9,9 @@ pub struct Model {
     pub user_id: i32,
     #[sea_orm(nullable)]
     pub problem_id: Option<i32>,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "Blob")]
     pub input: Vec<u8>,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "Blob")]
     pub output: Vec<u8>,
     pub score: u32,
     pub order: f32,

backend/src/entity/testcase.rs

@@ -10,7 +10,7 @@ pub struct Model {
     #[sea_orm(primary_key)]
     pub id: i32,
     pub user_id: i32,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "Blob")]
     pub rand: Vec<u8>,
     pub permission: i32,
     #[sea_orm(column_type = "Time")]

backend/src/entity/token.rs

@@ -13,7 +13,7 @@ pub struct Model {
     pub permission: i32,
     pub score: i64,
     pub username: String,
-    #[sea_orm(column_type = "Binary(BlobSize::Blob(None))")]
+    #[sea_orm(column_type = "Blob")]
     pub password: Vec<u8>,
     #[sea_orm(column_type = "Time")]
     pub create_at: chrono::NaiveDateTime,

backend/src/entity/user.rs

@@ -4,8 +4,8 @@
 
 use std::ops::Deref;
 
+use sea_orm::sea_query::*;
 use sea_orm::*;
-use sea_query::*;
 use tracing::instrument;
 
 use crate::util::error::Error;
@@ -190,3 +190,21 @@ impl<E: EntityTrait> MaxCount<E> {
         })
     }
 }
+
+/// convert sized span to single-direction span
+///
+/// Return None if span cannot be converted(cross boundary).
+///
+/// It panics if overflow(u64 to i64).
+///
+/// See `dev.md` for sized span and single-direction span.
+pub(super) fn to_inner_size_offset(size: u64, offset: i64) -> Option<(i64, u64)> {
+    // cross boundary
+    if offset.is_negative() && size > offset.unsigned_abs() {
+        return None;
+    }
+    match offset.is_negative() {
+        true => Some((-(size as i64), offset.unsigned_abs() - size)),
+        false => Some((size as i64, offset as u64)),
+    }
+}

backend/src/entity/util/helper.rs

@@ -20,7 +20,7 @@ use std::marker::PhantomData;
 
 use crate::util::error::Error;
 
-const PAGINATE_GUARANTEE: u64 = 96;
+const PAGINATE_GUARANTEE: u64 = 256;
 
 #[async_trait]
 pub trait PaginateRaw
@@ -362,6 +362,14 @@ impl<S: SortSource<R>, R: Reflect<S::Entity>> PaginateRaw for ColumnPaginator<S,
     }
 }
 
+/// A paginator that may be initialized
+///
+/// Key-set Paginator requires information from last fetched column
+/// (sometimes called trailing information) to be initialized.
+///
+/// **Can only be serialized or deserialized when initialized.**
+///
+/// **Calling fetch with size 0 doesn't initialize it!**
 #[derive(Serialize, Default)]
 pub enum UninitPaginator<P: PaginateRaw> {
     #[serde(skip)]
@@ -390,9 +398,15 @@ impl<'de, P: PaginateRaw> Deserialize<'de> for UninitPaginator<P> {
 }
 
 impl<P: PaginateRaw> UninitPaginator<P> {
+    /// construct a paginator with its initial query argument.
     pub fn new(data: <P::Source as PagerData>::Data, start_from_end: bool) -> Self {
         Self::Uninit(data, start_from_end)
     }
+    /// fetch some entries
+    ///
+    /// Return `Error::BadArgument` when
+    /// 1. offset is when paginator has yet to be initialized and offset is negative
+    /// 2. span crosses the boundary,
     pub async fn fetch(
         &mut self,
         size: u64,
@@ -401,32 +415,31 @@ impl<P: PaginateRaw> UninitPaginator<P> {
         db: &DatabaseConnection,
     ) -> Result<Vec<P::Reflect>, Error> {
         if let UninitPaginator::Init(x) = self {
-            let size = size.min((i64::MAX - 1) as u64) as i64;
-            let offset = offset.max(i64::MIN + 1);
-            let (size, offset) = match offset < 0 {
-                true => (
-                    -size,
-                    (-offset)
-                        .checked_sub(size)
-                        .ok_or(Error::BadArgument("size"))? as u64,
-                ),
-                false => (size, offset as u64),
-            };
+            let (size, offset) =
+                to_inner_size_offset(size, offset).ok_or(Error::BadArgument("size"))?;
             x.fetch(auth, size, offset, db).await.map(|mut x| {
                 if size.is_negative() {
                     x.reverse();
                 }
                 x
             })
         } else if let UninitPaginator::Uninit(x, start_from_end) = std::mem::take(self) {
+            if offset.is_negative() {
+                return Err(Error::BadArgument("offset"));
+            }
             let (paginator, list) =
-                P::new_fetch(x, auth, size, offset.max(0) as u64, start_from_end, db).await?;
+                P::new_fetch(x, auth, size, offset as u64, start_from_end, db).await?;
             *self = UninitPaginator::Init(paginator);
             Ok(list)
         } else {
             unreachable!("Cannot in middle state")
         }
     }
+    /// get how many column are remaining the **absolute forward** direction of paginator
+    ///
+    /// If more than [`PAGINATE_GUARANTEE`], it returns [`PAGINATE_GUARANTEE`].
+    ///
+    /// It passes [`sea_orm::DbErr`] to the callee.
     pub async fn remain(&self, auth: &Auth, db: &DatabaseConnection) -> Result<u64, Error>
     where
         P: Remain,

backend/src/entity/util/paginator.rs

@@ -48,15 +48,9 @@ pub async fn init(
 #[cfg(feature = "standalone")]
 /// Run migration
 async fn migrate(db: &DatabaseConnection) -> super::Result<()> {
-    sea_orm_migration::cli::run_migrate(
-        ::migration::Migrator,
-        db,
-        Some(sea_orm_cli::cli::MigrateSubcommands::Up { num: None }),
-        false,
-    )
-    .await
-    .map_err(InitError::AutoMigrate)?;
-    Ok(())
+    <::migration::Migrator as migration::MigratorTrait>::up(db, None)
+        .await
+        .map_err(InitError::AutoMigrate)
 }
 
 #[instrument(skip_all, name = "construct_admin")]

backend/src/server/db.rs

@@ -8,7 +8,7 @@ pub enum InitError {
     OptimizeDB(sea_orm::DbErr),
     #[cfg(feature = "standalone")]
     #[error("Fail to run auto migration: `{0}`")]
-    AutoMigrate(Box<dyn std::error::Error>),
+    AutoMigrate(sea_orm::DbErr),
     #[error("Fail to create initial user: `{0}`")]
     UserCreation(sea_orm::DbErr),
     #[error("Fail to parse config: `{0}`")]

backend/src/server/error.rs

@@ -53,7 +53,7 @@ macro_rules! list_paginator_request {
         paste::paste! {
             impl BoundCheck for [<List $n Request>] {
                 fn check(&self) -> bool {
-                    if self.size==0{
+                    if self.size == 0 || self.size >= i32::MAX as u64 || self.offset.unsigned_abs() >= i32::MAX as u64{
                         true
                     }else if let Some(x) = &self.request {
                         (match x {
@@ -82,7 +82,12 @@ list_paginator_request!(User);
 
 impl BoundCheck for ListTokenRequest {
     fn check(&self) -> bool {
-        if let Some(list_token_request::Request::Paginator(x)) = &self.request {
+        if self.size == 0
+            || self.size >= i32::MAX as u64
+            || self.offset.unsigned_abs() >= i32::MAX as u64
+        {
+            true
+        } else if let Some(list_token_request::Request::Paginator(x)) = &self.request {
             x.len() > 512
         } else {
             false
@@ -92,12 +97,15 @@ impl BoundCheck for ListTokenRequest {
 
 impl BoundCheck for ListChatRequest {
     fn check(&self) -> bool {
-        self.offset == 0 || self.offset > 4096 || self.size > 128
+        self.offset == 0 || self.offset.unsigned_abs() > 4096 || self.size > 128
     }
 }
 impl BoundCheck for ListSubmitRequest {
     fn check(&self) -> bool {
-        if self.offset == 0 {
+        if self.size == 0
+            || self.size >= i32::MAX as u64
+            || self.offset.unsigned_abs() >= i32::MAX as u64
+        {
             true
         } else if let Some(list_submit_request::Request::Paginator(x)) = &self.request {
             x.len() > 512
@@ -108,7 +116,12 @@ impl BoundCheck for ListSubmitRequest {
 }
 impl BoundCheck for ListTestcaseRequest {
     fn check(&self) -> bool {
-        if let Some(list_testcase_request::Request::Paginator(x)) = &self.request {
+        if self.size == 0
+            || self.size >= i32::MAX as u64
+            || self.offset.unsigned_abs() >= i32::MAX as u64
+        {
+            true
+        } else if let Some(list_testcase_request::Request::Paginator(x)) = &self.request {
             x.len() > 512
         } else {
             false