leon/knifer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Some minor restructuring and improvements

Browse Source
This commit is contained in:
Lol3rrr
2024-09-08 00:41:12 +02:00
parent ae6c1b590f
commit 828df3290a
17 changed files with 387 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backend/Cargo.toml
View File

@@ -20,3 +20,5 @@ diesel = { version = "2.2", features = ["serde_json"] }
diesel-async = { version = "0.5", features = ["postgres"] }
serde_json = "1.0.128"
diesel_async_migrations = { version = "0.15" }
common = { path = "../common/" }

115
backend/src/api.rs Normal file
View File

@@ -0,0 +1,115 @@
pub mod demos {
use crate::UserSession;
use diesel_async::RunQueryDsl;
use diesel::prelude::*;
use axum::extract::{State, Path};
use std::sync::Arc;
struct DemoState {
upload_folder: std::path::PathBuf,
}
pub fn router<P>(upload_folder: P) -> axum::Router where P: Into<std::path::PathBuf> {
axum::Router::new()
.route("/list", axum::routing::get(list))
.route("/upload", axum::routing::post(upload).layer(axum::extract::DefaultBodyLimit::max(500*1024*1024)))
.route("/:id/info", axum::routing::get(info))
.with_state(Arc::new(DemoState {
upload_folder: upload_folder.into(),
}))
}
async fn list(session: UserSession) -> Result<axum::response::Json<Vec<common::BaseDemoInfo>>, axum::http::StatusCode> {
let steam_id = session.data().steam_id.ok_or_else(|| axum::http::StatusCode::UNAUTHORIZED)?;
tracing::info!("SteamID: {:?}", steam_id);
let query = crate::schema::demos::dsl::demos.filter(crate::schema::demos::dsl::steam_id.eq(steam_id as i64));
let results: Vec<crate::models::Demo> = query.load(&mut crate::db_connection().await).await.unwrap();
Ok(axum::response::Json(results.into_iter().map(|demo| common::BaseDemoInfo {
id: demo.demo_id,
}).collect::<Vec<_>>()))
}
async fn upload(State(state): State<Arc<DemoState>>, session: crate::UserSession, form: axum::extract::Multipart) -> Result<axum::response::Redirect, (axum::http::StatusCode, &'static str)> {
let steam_id = session.data().steam_id.ok_or_else(|| (axum::http::StatusCode::UNAUTHORIZED, "Not logged in"))?;
tracing::info!("Upload for Session: {:?}", steam_id);
let file_content = crate::get_demo_from_upload("demo", form).await.unwrap();
let user_folder = std::path::Path::new(&state.upload_folder).join(format!("{}/", steam_id));
if !tokio::fs::try_exists(&user_folder).await.unwrap_or(false) {
tokio::fs::create_dir_all(&user_folder).await.unwrap();
}
let timestamp_secs = std::time::SystemTime::now().duration_since(std::time::SystemTime::UNIX_EPOCH).unwrap().as_secs();
let demo_file_path = user_folder.join(format!("{}.dem", timestamp_secs));
tokio::fs::write(demo_file_path, file_content).await.unwrap();
let query = diesel::dsl::insert_into(crate::schema::demos::dsl::demos).values(crate::models::Demo {
demo_id: timestamp_secs as i64,
steam_id: steam_id as i64,
});
query.execute(&mut crate::db_connection().await).await.unwrap();
Ok(axum::response::Redirect::to("/"))
}
async fn info(session: UserSession, Path(demo_id): Path<i64>) -> Result<(), axum::http::StatusCode> {
tracing::info!("Get info for Demo: {:?}", demo_id);
Ok(())
}
}
pub mod steam {
use axum::extract::State;
use std::sync::Arc;
pub fn router(url: &str, callback_path: &str) -> axum::Router {
axum::Router::new()
.route("/login", axum::routing::get(steam_login))
.route("/callback", axum::routing::get(steam_callback))
.with_state(Arc::new(steam_openid::SteamOpenId::new(url, callback_path).unwrap()))
}
async fn steam_login(State(openid): State<Arc<steam_openid::SteamOpenId>>) -> Result<axum::response::Redirect, axum::http::StatusCode> {
let url = openid.get_redirect_url();
Ok(axum::response::Redirect::to(url))
}
async fn steam_callback(
State(openid): State<Arc<steam_openid::SteamOpenId>>,
mut session: crate::UserSession,
request: axum::extract::Request,
) -> Result<axum::response::Redirect, axum::http::StatusCode> {
tracing::info!("Steam Callback");
let query = request.uri().query().ok_or_else(|| {
tracing::error!("Missing query in parameters");
axum::http::StatusCode::BAD_REQUEST
})?;
let id = openid.verify(query).await.map_err(|e| {
tracing::error!("Verifying OpenID: {:?}", e);
axum::http::StatusCode::BAD_REQUEST
})?;
session
.modify_data(|data| {
data.steam_id = Some(id);
})
.await;
Ok(axum::response::Redirect::to("/"))
}
}
pub fn router() -> axum::Router {
axum::Router::new()
.nest("/steam/", steam::router("http://192.168.0.156:3000", "/api/steam/callback"))
.nest("/demos/", demos::router("uploads/"))
}

4
backend/src/lib.rs
View File

@@ -1,5 +1,3 @@
use serde::{Deserialize, Serialize};
pub mod models;
pub mod schema;
@@ -34,3 +32,5 @@ pub async fn get_demo_from_upload(name: &str, mut form: axum::extract::Multipart
None
}
pub mod api;

83
backend/src/main.rs
View File

@@ -1,11 +1,8 @@
use tracing_subscriber::prelude::__tracing_subscriber_SubscriberExt;
use diesel::prelude::*;
use diesel_async::{RunQueryDsl, AsyncConnection, AsyncPgConnection};
use diesel_async::RunQueryDsl;
static OPENID: std::sync::LazyLock<steam_openid::SteamOpenId> = std::sync::LazyLock::new(|| {
steam_openid::SteamOpenId::new("http://192.168.0.156:3000", "/api/steam/callback").unwrap()
});
static UPLOAD_FOLDER: &str = "uploads/";
const MIGRATIONS: diesel_async_migrations::EmbeddedMigrations = diesel_async_migrations::embed_migrations!("../migrations/");
@@ -33,7 +30,7 @@ async fn main() {
let session_layer = tower_sessions::SessionManagerLayer::new(session_store)
.with_secure(false)
.with_expiry(tower_sessions::Expiry::OnInactivity(
time::Duration::minutes(15),
time::Duration::hours(48),
));
if !tokio::fs::try_exists(UPLOAD_FOLDER).await.unwrap_or(false) {
@@ -41,14 +38,7 @@ async fn main() {
}
let router = axum::Router::new()
.nest_service(
"/api/",
axum::Router::new()
.route("/steam/callback", axum::routing::get(steam_callback))
.route("/steam/login", axum::routing::get(steam_login))
.route("/demos/upload", axum::routing::post(upload).layer(axum::extract::DefaultBodyLimit::max(1024*1024*500)))
.route("/demos/list", axum::routing::get(demos_list))
)
.nest("/api/", backend::api::router())
.layer(session_layer)
.nest_service("/", tower_http::services::ServeDir::new("frontend/dist/"));
@@ -56,71 +46,6 @@ async fn main() {
axum::serve(listener, router).await.unwrap();
}
async fn upload(session: backend::UserSession, form: axum::extract::Multipart) -> Result<axum::response::Redirect, (axum::http::StatusCode, &'static str)> {
let steam_id = session.data().steam_id.ok_or_else(|| (axum::http::StatusCode::UNAUTHORIZED, "Not logged in"))?;
tracing::info!("Upload for Session: {:?}", steam_id);
let file_content = backend::get_demo_from_upload("demo", form).await.unwrap();
let user_folder = std::path::Path::new(UPLOAD_FOLDER).join(format!("{}/", steam_id));
if !tokio::fs::try_exists(&user_folder).await.unwrap_or(false) {
tokio::fs::create_dir_all(&user_folder).await.unwrap();
}
let timestamp_secs = std::time::SystemTime::now().duration_since(std::time::SystemTime::UNIX_EPOCH).unwrap().as_secs();
let demo_file_path = user_folder.join(format!("{}.dem", timestamp_secs));
tokio::fs::write(demo_file_path, file_content).await.unwrap();
let query = diesel::dsl::insert_into(backend::schema::demos::dsl::demos).values(backend::models::Demo {
demo_id: timestamp_secs as i64,
steam_id: steam_id as i64,
});
query.execute(&mut backend::db_connection().await).await.unwrap();
Ok(axum::response::Redirect::to("/"))
}
async fn steam_login() -> Result<axum::response::Redirect, axum::http::StatusCode> {
let url = OPENID.get_redirect_url();
Ok(axum::response::Redirect::to(url))
}
async fn steam_callback(
mut session: backend::UserSession,
request: axum::extract::Request,
) -> Result<axum::response::Redirect, axum::http::StatusCode> {
tracing::info!("Steam Callback");
let query = request.uri().query().ok_or_else(|| {
tracing::error!("Missing query in parameters");
axum::http::StatusCode::BAD_REQUEST
})?;
let id = OPENID.verify(query).await.map_err(|e| {
tracing::error!("Verifying OpenID: {:?}", e);
axum::http::StatusCode::BAD_REQUEST
})?;
session
.modify_data(|data| {
data.steam_id = Some(id);
})
.await;
Ok(axum::response::Redirect::to("/"))
}
async fn demos_list(session: backend::UserSession) -> Result<(), axum::http::StatusCode> {
let steam_id = session.data().steam_id.ok_or_else(|| axum::http::StatusCode::UNAUTHORIZED)?;
tracing::info!("SteamID: {:?}", steam_id);
let query = backend::schema::demos::dsl::demos.filter(backend::schema::demos::dsl::steam_id.eq(steam_id as i64));
let results: Vec<backend::models::Demo> = query.load(&mut backend::db_connection().await).await.unwrap();
dbg!(&results);
async fn demo_info(session: backend::UserSession) -> Result<(), axum::http::StatusCode> {
Ok(())
}

3
backend/src/usersession.rs
View File

@@ -1,6 +1,3 @@
use diesel::prelude::*;
use diesel_async::RunQueryDsl;
#[derive(Debug, Clone, serde::Deserialize, serde::Serialize)]
pub struct UserSessionData {
pub steam_id: Option<u64>,