crappyrules
/
conduit
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

feat: random tokens, sessions, guest usernames and device ids

ruma
timokoesters 6 years ago
parent
64223b8812
commit
ddcd423e6f
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
4 changed files with 38 additions and 13 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      Cargo.lock
  2. 1
      Cargo.toml
  3. 39
      src/main.rs
  4. 8
      src/utils.rs

3
Cargo.lock generated
Unescape View File

@ -607,6 +607,7 @@ dependencies = [
"js_int", "js_int",
"log", "log",
"pretty_env_logger", "pretty_env_logger",
"rand",
"rocket", "rocket",
"ruma-api", "ruma-api",
"ruma-client-api", "ruma-client-api",
@ -1051,7 +1052,7 @@ dependencies = [
[[package]] [[package]]
name = "ruma-client-api" name = "ruma-client-api"
version = "0.7.2" version = "0.7.2"
source = "git+https://github.com/ruma/ruma-client-api.git#fe92c2940a2db80509e9a9f162c0f68f3ec3d0a4" source = "git+https://github.com/ruma/ruma-client-api.git#dc582758e4f846b3751d84d21eb321e8eb4faf51"
dependencies = [ dependencies = [
"http", "http",
"js_int", "js_int",

1
Cargo.toml
Unescape View File

@ -23,3 +23,4 @@ ruma-signatures = { git = "https://github.com/ruma/ruma-signatures.git" }
ruma-federation-api = "0.0.1" ruma-federation-api = "0.0.1"
serde = "1.0.106" serde = "1.0.106"
tokio = "0.2.16" tokio = "0.2.16"
rand = "0.7.3"

39
src/main.rs
Unescape View File

@ -19,7 +19,7 @@ use ruma_client_api::{
membership::join_room_by_id, membership::join_room_by_id,
message::create_message_event, message::create_message_event,
room::create_room, room::create_room,
session::login, session::{get_login_types, login},
state::{create_state_event_for_empty_key, create_state_event_for_key}, state::{create_state_event_for_empty_key, create_state_event_for_key},
sync::sync_events, sync::sync_events,
}, },
@ -31,6 +31,11 @@ use ruma_wrapper::{MatrixResult, Ruma};
use serde_json::json; use serde_json::json;
use std::{collections::HashMap, convert::TryInto, path::PathBuf}; use std::{collections::HashMap, convert::TryInto, path::PathBuf};
const DEVICE_ID_LENGTH: usize = 16;
const SESSION_ID_LENGTH: usize = 16;
const TOKEN_LENGTH: usize = 16;
const GUEST_NAME_LENGTH: usize = 16;
#[get("/_matrix/client/versions")] #[get("/_matrix/client/versions")]
fn get_supported_versions_route() -> MatrixResult<get_supported_versions::Response> { fn get_supported_versions_route() -> MatrixResult<get_supported_versions::Response> {
MatrixResult(Ok(get_supported_versions::Response { MatrixResult(Ok(get_supported_versions::Response {
@ -47,14 +52,14 @@ fn register_route(
if body.auth.is_none() { if body.auth.is_none() {
return MatrixResult(Err(Error { return MatrixResult(Err(Error {
kind: ErrorKind::InvalidUsername, kind: ErrorKind::InvalidUsername,
message: serde_json::to_string(&json!({ message: json!({
"flows": [ "flows": [
{ "stages": [ "m.login.dummy" ] }, { "stages": [ "m.login.dummy" ] },
], ],
"params": {}, "params": {},
"session": "TODO:randomsessionid", "session": utils::random_string(SESSION_ID_LENGTH),
})) })
.unwrap(), .to_string(),
status_code: http::StatusCode::UNAUTHORIZED, status_code: http::StatusCode::UNAUTHORIZED,
})); }));
} }
@ -62,7 +67,9 @@ fn register_route(
// Validate user id // Validate user id
let user_id: UserId = match (*format!( let user_id: UserId = match (*format!(
"@{}:{}", "@{}:{}",
body.username.clone().unwrap_or("randomname".to_owned()), body.username
.clone()
.unwrap_or_else(|| utils::random_string(GUEST_NAME_LENGTH)),
data.hostname() data.hostname()
)) ))
.try_into() .try_into()
@ -95,13 +102,13 @@ fn register_route(
let device_id = body let device_id = body
.device_id .device_id
.clone() .clone()
.unwrap_or_else(|| "TODO:randomdeviceid".to_owned()); .unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH));
// Add device // Add device
data.device_add(&user_id, &device_id); data.device_add(&user_id, &device_id);
// Generate new token for the device // Generate new token for the device
let token = "TODO:randomtoken".to_owned(); let token = utils::random_string(TOKEN_LENGTH);
data.token_replace(&user_id, &device_id, token.clone()); data.token_replace(&user_id, &device_id, token.clone());
MatrixResult(Ok(register::Response { MatrixResult(Ok(register::Response {
@ -112,6 +119,13 @@ fn register_route(
})) }))
} }
#[get("/_matrix/client/r0/login", data = "<_body>")]
fn get_login_route(_body: Ruma<login::Request>) -> MatrixResult<get_login_types::Response> {
MatrixResult(Ok(get_login_types::Response {
flows: vec![get_login_types::LoginType::Password],
}))
}
#[post("/_matrix/client/r0/login", data = "<body>")] #[post("/_matrix/client/r0/login", data = "<body>")]
fn login_route(data: State<Data>, body: Ruma<login::Request>) -> MatrixResult<login::Response> { fn login_route(data: State<Data>, body: Ruma<login::Request>) -> MatrixResult<login::Response> {
// Validate login method // Validate login method
@ -167,22 +181,22 @@ fn login_route(data: State<Data>, body: Ruma<login::Request>) -> MatrixResult<lo
let device_id = body let device_id = body
.device_id .device_id
.clone() .clone()
.unwrap_or("TODO:randomdeviceid".to_owned()); .unwrap_or_else(|| utils::random_string(DEVICE_ID_LENGTH));
// Add device // Add device
data.device_add(&user_id, &device_id); data.device_add(&user_id, &device_id);
// Generate a new token for the device // Generate a new token for the device
let token = "TODO:randomtoken".to_owned(); let token = utils::random_string(TOKEN_LENGTH);
data.token_replace(&user_id, &device_id, token.clone()); data.token_replace(&user_id, &device_id, token.clone());
return MatrixResult(Ok(login::Response { MatrixResult(Ok(login::Response {
user_id, user_id,
access_token: token, access_token: token,
home_server: Some(data.hostname().to_owned()), home_server: Some(data.hostname().to_owned()),
device_id, device_id,
well_known: None, well_known: None,
})); }))
} }
#[post("/_matrix/client/r0/createRoom", data = "<body>")] #[post("/_matrix/client/r0/createRoom", data = "<body>")]
@ -388,6 +402,7 @@ fn main() {
routes![ routes![
get_supported_versions_route, get_supported_versions_route,
register_route, register_route,
get_login_route,
login_route, login_route,
create_room_route, create_room_route,
get_alias_route, get_alias_route,

8
src/utils.rs
Unescape View File

@ -1,3 +1,4 @@
use rand::prelude::*;
use std::{ use std::{
convert::TryInto, convert::TryInto,
time::{SystemTime, UNIX_EPOCH}, time::{SystemTime, UNIX_EPOCH},
@ -32,3 +33,10 @@ pub fn u64_from_bytes(bytes: &[u8]) -> u64 {
pub fn string_from_bytes(bytes: &[u8]) -> String { pub fn string_from_bytes(bytes: &[u8]) -> String {
String::from_utf8(bytes.to_vec()).expect("bytes are valid utf8") String::from_utf8(bytes.to_vec()).expect("bytes are valid utf8")
} }
pub fn random_string(length: usize) -> String {
thread_rng()
.sample_iter(&rand::distributions::Alphanumeric)
.take(length)
.collect()
}

Write Preview
Loading…
Cancel
Save