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

Add a few dummy endpoints to make riot progress further

ruma
timokoesters 6 years ago
parent
ddcd423e6f
commit
215a31c513
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
2 changed files with 63 additions and 12 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. 68
      src/main.rs
  2. 7
      src/ruma_wrapper.rs

68
src/main.rs
Unescape View File

@ -16,8 +16,12 @@ use ruma_client_api::{
r0::{ r0::{
account::register, account::register,
alias::get_alias, alias::get_alias,
filter::create_filter,
keys::get_keys,
membership::join_room_by_id, membership::join_room_by_id,
message::create_message_event, message::create_message_event,
presence::set_presence,
push::get_pushrules_all,
room::create_room, room::create_room,
session::{get_login_types, 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},
@ -31,10 +35,10 @@ 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 GUEST_NAME_LENGTH: usize = 10;
const SESSION_ID_LENGTH: usize = 16; const DEVICE_ID_LENGTH: usize = 10;
const TOKEN_LENGTH: usize = 16; const SESSION_ID_LENGTH: usize = 256;
const GUEST_NAME_LENGTH: usize = 16; const TOKEN_LENGTH: usize = 256;
#[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> {
@ -49,9 +53,10 @@ fn register_route(
data: State<Data>, data: State<Data>,
body: Ruma<register::Request>, body: Ruma<register::Request>,
) -> MatrixResult<register::Response> { ) -> MatrixResult<register::Response> {
/*
if body.auth.is_none() { if body.auth.is_none() {
return MatrixResult(Err(Error { return MatrixResult(Err(Error {
kind: ErrorKind::InvalidUsername, kind: ErrorKind::Unknown,
message: json!({ message: json!({
"flows": [ "flows": [
{ "stages": [ "m.login.dummy" ] }, { "stages": [ "m.login.dummy" ] },
@ -62,7 +67,7 @@ fn register_route(
.to_string(), .to_string(),
status_code: http::StatusCode::UNAUTHORIZED, status_code: http::StatusCode::UNAUTHORIZED,
})); }));
} }*/
// Validate user id // Validate user id
let user_id: UserId = match (*format!( let user_id: UserId = match (*format!(
@ -120,7 +125,9 @@ fn register_route(
} }
#[get("/_matrix/client/r0/login", data = "<_body>")] #[get("/_matrix/client/r0/login", data = "<_body>")]
fn get_login_route(_body: Ruma<login::Request>) -> MatrixResult<get_login_types::Response> { fn get_login_route(
_body: Ruma<get_login_types::Request>,
) -> MatrixResult<get_login_types::Response> {
MatrixResult(Ok(get_login_types::Response { MatrixResult(Ok(get_login_types::Response {
flows: vec![get_login_types::LoginType::Password], flows: vec![get_login_types::LoginType::Password],
})) }))
@ -147,7 +154,7 @@ fn login_route(data: State<Data>, body: Ruma<login::Request>) -> MatrixResult<lo
} else { } else {
debug!("Invalid password."); debug!("Invalid password.");
return MatrixResult(Err(Error { return MatrixResult(Err(Error {
kind: ErrorKind::Unknown, kind: ErrorKind::Forbidden,
message: "".to_owned(), message: "".to_owned(),
status_code: http::StatusCode::FORBIDDEN, status_code: http::StatusCode::FORBIDDEN,
})); }));
@ -163,8 +170,8 @@ fn login_route(data: State<Data>, body: Ruma<login::Request>) -> MatrixResult<lo
} else { } else {
debug!("Invalid UserId."); debug!("Invalid UserId.");
return MatrixResult(Err(Error { return MatrixResult(Err(Error {
kind: ErrorKind::Unknown, kind: ErrorKind::InvalidUsername,
message: "Bad login type.".to_owned(), message: "Bad user id.".to_owned(),
status_code: http::StatusCode::BAD_REQUEST, status_code: http::StatusCode::BAD_REQUEST,
})); }));
} }
@ -199,6 +206,43 @@ fn login_route(data: State<Data>, body: Ruma<login::Request>) -> MatrixResult<lo
})) }))
} }
#[get("/_matrix/client/r0/pushrules")]
fn get_pushrules_all_route() -> MatrixResult<get_pushrules_all::Response> {
// TODO
MatrixResult(Ok(get_pushrules_all::Response {
global: HashMap::new(),
}))
}
#[post("/_matrix/client/r0/user/<_user_id>/filter", data = "<body>")]
fn create_filter_route(
body: Ruma<create_filter::Request>,
_user_id: String,
) -> MatrixResult<create_filter::Response> {
// TODO
MatrixResult(Ok(create_filter::Response {
filter_id: utils::random_string(10),
}))
}
#[put("/_matrix/client/r0/presence/<_user_id>/status", data = "<body>")]
fn set_presence_route(
body: Ruma<set_presence::Request>,
_user_id: String,
) -> MatrixResult<set_presence::Response> {
// TODO
MatrixResult(Ok(set_presence::Response))
}
#[post("/_matrix/client/r0/keys/query", data = "<body>")]
fn get_keys_route(body: Ruma<get_keys::Request>) -> MatrixResult<get_keys::Response> {
// TODO
MatrixResult(Ok(get_keys::Response {
failures: HashMap::new(),
device_keys: HashMap::new(),
}))
}
#[post("/_matrix/client/r0/createRoom", data = "<body>")] #[post("/_matrix/client/r0/createRoom", data = "<body>")]
fn create_room_route( fn create_room_route(
data: State<Data>, data: State<Data>,
@ -404,6 +448,10 @@ fn main() {
register_route, register_route,
get_login_route, get_login_route,
login_route, login_route,
get_pushrules_all_route,
create_filter_route,
set_presence_route,
get_keys_route,
create_room_route, create_room_route,
get_alias_route, get_alias_route,
join_room_by_id_route, join_room_by_id_route,

7
src/ruma_wrapper.rs
Unescape View File

@ -63,7 +63,7 @@ where
let token = match request let token = match request
.headers() .headers()
.get_one("Authorization") .get_one("Authorization")
.map(|s| s.to_owned()) .map(|s| s[7..].to_owned()) // Split off "Bearer "
.or_else(|| request.get_query_value("access_token").and_then(|r| r.ok())) .or_else(|| request.get_query_value("access_token").and_then(|r| r.ok()))
{ {
// TODO: M_MISSING_TOKEN // TODO: M_MISSING_TOKEN
@ -95,7 +95,7 @@ where
let http_request = http_request.body(body.clone()).unwrap(); let http_request = http_request.body(body.clone()).unwrap();
log::info!("{:?}", http_request); log::info!("{:?}", http_request);
match T::Incoming::try_from(http_request) { match T::Incoming::try_from(dbg!(http_request)) {
Ok(t) => Success(Ruma { Ok(t) => Success(Ruma {
body: t, body: t,
user_id, user_id,
@ -151,6 +151,9 @@ where
.sized_body(Cursor::new(http_response.body().clone())) .sized_body(Cursor::new(http_response.body().clone()))
.await; .await;
let status = http_response.status();
response.raw_status(status.into(), "");
for header in http_response.headers() { for header in http_response.headers() {
response response
.raw_header(header.0.to_string(), header.1.to_str().unwrap().to_owned()); .raw_header(header.0.to_string(), header.1.to_str().unwrap().to_owned());

Write Preview
Loading…
Cancel
Save