test: 🧪 find cause of UB

mdcpp · Dec 7, 2023 · b59d49b · b59d49b
1 parent 76e811a
commit b59d49b
Show file tree

Hide file tree

Showing 5 changed files with 96 additions and 27 deletions.
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
@@ -42,7 +42,7 @@ version = "0.1.40"
 features =["async-await", "log"]
 
 [dependencies.tokio]
-version = "1.28.0"
+version = "1.34.0"
 features =["macros", "rt-multi-thread", "full","time"]
 
 [dependencies.sea-orm]

diff --git a/backend/src/controller/judger/route/mod.rs b/backend/src/controller/judger/route/mod.rs
@@ -1,10 +1,10 @@
-// TODO!: health check, circular reference counter
 pub mod direct;
 pub mod swarm;
 
 use super::Error;
 use std::{
     collections::VecDeque,
+    mem::MaybeUninit,
     ops::DerefMut,
     sync::{
         atomic::{AtomicIsize, Ordering},
@@ -26,19 +26,19 @@ use crate::{
 // introduce routing layer error
 
 const HEALTHY_THRESHOLD: isize = 100;
-type JudgerIntercept =
-    JudgerClient<service::interceptor::InterceptedService<transport::Channel, AuthInterceptor>>;
+type JudgerIntercept = JudgerClient<
+    service::interceptor::InterceptedService<transport::Channel, BasicAuthInterceptor>,
+>;
 
-pub struct AuthInterceptor {
+pub struct BasicAuthInterceptor {
     secret: Option<String>,
 }
 
-impl Interceptor for AuthInterceptor {
+impl Interceptor for BasicAuthInterceptor {
     fn call(&mut self, mut req: tonic::Request<()>) -> Result<tonic::Request<()>, Status> {
         match &self.secret {
             Some(secret) => {
-                let token: metadata::MetadataValue<_> =
-                    format!("basic {}", secret).parse().unwrap();
+                let token = secret.parse().unwrap();
                 req.metadata_mut().insert("Authorization", token);
                 Ok(req)
             }
@@ -60,8 +60,8 @@ impl ConnectionDetail {
             .connect()
             .await?;
 
-        let interceptor = AuthInterceptor {
-            secret: self.secret.clone(),
+        let interceptor = BasicAuthInterceptor {
+            secret: self.secret.as_ref().map(|x| ["basic ", x].concat()),
         };
 
         Ok(JudgerClient::with_interceptor(channel, interceptor))
@@ -145,7 +145,7 @@ pub struct Router {
 
 impl Router {
     // skip because config contain basic auth secret
-    #[tracing::instrument(level = "debug",skip_all)]
+    #[tracing::instrument(level = "debug", skip_all)]
     pub async fn new(config: Vec<JudgerConfig>) -> Result<Arc<Self>, Error> {
         let self_ = Arc::new(Self {
             routing_table: Map::new(),
@@ -206,10 +206,11 @@ pub struct Upstream {
 impl Upstream {
     async fn new(detail: ConnectionDetail) -> Result<(Arc<Self>, Vec<(Uuid, LangInfo)>), Error> {
         let mut client = detail.connect().await?;
-        let info = client.judger_info(()).await?.into_inner();
+        let info = client.judger_info(()).await?;
+        let langs = info.into_inner().langs.list;
 
         let mut result = Vec::new();
-        for lang in info.langs.list.into_iter() {
+        for lang in langs.into_iter() {
             let uuid = match Uuid::parse_str(&lang.lang_uid) {
                 Ok(x) => x,
                 Err(err) => {
@@ -219,10 +220,14 @@ impl Upstream {
             };
             result.push((uuid, lang));
         }
+
+        let clients = Queue::new();
+        clients.push(client);
+
         Ok((
             Arc::new(Self {
                 healthy: AtomicIsize::new(HEALTHY_THRESHOLD),
-                clients: Queue::new(),
+                clients,
                 connection: detail,
             }),
             result,

diff --git a/backend/src/endpoint/util/pagination.rs b/backend/src/endpoint/util/pagination.rs
@@ -155,7 +155,9 @@ where
                 let sort = match pager.sort {
                     RawSearchDep::Text(x) => SearchDep::Text(x),
                     RawSearchDep::Column(sort_by, reverse) => {
-                        let sort_by = sort_by.try_into()     .map_err(|_|Error::PaginationError("Pager reconstruction failed"))?;
+                        let sort_by = sort_by
+                            .try_into()
+                            .map_err(|_| Error::PaginationError("Pager reconstruction failed"))?;
                         SearchDep::Column(sort_by, reverse)
                     }
                     RawSearchDep::Parent(x) => SearchDep::Parent(x),
@@ -284,7 +286,9 @@ where
                 let sort = match pager.sort {
                     RawSearchDep::Text(x) => SearchDep::Text(x),
                     RawSearchDep::Column(sort_by, reverse) => {
-                        let sort_by = sort_by.try_into()                          .map_err(|_|Error::PaginationError("Pager reconstruction failed"))?;
+                        let sort_by = sort_by
+                            .try_into()
+                            .map_err(|_| Error::PaginationError("Pager reconstruction failed"))?;
                         SearchDep::Column(sort_by, reverse)
                     }
                     RawSearchDep::Parent(_) => {

diff --git a/backend/src/init/config.rs b/backend/src/init/config.rs
@@ -1,4 +1,4 @@
-use std::{path::PathBuf, sync::Arc};
+use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 use tokio::{fs, io::AsyncReadExt};