From a6ab0d094568f5c93c701c756309b318727b9b69 Mon Sep 17 00:00:00 2001 From: BitHeaven Date: Fri, 22 Mar 2024 14:09:27 +0500 Subject: [PATCH] Some decentralize --- TODO | 11 ++++- src/api.rs | 36 +++++++++++++++ src/api/v0.rs | 42 +++++++++++++++++ src/html.rs | 64 ++++++++++++++++++++++++++ src/main.rs | 125 ++++++++++++++------------------------------------ 5 files changed, 187 insertions(+), 91 deletions(-) create mode 100644 src/api.rs create mode 100644 src/api/v0.rs create mode 100644 src/html.rs diff --git a/TODO b/TODO index 64aa6a7..2a7d9dc 100644 --- a/TODO +++ b/TODO @@ -1,4 +1,13 @@ Auth using tokens Auth using uniq id on device Auth using QR code -Auth using SMS or popup +Auth using msg or popup +Auth using email + + + +##### API v0 +# Auth link (device check url with this session and get data) +/auth?session= +# Get auth data +/auth_finish?session= diff --git a/src/api.rs b/src/api.rs new file mode 100644 index 0000000..cfc0ed7 --- /dev/null +++ b/src/api.rs @@ -0,0 +1,36 @@ +mod v0; + +use { + hyper::{ + StatusCode, + Request, + header::HeaderValue, + body::{ + Incoming, + }, + }, + serde_json::{ + Value as Json, + json, + }, + skytable::pool::ConnectionMgrTcp, + bb8::Pool, + std::sync::Arc, +}; + +type Res = std::result::Result; +type Result = std::result::Result>; +type DBPool = Arc>; + + +pub async fn endpoint(req: Request, pool: DBPool) -> (String, StatusCode, HeaderValue) { + let uri: &str = req.uri().path().as_ref(); + let res: Json = match &uri[4..uri.len()] { + "/test" => json!({"error": false, "msg": "test"}), + x if x.starts_with("/v0/") => v0::api(req, pool.clone()).await, + _ => json!({"error": true, "msg": "No endpoint"}) + }; + + let restype: HeaderValue = "application/json".parse().unwrap(); + (res.to_string(), StatusCode::IM_A_TEAPOT, restype) +} diff --git a/src/api/v0.rs b/src/api/v0.rs new file mode 100644 index 0000000..5c33701 --- /dev/null +++ b/src/api/v0.rs @@ -0,0 +1,42 @@ +use { + hyper::{ + Request, + body::{ + Incoming, + }, + }, + serde_json::{ + Value as Json, + json, + }, + skytable::pool::ConnectionMgrTcp, + bb8::Pool, + std::sync::Arc, + crate::double_split, +}; + +type Res = std::result::Result; +type Result = std::result::Result>; +type DBPool = Arc>; + + +pub async fn api(req: Request, pool: DBPool) -> Json { + let uri: &str = req.uri().path().as_ref(); + match &uri[7..uri.len()] { + "/test" => json!({"error": false, "msg": "test endpoint v0"}), + "/auth" => auth(req, pool.clone()).await, + "/auth_get" => auth_get(req, pool.clone()).await, + _ => json!({"error": true, "msg": "No endpoint"}) + } +} + +async fn auth(req: Request, pool: DBPool) -> Json { + json!({"error": false, "msg": "test auth endpoint v0"}) +} + +async fn auth_get(req: Request, pool: DBPool) -> Json { + let query = req.uri().query().or(Some("")).unwrap(); + let query = double_split(query.to_string(), "&", "="); + println!("{:?}", query); + json!({"error": false, "msg": "test auth_get endpoint v0"}) +} diff --git a/src/html.rs b/src/html.rs new file mode 100644 index 0000000..8aab845 --- /dev/null +++ b/src/html.rs @@ -0,0 +1,64 @@ +pub const HEADER_HTML: &str = r#" + + + + +
+ index + login + register +
+
+
+"#; + +pub const FOOTER_HTML: &str = r#" +
+
+
+ Render time: RENDER_TIMEns. Made by BitHeaven. +
+ + +"#; + +pub const INDEX_HTML: &str = "

main

"; + +pub const LOGIN_HTML: &str = r#" +

login

+
+ +
+ +
+
+ +
+"#; + +pub const REG_HTML: &str = r#" +

register

+
+ +
+ +
+ +
+ +
+ +
+ +
+"#; + +pub const RECOVER_HTML: &str = "

recover

"; + +pub const NF_HTML: &str = "

404

think about it."; + +pub const CSS3: &str = r#""#; diff --git a/src/main.rs b/src/main.rs index ab28e6e..b69b6a3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,10 +1,13 @@ mod types; +mod html; +mod api; use { std::{ sync::Arc, net::SocketAddr, collections::HashMap, + process::exit, time::{ SystemTime, UNIX_EPOCH, @@ -79,8 +82,11 @@ use { Pool, }, crate::{ - types::users::Users, - types::sites::Sites, + types::{ + users::Users, + sites::Sites, + }, + html::*, }, }; @@ -101,75 +107,31 @@ const DB_PASS: &str = "rootpass12345678"; const TOKEN_LIFETIME: u32 = 300; const REFRESH_LIFETIME: u32 = 2_678_400; -const HEADER_HTML: &str = r#" - - - - -
- index - login - register -
-
-
-"#; -const FOOTER_HTML: &str = r#" -
-
-
- Made by BitHeaven. -
- - -"#; -const INDEX_HTML: &str = "

main

"; -const LOGIN_HTML: &str = r#" -

login

-
- -
- -
-
- -
-"#; -const REG_HTML: &str = r#" -

register

-
- -
- -
- -
- -
-
- -
-"#; -const RECOVER_HTML: &str = "

recover

"; -const NF_HTML: &str = "

404

think about it."; -const CSS3: &str = r#""#; - #[tokio::main] async fn main() -> Result<()> { + println!("Starting."); + + print!("Binding port..."); let addr = SocketAddr::from(([0, 0, 0, 0], PORT)); - let listener = TcpListener::bind(addr).await?; + let listener = TcpListener::bind(addr).await; + if listener.is_err() { + println!(" Error."); + exit(1); + } + let listener = listener?; + println!(" OK."); + + print!("Connecting to DB..."); + let pool = pool::get_async(DB_POOL, Config::new(DB_ADDR, DB_PORT, DB_USER, DB_PASS)).await; + let pool = Arc::new(pool.unwrap()); + + if pool.get().await.is_err() { + println!(" Error."); + exit(1); + } + println!(" OK."); - let pool = Arc::new( - pool::get_async( - DB_POOL, - Config::new(DB_ADDR, DB_PORT, DB_USER, DB_PASS) - ).await.unwrap() - ); init_tables(pool.clone()).await?; println!("Server started on port: {}", PORT); @@ -197,6 +159,8 @@ async fn main() -> Result<()> { } async fn handle_connection(req: Request, pool: DBPool, ip: String) -> FullBytes { + let t = time_ns(); + if ip == "1.1.1.1" { } @@ -217,7 +181,7 @@ async fn handle_connection(req: Request, pool: DBPool, ip: String) -> match >::as_ref(req.uri().path()) { x if x.starts_with("/api/") => {} _ => { - println!("{}", token); +// println!("{}", token); if token != "" && jwt_verify(pool.clone(), token) .await?.claims.as_object().unwrap().len() == 0 @@ -239,13 +203,14 @@ async fn handle_connection(req: Request, pool: DBPool, ip: String) -> "/register" => uri_register(req, pool.clone(), &mut headers).await?, "/recover" => uri_recover(), x if x.starts_with("/@") => uri_user(req, pool.clone()).await?, - x if x.starts_with("/api/") => uri_api(req), + x if x.starts_with("/api/") => api::endpoint(req, pool.clone()).await, _ => uri_404() }; headers.insert(hyper::header::CONTENT_TYPE, restype); parts.headers = headers; + let body = body.replace("RENDER_TIME", &format!("{}", time_ns() - t)); Ok(Response::from_parts(parts, Full::new(Bytes::from(body)))) } @@ -338,26 +303,6 @@ fn uri_recover() -> (String, StatusCode, HeaderValue) { (build_html(RECOVER_HTML), StatusCode::OK, restype) } -fn uri_api(req: Request) -> (String, StatusCode, HeaderValue) { - let uri: &str = req.uri().path().as_ref(); - let res: Json = match &uri[4..uri.len()] { - "/test" => json!({"error": false, "msg": "test"}), - x if x.starts_with("/v0/") => uri_api_v0(req), - _ => json!({"error": true, "msg": "No endpoint"}) - }; - - let restype: HeaderValue = "application/json".parse().unwrap(); - (res.to_string(), StatusCode::IM_A_TEAPOT, restype) -} - -fn uri_api_v0(req: Request) -> Json { - let uri: &str = req.uri().path().as_ref(); - match &uri[7..uri.len()] { - "/test" => json!({"error": false, "msg": "test endpoint v0"}), - _ => json!({"error": true, "msg": "No endpoint"}) - } -} - async fn uri_user(req: Request, pool: DBPool) -> Res<(String, StatusCode, HeaderValue), SkyError> { let uri: &str = req.uri().path().as_ref(); let login = &uri[2..uri.len()]; @@ -610,9 +555,9 @@ fn time() -> u32 { .as_secs() as u32 } -/*fn time_ns() -> u128 { +fn time_ns() -> u128 { SystemTime::now() .duration_since(UNIX_EPOCH) .unwrap() .as_millis() as u128 -}*/ +}