Implement management of rooms and moderators using CLI

This commit is contained in:
nielsandriesse 2021-03-31 11:46:54 +11:00
parent d99a5e3df6
commit 8c1fd7e1ba
7 changed files with 344 additions and 54 deletions

212
Cargo.lock generated
View File

@ -211,6 +211,22 @@ dependencies = [
"vec_map",
]
[[package]]
name = "core-foundation"
version = "0.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0a89e2ae426ea83155dccf10c0fa6b1463ef6d5fcb44cee0b224a408fa640a62"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]]
name = "core-foundation-sys"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
[[package]]
name = "cpuid-bool"
version = "0.1.2"
@ -304,6 +320,15 @@ dependencies = [
"generic-array",
]
[[package]]
name = "encoding_rs"
version = "0.8.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "80df024fbc5ac80f87dfef0d9f5209a252f2a497f7f42944cff24d8253cac065"
dependencies = [
"cfg-if",
]
[[package]]
name = "fallible-iterator"
version = "0.2.0"
@ -322,6 +347,21 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foreign-types"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
"foreign-types-shared",
]
[[package]]
name = "foreign-types-shared"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
version = "1.0.1"
@ -619,6 +659,19 @@ dependencies = [
"want",
]
[[package]]
name = "hyper-tls"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
dependencies = [
"bytes",
"hyper",
"native-tls",
"tokio",
"tokio-native-tls",
]
[[package]]
name = "idna"
version = "0.2.2"
@ -658,6 +711,12 @@ dependencies = [
"cfg-if",
]
[[package]]
name = "ipnet"
version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "47be2f14c678be2fdcab04ab1171db51b2762ce6f0a8ee87c8dd4a04ed216135"
[[package]]
name = "itoa"
version = "0.4.7"
@ -796,6 +855,24 @@ dependencies = [
"twoway",
]
[[package]]
name = "native-tls"
version = "0.2.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8d96b2e1c8da3957d58100b09f102c6d9cfdfced01b7ec5a8974044bb09dbd4"
dependencies = [
"lazy_static",
"libc",
"log",
"openssl",
"openssl-probe",
"openssl-sys",
"schannel",
"security-framework",
"security-framework-sys",
"tempfile",
]
[[package]]
name = "nom"
version = "5.1.2"
@ -868,6 +945,39 @@ version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.33"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"
dependencies = [
"bitflags",
"cfg-if",
"foreign-types",
"libc",
"once_cell",
"openssl-sys",
]
[[package]]
name = "openssl-probe"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-sys"
version = "0.9.61"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"
dependencies = [
"autocfg",
"cc",
"libc",
"pkg-config",
"vcpkg",
]
[[package]]
name = "parking_lot"
version = "0.11.1"
@ -1160,6 +1270,41 @@ dependencies = [
"winapi",
]
[[package]]
name = "reqwest"
version = "0.11.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4"
dependencies = [
"base64",
"bytes",
"encoding_rs",
"futures-core",
"futures-util",
"http",
"http-body",
"hyper",
"hyper-tls",
"ipnet",
"js-sys",
"lazy_static",
"log",
"mime",
"native-tls",
"percent-encoding",
"pin-project-lite",
"serde",
"serde_json",
"serde_urlencoded",
"tokio",
"tokio-native-tls",
"url",
"wasm-bindgen",
"wasm-bindgen-futures",
"web-sys",
"winreg",
]
[[package]]
name = "ring"
version = "0.16.20"
@ -1224,6 +1369,16 @@ version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072"
[[package]]
name = "schannel"
version = "0.1.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75"
dependencies = [
"lazy_static",
"winapi",
]
[[package]]
name = "scheduled-thread-pool"
version = "0.2.5"
@ -1255,6 +1410,29 @@ dependencies = [
"untrusted",
]
[[package]]
name = "security-framework"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
dependencies = [
"bitflags",
"core-foundation",
"core-foundation-sys",
"libc",
"security-framework-sys",
]
[[package]]
name = "security-framework-sys"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
dependencies = [
"core-foundation-sys",
"libc",
]
[[package]]
name = "serde"
version = "1.0.123"
@ -1315,6 +1493,7 @@ dependencies = [
"r2d2_sqlite",
"rand 0.8.3",
"rand_core 0.5.1",
"reqwest",
"rusqlite",
"serde",
"serde_json",
@ -1535,6 +1714,16 @@ dependencies = [
"syn",
]
[[package]]
name = "tokio-native-tls"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7d995660bd2b7f8c1568414c1126076c13fbb725c40112dc0120b78eb9b717b"
dependencies = [
"native-tls",
"tokio",
]
[[package]]
name = "tokio-rustls"
version = "0.22.0"
@ -1831,6 +2020,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7"
dependencies = [
"cfg-if",
"serde",
"serde_json",
"wasm-bindgen-macro",
]
@ -1849,6 +2040,18 @@ dependencies = [
"wasm-bindgen-shared",
]
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.21"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e67a5806118af01f0d9045915676b22aaebecf4178ae7021bc171dab0b897ab"
dependencies = [
"cfg-if",
"js-sys",
"wasm-bindgen",
"web-sys",
]
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.71"
@ -1920,6 +2123,15 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "winreg"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0120db82e8a1e0b9fb3345a539c478767c0048d842860994d96113d5b667bd69"
dependencies = [
"winapi",
]
[[package]]
name = "x25519-dalek"
version = "1.1.0"

View File

@ -16,6 +16,7 @@ http = "0.2"
lazy_static = "1.4"
rand = "0.8"
rand_core = "0.5"
reqwest = { version = "0.11", features = ["json"] }
rusqlite = { version = "0.24", features = ["bundled"] }
r2d2_sqlite = "0.17"
r2d2 = "0.8"

View File

@ -594,9 +594,9 @@ pub async fn get_deleted_messages(
// Moderation
// Currently not exposed
pub async fn make_public_key_moderator(
body: models::AddModeratorRequestBody,
// Not publicly exposed.
pub async fn add_moderator(
body: models::ChangeModeratorRequestBody,
) -> Result<Response, Rejection> {
// Get a database connection
let pool = storage::pool_by_room_id(&body.room_id);
@ -615,6 +615,26 @@ pub async fn make_public_key_moderator(
return Ok(warp::reply::json(&json).into_response());
}
pub async fn delete_moderator(
body: models::ChangeModeratorRequestBody,
) -> Result<Response, Rejection> {
// Get a database connection
let pool = storage::pool_by_room_id(&body.room_id);
let conn = pool.get().map_err(|_| Error::DatabaseFailedInternally)?;
// Insert the moderator
let stmt = format!("DELETE FROM {} WHERE public_key = (?1)", storage::MODERATORS_TABLE);
match conn.execute(&stmt, params![&body.public_key]) {
Ok(_) => (),
Err(e) => {
println!("Couldn't delete moderator due to error: {}.", e);
return Err(warp::reject::custom(Error::DatabaseFailedInternally));
}
}
// Return
let json = models::StatusCode { status_code: StatusCode::OK.as_u16() };
return Ok(warp::reply::json(&json).into_response());
}
/// Returns the full list of moderators.
pub async fn get_moderators(
auth_token: &str, pool: &storage::DatabaseConnectionPool,

View File

@ -1,3 +1,4 @@
use std::collections::HashMap;
use std::fs;
use std::net::{IpAddr, Ipv4Addr, SocketAddr};
@ -23,56 +24,88 @@ mod tests;
async fn main() {
// Parse arguments
let opt = options::Opt::from_args();
let addr = SocketAddr::new(IpAddr::V4(opt.host), opt.port);
let localhost = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 80);
*crypto::PRIVATE_KEY_PATH.lock().unwrap() = opt.x25519_private_key;
*crypto::PUBLIC_KEY_PATH.lock().unwrap() = opt.x25519_public_key;
// Print the server public key
let hex_public_key = hex::encode(crypto::PUBLIC_KEY.as_bytes());
println!("The public key of this server is: {}", hex_public_key);
// Create the main database
storage::create_main_database_if_needed();
// Create required folders
fs::create_dir_all("./rooms").unwrap();
fs::create_dir_all("./files").unwrap();
// Create default rooms
create_default_rooms().await;
// Set up pruning jobs
let prune_pending_tokens_future = storage::prune_pending_tokens_periodically();
let prune_tokens_future = storage::prune_tokens_periodically();
let prune_files_future = storage::prune_files_periodically();
// Serve routes
let public_routes = routes::root().or(routes::lsrpc());
let private_routes =
routes::create_room().or(routes::delete_room()).or(routes::add_moderator());
if opt.tls {
println!("Running on {} with TLS.", addr);
let serve_public_routes_future = warp::serve(public_routes)
.tls()
.cert_path(opt.tls_certificate)
.key_path(opt.tls_private_key)
.run(addr);
let serve_private_routes_future = warp::serve(private_routes).run(localhost);
// Keep futures alive
join!(
prune_pending_tokens_future,
prune_tokens_future,
prune_files_future,
serve_public_routes_future,
serve_private_routes_future
);
if !opt.add_room.is_empty() || !opt.delete_room.is_empty() || !opt.add_moderator.is_empty() {
execute_commands(opt).await;
} else {
println!("Running on {}.", addr);
let serve_public_routes_future = warp::serve(public_routes).run(addr);
let serve_private_routes_future = warp::serve(private_routes).run(localhost);
// Keep futures alive
join!(
prune_pending_tokens_future,
prune_tokens_future,
prune_files_future,
serve_public_routes_future,
serve_private_routes_future
);
let addr = SocketAddr::new(IpAddr::V4(opt.host), opt.port);
let localhost = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(127, 0, 0, 1)), 80);
*crypto::PRIVATE_KEY_PATH.lock().unwrap() = opt.x25519_private_key;
*crypto::PUBLIC_KEY_PATH.lock().unwrap() = opt.x25519_public_key;
// Print the server public key
let hex_public_key = hex::encode(crypto::PUBLIC_KEY.as_bytes());
println!("The public key of this server is: {}", hex_public_key);
// Create the main database
storage::create_main_database_if_needed();
// Create required folders
fs::create_dir_all("./rooms").unwrap();
fs::create_dir_all("./files").unwrap();
// Create default rooms
create_default_rooms().await;
// Set up pruning jobs
let prune_pending_tokens_future = storage::prune_pending_tokens_periodically();
let prune_tokens_future = storage::prune_tokens_periodically();
let prune_files_future = storage::prune_files_periodically();
// Serve routes
let public_routes = routes::root().or(routes::lsrpc());
let private_routes = routes::create_room()
.or(routes::delete_room())
.or(routes::add_moderator())
.or(routes::delete_moderator());
if opt.tls {
println!("Running on {} with TLS.", addr);
let serve_public_routes_future = warp::serve(public_routes)
.tls()
.cert_path(opt.tls_certificate)
.key_path(opt.tls_private_key)
.run(addr);
let serve_private_routes_future = warp::serve(private_routes).run(localhost);
// Keep futures alive
join!(
prune_pending_tokens_future,
prune_tokens_future,
prune_files_future,
serve_public_routes_future,
serve_private_routes_future
);
} else {
println!("Running on {}.", addr);
let serve_public_routes_future = warp::serve(public_routes).run(addr);
let serve_private_routes_future = warp::serve(private_routes).run(localhost);
// Keep futures alive
join!(
prune_pending_tokens_future,
prune_tokens_future,
prune_files_future,
serve_public_routes_future,
serve_private_routes_future
);
}
}
}
async fn execute_commands(opt: options::Opt) {
let client = reqwest::Client::new();
let localhost = "http://127.0.0.1:80";
if !opt.add_room.is_empty() {
let mut params = HashMap::new();
params.insert("id", &opt.add_room[0]);
params.insert("name", &opt.add_room[1]);
client.post(format!("{}/rooms", localhost)).json(&params).send().await.unwrap();
}
if !opt.delete_room.is_empty() {
client.delete(format!("{}/rooms/{}", localhost, opt.delete_room)).send().await.unwrap();
}
if !opt.add_moderator.is_empty() {
let mut params = HashMap::new();
params.insert("public_key", &opt.add_moderator[0]);
params.insert("room_id", &opt.add_moderator[1]);
client.post(format!("{}/moderators", localhost)).json(&params).send().await.unwrap();
}
if !opt.delete_moderator.is_empty() {
let mut params = HashMap::new();
params.insert("public_key", &opt.delete_moderator[0]);
params.insert("room_id", &opt.delete_moderator[1]);
client.post(format!("{}/delete_moderator", localhost)).json(&params).send().await.unwrap();
}
}

View File

@ -23,7 +23,7 @@ pub struct Room {
}
#[derive(Debug, Deserialize, Serialize)]
pub struct AddModeratorRequestBody {
pub struct ChangeModeratorRequestBody {
pub public_key: String,
pub room_id: String,
}

View File

@ -35,4 +35,18 @@ pub struct Opt {
/// Path to TLS private key.
#[structopt(long = "tls-private-key", default_value = "tls_private_key.pem")]
pub tls_private_key: String,
/// Add a room with the given ID and name.
#[structopt(long = "add-room")]
pub add_room: Vec<String>,
/// Deletes the room with the given ID.
#[structopt(long = "delete-room")]
pub delete_room: String,
/// Makes the given public key a moderator for the room with the given ID.
pub add_moderator: Vec<String>,
/// Removes moderator permission for the given public key in the room with the given ID.
pub delete_moderator: Vec<String>,
}

View File

@ -48,7 +48,17 @@ pub fn add_moderator() -> impl Filter<Extract = impl warp::Reply, Error = Reject
return warp::post()
.and(warp::path("moderators"))
.and(warp::body::json())
.and_then(handlers::make_public_key_moderator);
.and_then(handlers::add_moderator);
}
/// POST /delete_moderator
///
/// Not publicly exposed.
pub fn delete_moderator() -> impl Filter<Extract = impl warp::Reply, Error = Rejection> + Clone {
return warp::post()
.and(warp::path("delete_moderator"))
.and(warp::body::json())
.and_then(handlers::delete_moderator);
}
pub async fn root_html() -> Result<Response, Rejection> {