shockrah/freechat
shockrah/freechat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

temporary sketch patch for the following routse

Browse Source 
*SET_PERMS_BY_ADMIN
*NEW_ADMIN
NOTE: this patch blows since its coming right before another large redesign
that redesign is the integration of a proper databse interface
This commit is contained in:
shockrah 2020-08-29 21:02:57 -07:00
parent d40eb24072
commit eae2677765
4 changed files with 88 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
server-api/src/admin.rs
View File

@ -1,7 +1,7 @@
// Module deals endpoints pertaining to admin-only actions // Module deals endpoints pertaining to admin-only actions
use hyper::{Response, Body}; use hyper::{Response, Body};
use hyper::StatusCode::{NOT_FOUND, BAD_REQUEST, INTERNAL_SERVER_ERROR}; use hyper::StatusCode;
use mysql_async::Pool; use mysql_async::Pool;
use mysql_async::error::Error as SqlError; use mysql_async::error::Error as SqlError;
@ -10,37 +10,82 @@ use mysql_async::prelude::Queryable;
use serde_json::Value; use serde_json::Value;
use crate::perms::ADMIN_PERMS; use crate::perms::ADMIN_PERMS;
use crate::db_types::UBigInt;
async fn modify_perms(p: &Pool, target: u64, new_perms: u64) -> Result<(), SqlError>{ macro_rules! get_target_id {
use mysql_async::params; ($obj:expr) => {
match $obj.get("target-id") {
Some(val) => val.as_u64(),
None => None
}
}
}
async fn modify_perms(p: &Pool, uid: u64, new_perms: u64) -> Result<(), SqlError>{
/* NOTE: this whole func will return Ok(UpdateStatus)
* */
use mysql_async::{params, Conn};
let conn = p.get_conn().await?; let conn = p.get_conn().await?;
let (conn, prow):(Conn, Option<(UBigInt, UBigInt)>) = conn.first_exec(
"SELECT id, perms WHERE id = :id",
params!{"id" => uid}
).await?;
conn.prep_exec( conn.prep_exec(
"UPDATE members SET permissions = :perms WHERE id = :id", "UPDATE members SET permissions = :perms WHERE id = :id",
params!{ params!{
"id" => target, "id" => uid,
"perms" => new_perms "perms" => new_perms
}).await?; }).await?;
Ok(()) Ok(())
} }
async fn new_admin(p: &Pool, response: &mut Response<Body>, params: Value) { pub async fn new_admin(p: &Pool, response: &mut Response<Body>, params: Value) {
// @requires: owner level permission as regular admins can have conflict of interests // @requires: owner level permission as regular admins can have conflict of interests
let target_id_opt: Option<u64> = match params.get("target-id") {
Some(val) => val.as_u64(),
None => None
};
if let Some(uid) = target_id_opt { if let Some(uid) = get_target_id!(params) {
if !modify_perms(p, uid, ADMIN_PERMS).await.is_ok() { let _ = modify_perms(p, uid, ADMIN_PERMS).await;
*response.status_mut() = NOT_FOUND;
*response.body_mut() = Body::from("User not found with that id");
}
} }
else { else {
// this is likely the users fault providing shit ass json // this is likely the users fault providing shit ass json
*response.status_mut() = BAD_REQUEST; *response.status_mut() = StatusCode::BAD_REQUEST;
*response.body_mut() = Body::from("Missing target user id"); *response.body_mut() = Body::from("Missing target user id");
} }
} }
async fn update_member_permissions(p: &Pool, uid: u64, perms: u64) -> Result<(), SqlError>{
use mysql_async::params;
let conn = p.get_conn().await?;
conn.prep_exec(
"UPDATE members permissions = :perms WHERE id = :id",
params!{
"id" => uid,
"perms" => perms
}
).await?;
Ok(())
}
pub async fn set_permissions(p: &Pool, response: &mut Response<Body>, params: Value) {
// @requiresL: admin level permissions, admins can't touch other admins
let tuid = get_target_id!(params);
let new_perms = match params.get("permissions") {
Some(val) => val.as_u64(),
None => None
};
match (tuid, new_perms) {
(Some(uid), Some(perms)) => {
if let Ok(_) = update_member_permissions(p, uid, perms).await {
}
},
_ => {
*response.status_mut() = StatusCode::BAD_REQUEST;
*response.body_mut() = Body::from("Missing one or more parameters");
}
}
}

4
server-api/src/main.rs
View File

@ -57,6 +57,10 @@ async fn route_dispatcher(pool: &Pool, resp: &mut Response<Body>, meth: &Method,
(POST, routes::CHANNELS_DELETE) => channels::delete_channel(pool, resp, params).await, (POST, routes::CHANNELS_DELETE) => channels::delete_channel(pool, resp, params).await,
/* MESSAGING */ /* MESSAGING */
(POST, routes::MESSAGE_SEND) => messages::send_message(pool, resp, params).await, (POST, routes::MESSAGE_SEND) => messages::send_message(pool, resp, params).await,
/* ADMIN */
(POST, routes::SET_PERMS_BY_ADMIN) => admin::set_permissions(pool, resp, params).await,
/* OWNER */
(POST, routes::SET_NEW_ADMIN) => admin::new_admin(pool, resp, params).await,
_ => { _ => {
// We attempt dynamic routes as fallback for a few reasons // We attempt dynamic routes as fallback for a few reasons
// 1. theres less of these than there are the static routes // 1. theres less of these than there are the static routes

20
server-api/src/members.rs
View File

@ -16,6 +16,26 @@ pub struct Member {
pub permissions: UBigInt, pub permissions: UBigInt,
} }
pub async fn get_member_row(p: &Pool, uid: u64) -> Result<Option<Member>, Error> {
let conn = p.get_conn().await?;
type RowData = (VarChar, VarChar, BigInt, Integer, UBigInt);
let (_, db_row) : (Conn, Option<RowData>) = conn.first_exec(
"SELECT secret, name, joindate, status, permissions FROM members WHERE id = :id",
params!{"id" => uid}
).await?;
if let Some(row) = db_row {
return Ok(Some(Member {
id: uid,
secret: row.0,
name: row.1,
joindate: row.2,
status: row.3,
permissions:4,
}))
}
return Ok(None)
}
pub async fn insert_new_member(p: &Pool, name: VarChar, perms: u64) -> Result<Member, Error> { pub async fn insert_new_member(p: &Pool, name: VarChar, perms: u64) -> Result<Member, Error> {
use crate::auth::generate_secret; use crate::auth::generate_secret;

4
server-api/src/routes.rs
View File

@ -8,6 +8,10 @@ pub const MESSAGE_SEND: &'static str = "/message/send"; // requires @content
pub const SERVER_META: &'static str = "/meta"; // open pub const SERVER_META: &'static str = "/meta"; // open
// @requires: admin permissions
//
pub const SET_PERMS_BY_ADMIN: &'static str = "/admin/setpermisions";
pub const SET_NEW_ADMIN: &'static str = "/owner/newadmin"; // @requiers: owner perms
// potentially adding more bases later // potentially adding more bases later
pub const DYNAMIC_ROUTE_BASES: [(&'static str, bool);3] = [ pub const DYNAMIC_ROUTE_BASES: [(&'static str, bool);3] = [
("/join", true), // open ("/join", true), // open