diff --git a/src/api/v0.rs b/src/api/v0.rs index b9589ad..89b965e 100644 --- a/src/api/v0.rs +++ b/src/api/v0.rs @@ -12,7 +12,10 @@ use { skytable::pool::ConnectionMgrTcp, bb8::Pool, std::sync::Arc, - crate::double_split, + crate::{ + funcs::type_of, + double_split, + }, }; type Res = std::result::Result; @@ -23,7 +26,6 @@ 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"}), "/auth" => auth(req, pool.clone()).await, "/auth_get" => auth_get(req, pool.clone()).await, _ => json!({"error": true, "msg": "No endpoint"}) @@ -31,7 +33,19 @@ pub async fn api(req: Request, pool: DBPool) -> Json { } async fn auth(req: Request, pool: DBPool) -> Json { - json!({"error": false, "msg": "test auth endpoint v0"}) + let query = req.uri().query().or(Some("")).unwrap(); + let query = double_split(query.to_string(), "&", "="); + let sess = std::string::String::from(query + .get("session") + .or(Some(&"".to_string())) + .unwrap()); + match sess.as_str() { + "" => json!({"error": true, "msg": "No session in url"}), + _ => json!({ + "error": false, + "link": format!("https://auth.bitheaven.ru/authorize?session={}", sess) + }) + } } async fn auth_get(req: Request, pool: DBPool) -> Json { diff --git a/src/funcs.rs b/src/funcs.rs new file mode 100644 index 0000000..a2694cc --- /dev/null +++ b/src/funcs.rs @@ -0,0 +1,54 @@ +use { + std::{ + collections::HashMap, + any::type_name, + time::{ + SystemTime, + UNIX_EPOCH, + }, + }, + urlencoding::decode as url_decode, + uuid::Uuid, + crate::{ + html::*, + }, +}; + + +pub fn type_of(_: T) -> &'static str { + type_name::() +} + +pub fn uuid_v4() -> Uuid { + Uuid::new_v4() +} + +pub fn build_html(body: &str) -> String { + format!("{}{}{}{}", HEADER_HTML, CSS3, body, FOOTER_HTML) +} + +pub fn double_split(body: String, first: &str, second: &str) -> HashMap { + body.split(first) + .filter_map(|c| { + c.split_once(second) + .map(|(l, r)| ( + l.trim().to_owned(), + format!("{}", url_decode(r).expect("UTF-8")).trim().to_owned() + )) + }) + .collect::>() +} + +pub fn time() -> u32 { + SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_secs() as u32 +} + +pub fn time_ns() -> u128 { + SystemTime::now() + .duration_since(UNIX_EPOCH) + .unwrap() + .as_micros() +} diff --git a/src/html.rs b/src/html.rs index 376c1a1..ad6618b 100644 --- a/src/html.rs +++ b/src/html.rs @@ -16,7 +16,8 @@ pub const FOOTER_HTML: &str = r#"
- Render time: RENDER_TIMEµs. Made by BitHeaven. + Render time: RENDER_TIMEµs. + Made by BitHeaven.
@@ -36,6 +37,15 @@ pub const LOGIN_HTML: &str = r#" "#; +pub const AUTHORIZE_HTML: &str = r#" +

authorize

+

you authorizing in unknown service

+

yes?

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

register

@@ -58,7 +68,7 @@ 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 6035008..3dfde0c 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,3 +1,4 @@ +mod funcs; mod types; mod html; mod api; @@ -8,10 +9,6 @@ use { net::SocketAddr, collections::HashMap, process::exit, - time::{ - SystemTime, - UNIX_EPOCH, - }, }, chrono::{ DateTime, @@ -48,9 +45,6 @@ use { RsaPrivateKey, RsaPublicKey, }, - urlencoding::{ - decode as url_decode, - }, jsonwebtoken as jwt, jwt::{ Header, @@ -66,9 +60,6 @@ use { Value as Json, json, }, - uuid::{ - Uuid, - }, skytable::{ query, Config, @@ -87,6 +78,7 @@ use { sites::Sites, }, html::*, + funcs::*, }, }; @@ -200,6 +192,7 @@ async fn handle_connection(req: Request, pool: DBPool, ip: String) -> "/" => uri_index(), "/cabinet" => uri_login(req, pool.clone(), &mut headers).await?, "/login" => uri_login(req, pool.clone(), &mut headers).await?, + "/authorize" => uri_authorize(req, pool.clone()).await?, "/register" => uri_register(req, pool.clone(), &mut headers).await?, "/recover" => uri_recover(), x if x.starts_with("/@") => uri_user(req, pool.clone()).await?, @@ -214,10 +207,6 @@ async fn handle_connection(req: Request, pool: DBPool, ip: String) -> Ok(Response::from_parts(parts, Full::new(Bytes::from(body)))) } -fn build_html(body: &str) -> String { - format!("{}{}{}{}", HEADER_HTML, CSS3, body, FOOTER_HTML) -} - fn set_cookie(headers: &mut HeaderMap, key: &str, value: &str) { let time = DateTime::from_timestamp((time() + REFRESH_LIFETIME) as i64, 0) .expect("REASON") @@ -263,6 +252,17 @@ async fn uri_login(req: Request, pool: DBPool, headers: &mut HeaderMap Ok((build_html(LOGIN_HTML), StatusCode::OK, restype)) } +async fn uri_authorize(req: Request, pool: DBPool) -> Result<(String, StatusCode, HeaderValue)> { + if *req.method() == Method::POST { + let body = get_body_from_request(req).await?; + let body = String::from_utf8(body).unwrap(); + let body = double_split(body, "&", "="); + } + + let restype: HeaderValue = "text/html".parse().unwrap(); + Ok((build_html(AUTHORIZE_HTML), StatusCode::OK, restype)) +} + fn uri_index() -> (String, StatusCode, HeaderValue) { let restype: HeaderValue = "text/html".parse().unwrap(); (build_html(INDEX_HTML), StatusCode::OK, restype) @@ -483,18 +483,6 @@ async fn get_body_from_request(mut req: Request) -> Result> { Ok(body) } -fn double_split(body: String, first: &str, second: &str) -> HashMap { - body.split(first) - .filter_map(|c| { - c.split_once(second) - .map(|(l, r)| ( - l.trim().to_owned(), - format!("{}", url_decode(r).expect("UTF-8")).trim().to_owned() - )) - }) - .collect::>() -} - fn rsa_gen() -> (Vec, Vec) { let mut rng = rand::thread_rng(); let bits = 2048; @@ -544,20 +532,3 @@ async fn jwt_verify(pool: DBPool, token: &str) -> Result> { Ok(ret) } -fn uuid_v4() -> Uuid { - Uuid::new_v4() -} - -fn time() -> u32 { - SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_secs() as u32 -} - -fn time_ns() -> u128 { - SystemTime::now() - .duration_since(UNIX_EPOCH) - .unwrap() - .as_micros() -}