|
|
@ -1,4 +1,6 @@
|
|
|
|
|
|
|
|
use std::collections::BTreeMap;
|
|
|
|
use std::sync::Arc;
|
|
|
|
use std::sync::Arc;
|
|
|
|
|
|
|
|
use std::sync::RwLock;
|
|
|
|
|
|
|
|
|
|
|
|
use crate::{client_server::SESSION_ID_LENGTH, utils, Error, Result};
|
|
|
|
use crate::{client_server::SESSION_ID_LENGTH, utils, Error, Result};
|
|
|
|
use ruma::{
|
|
|
|
use ruma::{
|
|
|
@ -18,7 +20,8 @@ use super::abstraction::Tree;
|
|
|
|
|
|
|
|
|
|
|
|
pub struct Uiaa {
|
|
|
|
pub struct Uiaa {
|
|
|
|
pub(super) userdevicesessionid_uiaainfo: Arc<dyn Tree>, // User-interactive authentication
|
|
|
|
pub(super) userdevicesessionid_uiaainfo: Arc<dyn Tree>, // User-interactive authentication
|
|
|
|
pub(super) userdevicesessionid_uiaarequest: Arc<dyn Tree>, // UiaaRequest = canonical json value
|
|
|
|
pub(super) userdevicesessionid_uiaarequest:
|
|
|
|
|
|
|
|
RwLock<BTreeMap<(Box<UserId>, Box<DeviceId>, String), CanonicalJsonValue>>,
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
impl Uiaa {
|
|
|
|
impl Uiaa {
|
|
|
@ -147,16 +150,17 @@ impl Uiaa {
|
|
|
|
session: &str,
|
|
|
|
session: &str,
|
|
|
|
request: &CanonicalJsonValue,
|
|
|
|
request: &CanonicalJsonValue,
|
|
|
|
) -> Result<()> {
|
|
|
|
) -> Result<()> {
|
|
|
|
let mut userdevicesessionid = user_id.as_bytes().to_vec();
|
|
|
|
self.userdevicesessionid_uiaarequest
|
|
|
|
userdevicesessionid.push(0xff);
|
|
|
|
.write()
|
|
|
|
userdevicesessionid.extend_from_slice(device_id.as_bytes());
|
|
|
|
.unwrap()
|
|
|
|
userdevicesessionid.push(0xff);
|
|
|
|
.insert(
|
|
|
|
userdevicesessionid.extend_from_slice(session.as_bytes());
|
|
|
|
(
|
|
|
|
|
|
|
|
user_id.to_owned(),
|
|
|
|
self.userdevicesessionid_uiaarequest.insert(
|
|
|
|
device_id.to_owned(),
|
|
|
|
&userdevicesessionid,
|
|
|
|
session.to_string(),
|
|
|
|
&serde_json::to_vec(request).expect("json value to vec always works"),
|
|
|
|
),
|
|
|
|
)?;
|
|
|
|
request.to_owned(),
|
|
|
|
|
|
|
|
);
|
|
|
|
|
|
|
|
|
|
|
|
Ok(())
|
|
|
|
Ok(())
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -167,22 +171,16 @@ impl Uiaa {
|
|
|
|
device_id: &DeviceId,
|
|
|
|
device_id: &DeviceId,
|
|
|
|
session: &str,
|
|
|
|
session: &str,
|
|
|
|
) -> Result<Option<CanonicalJsonValue>> {
|
|
|
|
) -> Result<Option<CanonicalJsonValue>> {
|
|
|
|
let mut userdevicesessionid = user_id.as_bytes().to_vec();
|
|
|
|
Ok(self
|
|
|
|
userdevicesessionid.push(0xff);
|
|
|
|
.userdevicesessionid_uiaarequest
|
|
|
|
userdevicesessionid.extend_from_slice(device_id.as_bytes());
|
|
|
|
.read()
|
|
|
|
userdevicesessionid.push(0xff);
|
|
|
|
.unwrap()
|
|
|
|
userdevicesessionid.extend_from_slice(session.as_bytes());
|
|
|
|
.get(&(
|
|
|
|
|
|
|
|
user_id.to_owned(),
|
|
|
|
self.userdevicesessionid_uiaarequest
|
|
|
|
device_id.to_owned(),
|
|
|
|
.get(&userdevicesessionid)?
|
|
|
|
session.to_string(),
|
|
|
|
.map(|bytes| {
|
|
|
|
))
|
|
|
|
serde_json::from_str::<CanonicalJsonValue>(
|
|
|
|
.map(|j| j.to_owned()))
|
|
|
|
&utils::string_from_bytes(&bytes)
|
|
|
|
|
|
|
|
.map_err(|_| Error::bad_database("Invalid uiaa request bytes in db."))?,
|
|
|
|
|
|
|
|
)
|
|
|
|
|
|
|
|
.map_err(|_| Error::bad_database("Invalid uiaa request in db."))
|
|
|
|
|
|
|
|
})
|
|
|
|
|
|
|
|
.transpose()
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
fn update_uiaa_session(
|
|
|
|
fn update_uiaa_session(
|
|
|
|