nero/tsuki
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

work

Browse source
This commit is contained in:
timokoesters 2020-04-19 14:14:47 +02:00
parent 4d658b3952
commit 80ddf80f17
No known key found for this signature in database
GPG key ID: 24DA7517711A2BA4
10 changed files with 632 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

192
src/client_server.rs
View file

@ -5,16 +5,16 @@ use rocket::{get, options, post, put, State};
use ruma_client_api::{
error::{Error, ErrorKind},
r0::{
account::{
register, AuthenticationFlow, UserInteractiveAuthenticationInfo,
UserInteractiveAuthenticationResponse,
},
account::register,
alias::get_alias,
capabilities::get_capabilities,
config::{get_global_account_data, set_global_account_data},
directory::{self, get_public_rooms_filtered},
filter::{self, create_filter, get_filter},
keys::{get_keys, upload_keys},
membership::{invite_user, join_room_by_id, join_room_by_id_or_alias},
membership::{
get_member_events, invite_user, join_room_by_id, join_room_by_id_or_alias, leave_room,
},
message::create_message_event,
presence::set_presence,
profile::{
@ -28,15 +28,20 @@ use ruma_client_api::{
sync::sync_events,
thirdparty::get_protocols,
typing::create_typing_event,
uiaa::{AuthFlow, UiaaInfo, UiaaResponse},
user_directory::search_users,
},
unversioned::get_supported_versions,
};
use ruma_events::{collections::only::Event as EduEvent, EventType};
use ruma_identifiers::{RoomId, RoomIdOrAliasId, UserId};
use ruma_identifiers::{RoomId, UserId};
use serde_json::json;
use std::{collections::HashMap, convert::TryInto, path::PathBuf, time::Duration};
use argon2::{Config, Variant};
use std::{
collections::{BTreeMap, HashMap},
convert::{TryFrom, TryInto},
path::PathBuf,
time::{Duration, SystemTime},
};
const GUEST_NAME_LENGTH: usize = 10;
const DEVICE_ID_LENGTH: usize = 10;
@ -46,8 +51,8 @@ const TOKEN_LENGTH: usize = 256;
#[get("/_matrix/client/versions")]
pub fn get_supported_versions_route() -> MatrixResult<get_supported_versions::Response> {
MatrixResult(Ok(get_supported_versions::Response {
versions: vec!["r0.6.0".to_owned()],
unstable_features: HashMap::new(),
versions: vec!["r0.5.0".to_owned(), "r0.6.0".to_owned()],
unstable_features: BTreeMap::new(),
}))
}
@ -55,18 +60,17 @@ pub fn get_supported_versions_route() -> MatrixResult<get_supported_versions::Re
pub fn register_route(
data: State<Data>,
body: Ruma<register::Request>,
) -> MatrixResult<register::Response, UserInteractiveAuthenticationResponse> {
) -> MatrixResult<register::Response, UiaaResponse> {
if body.auth.is_none() {
return MatrixResult(Err(UserInteractiveAuthenticationResponse::AuthResponse(
UserInteractiveAuthenticationInfo {
flows: vec![AuthenticationFlow {
stages: vec!["m.login.dummy".to_owned()],
}],
completed: vec![],
params: json!({}),
session: Some(utils::random_string(SESSION_ID_LENGTH)),
},
)));
return MatrixResult(Err(UiaaResponse::AuthResponse(UiaaInfo {
flows: vec![AuthFlow {
stages: vec!["m.login.dummy".to_owned()],
}],
completed: vec![],
params: json!({}),
session: Some(utils::random_string(SESSION_ID_LENGTH)),
auth_error: None,
})));
}
// Validate user id
@ -81,13 +85,11 @@ pub fn register_route(
{
Err(_) => {
debug!("Username invalid");
return MatrixResult(Err(UserInteractiveAuthenticationResponse::MatrixError(
Error {
kind: ErrorKind::InvalidUsername,
message: "Username was invalid.".to_owned(),
status_code: http::StatusCode::BAD_REQUEST,
},
)));
return MatrixResult(Err(UiaaResponse::MatrixError(Error {
kind: ErrorKind::InvalidUsername,
message: "Username was invalid.".to_owned(),
status_code: http::StatusCode::BAD_REQUEST,
})));
}
Ok(user_id) => user_id,
};
@ -95,13 +97,11 @@ pub fn register_route(
// Check if username is creative enough
if data.user_exists(&user_id) {
debug!("ID already taken");
return MatrixResult(Err(UserInteractiveAuthenticationResponse::MatrixError(
Error {
kind: ErrorKind::UserInUse,
message: "Desired user ID is already taken.".to_owned(),
status_code: http::StatusCode::BAD_REQUEST,
},
)));
return MatrixResult(Err(UiaaResponse::MatrixError(Error {
kind: ErrorKind::UserInUse,
message: "Desired user ID is already taken.".to_owned(),
status_code: http::StatusCode::BAD_REQUEST,
})));
}
let password = body.password.clone().unwrap_or_default();
@ -110,13 +110,11 @@ pub fn register_route(
// Create user
data.user_add(&user_id, &hash);
} else {
return MatrixResult(Err(UserInteractiveAuthenticationResponse::MatrixError(
Error {
kind: ErrorKind::InvalidParam,
message: "Password did not meet requirements".to_owned(),
status_code: http::StatusCode::BAD_REQUEST,
},
)));
return MatrixResult(Err(UiaaResponse::MatrixError(Error {
kind: ErrorKind::InvalidParam,
message: "Password did not met requirements".to_owned(),
status_code: http::StatusCode::BAD_REQUEST,
})));
}
// Generate new device id if the user didn't specify one
@ -158,8 +156,8 @@ pub fn login_route(data: State<Data>, body: Ruma<login::Request>) -> MatrixResul
}
if let Ok(user_id) = (*username).try_into() {
if let Some(hash) = data.password_hash_get(&user_id) {
let hash_matches = argon2::verify_encoded(&hash, password.as_bytes())
.unwrap_or(false);
let hash_matches =
argon2::verify_encoded(&hash, password.as_bytes()).unwrap_or(false);
if hash_matches {
// Success!
@ -219,11 +217,25 @@ pub fn login_route(data: State<Data>, body: Ruma<login::Request>) -> MatrixResul
}))
}
#[get("/_matrix/client/r0/capabilities", data = "<body>")]
pub fn get_capabilities_route(
body: Ruma<get_capabilities::Request>,
) -> MatrixResult<get_capabilities::Response> {
// TODO
MatrixResult(Ok(get_capabilities::Response {
capabilities: get_capabilities::Capabilities {
change_password: None,
room_versions: None,
custom_capabilities: BTreeMap::new(),
},
}))
}
#[get("/_matrix/client/r0/pushrules")]
pub fn get_pushrules_all_route() -> MatrixResult<get_pushrules_all::Response> {
// TODO
MatrixResult(Ok(get_pushrules_all::Response {
global: HashMap::new(),
global: BTreeMap::new(),
}))
}
@ -447,8 +459,8 @@ pub fn set_presence_route(
pub 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(),
failures: BTreeMap::new(),
device_keys: BTreeMap::new(),
}))
}
@ -459,7 +471,7 @@ pub fn upload_keys_route(
) -> MatrixResult<upload_keys::Response> {
// TODO
MatrixResult(Ok(upload_keys::Response {
one_time_key_counts: HashMap::new(),
one_time_key_counts: BTreeMap::new(),
}))
}
@ -472,14 +484,14 @@ pub fn set_read_marker_route(
let user_id = body.user_id.clone().expect("user is authenticated");
// TODO: Fully read
if let Some(event) = &body.read_receipt {
let mut user_receipts = HashMap::new();
let mut user_receipts = BTreeMap::new();
user_receipts.insert(
user_id.clone(),
ruma_events::receipt::Receipt {
ts: Some(utils::millis_since_unix_epoch().try_into().unwrap()),
ts: Some(SystemTime::now()),
},
);
let mut receipt_content = HashMap::new();
let mut receipt_content = BTreeMap::new();
receipt_content.insert(
event.clone(),
ruma_events::receipt::Receipts {
@ -537,7 +549,7 @@ pub fn create_room_route(
body: Ruma<create_room::Request>,
) -> MatrixResult<create_room::Response> {
// TODO: check if room is unique
let room_id = RoomId::new(data.hostname()).expect("host is valid");
let room_id = RoomId::try_from(data.hostname()).expect("host is valid");
let user_id = body.user_id.clone().expect("user is authenticated");
data.pdu_append(
@ -589,8 +601,6 @@ pub fn create_room_route(
);
}
dbg!(&*body);
data.room_join(&room_id, &user_id);
for user in &body.invite {
@ -651,8 +661,8 @@ pub fn join_room_by_id_or_alias_route(
body: Ruma<join_room_by_id_or_alias::Request>,
_room_id_or_alias: String,
) -> MatrixResult<join_room_by_id_or_alias::Response> {
let room_id = match &body.room_id_or_alias {
RoomIdOrAliasId::RoomAliasId(alias) => match alias.alias() {
let room_id = if body.room_id_or_alias.is_room_alias_id() {
match body.room_id_or_alias.as_ref() {
"#room:localhost" => "!xclkjvdlfj:localhost".try_into().unwrap(),
_ => {
debug!("Room not found.");
@ -662,9 +672,9 @@ pub fn join_room_by_id_or_alias_route(
status_code: http::StatusCode::NOT_FOUND,
}));
}
},
RoomIdOrAliasId::RoomId(id) => id.clone(),
}
} else {
body.room_id_or_alias.try_into().unwrap()
};
if data.room_join(
@ -681,6 +691,17 @@ pub fn join_room_by_id_or_alias_route(
}
}
#[post("/_matrix/client/r0/rooms/<_room_id>/leave", data = "<body>")]
pub fn leave_room_route(
data: State<Data>,
body: Ruma<leave_room::Request>,
_room_id: String,
) -> MatrixResult<leave_room::Response> {
let user_id = body.user_id.clone().expect("user is authenticated");
data.room_leave(&user_id, &body.room_id, &user_id);
MatrixResult(Ok(leave_room::Response))
}
#[post("/_matrix/client/r0/rooms/<_room_id>/invite", data = "<body>")]
pub fn invite_user_route(
data: State<Data>,
@ -714,7 +735,7 @@ pub fn get_public_rooms_filtered_route(
.map(|room_id| {
let state = data.room_state(&room_id);
directory::PublicRoomsChunk {
aliases: None,
aliases: Vec::new(),
canonical_alias: None,
name: state
.get(&(EventType::RoomName, "".to_owned()))
@ -763,13 +784,22 @@ pub fn search_users_route(
}))
}
#[get("/_matrix/client/r0/rooms/<_room_id>/members", data = "<body>")]
pub fn get_member_events_route(
body: Ruma<get_member_events::Request>,
_room_id: String,
) -> MatrixResult<get_member_events::Response> {
// TODO
MatrixResult(Ok(get_member_events::Response { chunk: Vec::new() }))
}
#[get("/_matrix/client/r0/thirdparty/protocols", data = "<body>")]
pub fn get_protocols_route(
body: Ruma<get_protocols::Request>,
) -> MatrixResult<get_protocols::Response> {
// TODO
MatrixResult(Ok(get_protocols::Response {
protocols: HashMap::new(),
protocols: BTreeMap::new(),
}))
}
@ -851,7 +881,7 @@ pub fn sync_route(
std::thread::sleep(Duration::from_millis(200));
let next_batch = data.last_pdu_index().to_string();
let mut joined_rooms = HashMap::new();
let mut joined_rooms = BTreeMap::new();
let joined_roomids = data.rooms_joined(body.user_id.as_ref().expect("user is authenticated"));
let since = body
.since
@ -860,7 +890,11 @@ pub fn sync_route(
.unwrap_or(0);
for room_id in joined_roomids {
let pdus = data.pdus_since(&room_id, since);
let room_events = pdus.into_iter().map(|pdu| pdu.to_room_event()).collect();
let room_events = pdus
.into_iter()
.map(|pdu| pdu.to_room_event())
.filter_map(|e| e)
.collect();
let mut edus = data.roomlatests_since(&room_id, since);
edus.extend_from_slice(&data.roomactives_in(&room_id));
@ -888,7 +922,33 @@ pub fn sync_route(
);
}
let mut invited_rooms = HashMap::new();
let mut left_rooms = BTreeMap::new();
let left_roomids = data.rooms_left(body.user_id.as_ref().expect("user is authenticated"));
for room_id in left_roomids {
let pdus = data.pdus_since(&room_id, since);
let room_events = pdus
.into_iter()
.map(|pdu| pdu.to_room_event())
.filter_map(|e| e)
.collect();
let mut edus = data.roomlatests_since(&room_id, since);
edus.extend_from_slice(&data.roomactives_in(&room_id));
left_rooms.insert(
room_id.clone().try_into().unwrap(),
sync_events::LeftRoom {
account_data: sync_events::AccountData { events: Vec::new() },
timeline: sync_events::Timeline {
limited: Some(false),
prev_batch: Some("".to_owned()),
events: room_events,
},
state: sync_events::State { events: Vec::new() },
},
);
}
let mut invited_rooms = BTreeMap::new();
for room_id in data.rooms_invited(body.user_id.as_ref().expect("user is authenticated")) {
let events = data
.pdus_since(&room_id, since)
@ -907,7 +967,7 @@ pub fn sync_route(
MatrixResult(Ok(sync_events::Response {
next_batch,
rooms: sync_events::Rooms {
leave: Default::default(),
leave: left_rooms,
join: joined_rooms,
invite: invited_rooms,
},
@ -945,4 +1005,4 @@ pub fn options_route(_segments: PathBuf) -> MatrixResult<create_message_event::R
message: "This is the options route.".to_owned(),
status_code: http::StatusCode::OK,
}))
}
}

62
src/data.rs
View file

@ -10,15 +10,18 @@ use std::{
pub struct Data {
hostname: String,
reqwest_client: reqwest::Client,
db: Database,
}
impl Data {
/// Load an existing database or create a new one.
pub fn load_or_create(hostname: &str) -> Self {
let db = Database::load_or_create(hostname);
Self {
hostname: hostname.to_owned(),
db: Database::load_or_create(hostname),
reqwest_client: reqwest::Client::new(),
db,
}
}
@ -27,6 +30,15 @@ impl Data {
&self.hostname
}
/// Get the hostname of the server.
pub fn reqwest_client(&self) -> &reqwest::Client {
&self.reqwest_client
}
pub fn keypair(&self) -> &ruma_signatures::Ed25519KeyPair {
&self.db.keypair
}
/// Check if a user has an account by looking for an assigned password.
pub fn user_exists(&self, user_id: &UserId) -> bool {
self.db
@ -183,6 +195,10 @@ impl Data {
user_id.to_string().as_bytes(),
room_id.to_string().as_bytes(),
);
self.db.userid_leftroomids.remove_value(
user_id.to_string().as_bytes(),
room_id.to_string().as_bytes().into(),
);
self.pdu_append(
room_id.clone(),
@ -277,6 +293,33 @@ impl Data {
hashmap
}
pub fn room_leave(&self, sender: &UserId, room_id: &RoomId, user_id: &UserId) {
self.pdu_append(
room_id.clone(),
sender.clone(),
EventType::RoomMember,
json!({"membership": "leave"}),
None,
Some(user_id.to_string()),
);
self.db.userid_inviteroomids.remove_value(
user_id.to_string().as_bytes(),
room_id.to_string().as_bytes().into(),
);
self.db.userid_roomids.remove_value(
user_id.to_string().as_bytes(),
room_id.to_string().as_bytes().into(),
);
self.db.roomid_userids.remove_value(
room_id.to_string().as_bytes(),
user_id.to_string().as_bytes().into(),
);
self.db.userid_leftroomids.add(
user_id.to_string().as_bytes(),
room_id.to_string().as_bytes().into(),
);
}
pub fn room_invite(&self, sender: &UserId, room_id: &RoomId, user_id: &UserId) {
self.pdu_append(
room_id.clone(),
@ -287,9 +330,13 @@ impl Data {
Some(user_id.to_string()),
);
self.db.userid_inviteroomids.add(
&user_id.to_string().as_bytes(),
user_id.to_string().as_bytes(),
room_id.to_string().as_bytes().into(),
);
self.db.roomid_userids.add(
room_id.to_string().as_bytes(),
user_id.to_string().as_bytes().into(),
);
}
pub fn rooms_invited(&self, user_id: &UserId) -> Vec<RoomId> {
@ -301,6 +348,15 @@ impl Data {
.collect()
}
pub fn rooms_left(&self, user_id: &UserId) -> Vec<RoomId> {
self.db
.userid_leftroomids
.get_iter(&user_id.to_string().as_bytes())
.values()
.map(|key| RoomId::try_from(&*utils::string_from_bytes(&key.unwrap())).unwrap())
.collect()
}
pub fn pdu_get(&self, event_id: &EventId) -> Option<RoomV3Pdu> {
self.db
.eventid_pduid
@ -434,7 +490,7 @@ impl Data {
if let Some(state_key) = pdu.state_key {
let mut key = room_id.to_string().as_bytes().to_vec();
key.push(0xff);
key.extend_from_slice(dbg!(pdu.kind.to_string().as_bytes()));
key.extend_from_slice(pdu.kind.to_string().as_bytes());
key.push(0xff);
key.extend_from_slice(state_key.to_string().as_bytes());
self.db.roomstateid_pdu.insert(key, &*pdu_json).unwrap();

12
src/database.rs
View file

@ -30,7 +30,7 @@ impl MultiValue {
pub fn remove_value(&self, id: &[u8], value: &[u8]) {
if let Some(key) = self
.get_iter(id)
.find(|t| t.as_ref().unwrap().1 == value)
.find(|t| &t.as_ref().unwrap().1 == value)
.map(|t| t.unwrap().0)
{
self.0.remove(key).unwrap();
@ -74,11 +74,13 @@ pub struct Database {
pub roomid_userids: MultiValue,
pub userid_roomids: MultiValue,
pub userid_inviteroomids: MultiValue,
pub userid_leftroomids: MultiValue,
// EDUs:
pub roomlatestid_roomlatest: sled::Tree, // Read Receipts, RoomLatestId = RoomId + Since + UserId TODO: Types
pub roomactiveid_roomactive: sled::Tree, // Typing, RoomActiveId = TimeoutTime + Since
pub globalallid_globalall: sled::Tree, // ToDevice, GlobalAllId = UserId + Since
pub globallatestid_globallatest: sled::Tree, // Presence, GlobalLatestId = Since + Type + UserId
pub keypair: ruma_signatures::Ed25519KeyPair,
_db: sled::Db,
}
@ -116,10 +118,18 @@ impl Database {
roomid_userids: MultiValue(db.open_tree("roomid_userids").unwrap()),
userid_roomids: MultiValue(db.open_tree("userid_roomids").unwrap()),
userid_inviteroomids: MultiValue(db.open_tree("userid_inviteroomids").unwrap()),
userid_leftroomids: MultiValue(db.open_tree("userid_leftroomids").unwrap()),
roomlatestid_roomlatest: db.open_tree("roomlatestid_roomlatest").unwrap(),
roomactiveid_roomactive: db.open_tree("roomactiveid_roomactive").unwrap(),
globalallid_globalall: db.open_tree("globalallid_globalall").unwrap(),
globallatestid_globallatest: db.open_tree("globallatestid_globallatest").unwrap(),
keypair: ruma_signatures::Ed25519KeyPair::new(
&*db.update_and_fetch("keypair", utils::generate_keypair)
.unwrap()
.unwrap(),
"0.0.0".to_owned(),
)
.unwrap(),
_db: db,
}
}

8
src/main.rs
View file

@ -5,6 +5,7 @@ mod data;
mod database;
mod pdu;
mod ruma_wrapper;
mod server_server;
mod utils;
#[cfg(test)]
@ -26,6 +27,7 @@ fn setup_rocket(data: Data) -> rocket::Rocket {
client_server::register_route,
client_server::get_login_route,
client_server::login_route,
client_server::get_capabilities_route,
client_server::get_pushrules_all_route,
client_server::get_filter_route,
client_server::create_filter_route,
@ -45,9 +47,11 @@ fn setup_rocket(data: Data) -> rocket::Rocket {
client_server::get_alias_route,
client_server::join_room_by_id_route,
client_server::join_room_by_id_or_alias_route,
client_server::leave_room_route,
client_server::invite_user_route,
client_server::get_public_rooms_filtered_route,
client_server::search_users_route,
client_server::get_member_events_route,
client_server::get_protocols_route,
client_server::create_message_event_route,
client_server::create_state_event_for_key_route,
@ -64,12 +68,12 @@ fn setup_rocket(data: Data) -> rocket::Rocket {
fn main() {
// Log info by default
if let Err(_) = std::env::var("RUST_LOG") {
std::env::set_var("RUST_LOG", "matrixserver=debug,info");
std::env::set_var("RUST_LOG", "warn");
}
pretty_env_logger::init();
let data = Data::load_or_create("matrixtesting.koesters.xyz");
data.debug();
//data.debug();
setup_rocket(data).launch().unwrap();
}

13
src/pdu.rs
View file

@ -31,15 +31,18 @@ pub struct PduEvent {
}
impl PduEvent {
pub fn to_room_event(&self) -> RoomEvent {
// TODO: This shouldn't be an option
pub fn to_room_event(&self) -> Option<RoomEvent> {
// Can only fail in rare circumstances that won't ever happen here, see
// https://docs.rs/serde_json/1.0.50/serde_json/fn.to_string.html
let json = serde_json::to_string(&self).unwrap();
// EventResult's deserialize implementation always returns `Ok(...)`
serde_json::from_str::<EventResult<RoomEvent>>(&json)
.unwrap()
.into_result()
.unwrap()
Some(
serde_json::from_str::<EventResult<RoomEvent>>(&json)
.unwrap()
.into_result()
.ok()?,
)
}
pub fn to_stripped_state_event(&self) -> Option<AnyStrippedStateEvent> {

25
src/server_server.rs Normal file
View file

@ -0,0 +1,25 @@
use std::convert::TryInto;
pub fn send_request<T: TryInto<http::Request<Vec<u8>>>>(
data: &crate::Data,
method: http::Method,
uri: String,
destination: String,
request: T,
) where
T::Error: std::fmt::Debug,
{
let mut http_request: http::Request<_> = request.try_into().unwrap();
let request_json = serde_json::to_value(http_request.body()).unwrap();
let request_map = request_json.as_object_mut().unwrap();
request_map.insert("method".to_owned(), method.to_string().into());
request_map.insert("uri".to_owned(), uri.to_string().into());
//TODO: request_map.insert("origin".to_owned(), data.origin().to_string().into());
request_map.insert("destination".to_owned(), destination.to_string().into());
ruma_signatures::sign_json(data.hostname(), data.keypair(), &mut request_json).unwrap();
let signature = request_json["signatures"];
data.reqwest_client().execute(http_request.into());
}

59
src/stateres.rs Normal file
View file

@ -0,0 +1,59 @@
use std::collections::HashMap;
fn stateres(state_a: HashMap<StateTuple, PduEvent>, state_b: HashMap<StateTuple, PduEvent>) {
let mut unconflicted = todo!("state at fork event");
let mut conflicted: HashMap<StateTuple, PduEvent> = state_a
.iter()
.filter(|(key_a, value_a)| match state_b.remove(key_a) {
Some(value_b) if value_a == value_b => unconflicted.insert(key_a, value_a),
_ => false,
})
.collect();
// We removed unconflicted from state_b, now we can easily insert all events that are only in fork b
conflicted.extend(state_b);
let partial_state = unconflicted.clone();
let full_conflicted = conflicted.clone(); // TODO: auth events
let output_rev = Vec::new();
let event_map = HashMap::new();
let incoming_edges = HashMap::new();
for event in full_conflicted {
event_map.insert(event.event_id, event);
incoming_edges.insert(event.event_id, 0);
}
for e in conflicted_control_events {
for a in e.auth_events {
incoming_edges[a.event_id] += 1;
}
}
while incoming_edges.len() > 0 {
let mut count_0 = incoming_edges
.iter()
.filter(|(_, c)| c == 0)
.collect::<Vec<_>>();
count_0.sort_by(|(x, _), (y, _)| {
x.power_level
.cmp(&a.power_level)
.then_with(|| x.origin_server.ts.cmp(&y.origin_server_ts))
.then_with(|| x.event_id.cmp(&y.event_id))
});
for (id, count) in count_0 {
output_rev.push(event_map[id]);
for auth_event in event_map[id].auth_events {
incoming_edges[auth_event.event_id] -= 1;
}
incoming_edges.remove(id);
}
}
}

17
src/utils.rs
View file

@ -1,9 +1,9 @@
use argon2::{Config, Variant};
use rand::prelude::*;
use std::{
convert::TryInto,
time::{SystemTime, UNIX_EPOCH},
};
use argon2::{Config, Variant};
pub fn millis_since_unix_epoch() -> u64 {
SystemTime::now()
@ -25,6 +25,13 @@ pub fn increment(old: Option<&[u8]>) -> Option<Vec<u8>> {
Some(number.to_be_bytes().to_vec())
}
pub fn generate_keypair(old: Option<&[u8]>) -> Option<Vec<u8>> {
Some(
old.map(|s| s.to_vec())
.unwrap_or_else(|| ruma_signatures::Ed25519KeyPair::generate().unwrap()),
)
}
pub fn u64_from_bytes(bytes: &[u8]) -> u64 {
let array: [u8; 8] = bytes.try_into().expect("bytes are valid u64");
u64::from_be_bytes(array)
@ -49,9 +56,5 @@ pub fn calculate_hash(password: &str) -> Result<String, argon2::Error> {
};
let salt = random_string(32);
argon2::hash_encoded(
password.as_bytes(),
salt.as_bytes(),
&hashing_config,
)
}
argon2::hash_encoded(password.as_bytes(), salt.as_bytes(), &hashing_config)
}