fix: server keys and destination resolution when server name contains port

next
Timo Kösters 2020-09-15 21:46:10 +02:00
parent 005e00e9b1
commit dd749b8aee
No known key found for this signature in database
GPG Key ID: 24DA7517711A2BA4
3 changed files with 49 additions and 14 deletions

View File

@ -1,4 +1,5 @@
use crate::{utils, Error, Result}; use crate::{utils, Error, Result};
use log::error;
use ruma::ServerName; use ruma::ServerName;
use std::{convert::TryInto, sync::Arc}; use std::{convert::TryInto, sync::Arc};
@ -17,19 +18,43 @@ pub struct Globals {
impl Globals { impl Globals {
pub fn load(globals: sled::Tree, config: &rocket::Config) -> Result<Self> { pub fn load(globals: sled::Tree, config: &rocket::Config) -> Result<Self> {
let keypair = Arc::new( let bytes = &*globals
ruma::signatures::Ed25519KeyPair::new( .update_and_fetch("keypair", utils::generate_keypair)?
&*globals .expect("utils::generate_keypair always returns Some");
.update_and_fetch("keypair", utils::generate_keypair)?
.expect("utils::generate_keypair always returns Some"), let mut parts = bytes.splitn(2, |&b| b == 0xff);
"key1".to_owned(),
) let keypair = utils::string_from_bytes(
.map_err(|_| Error::bad_database("Private or public keys are invalid."))?, // 1. version
); parts
.next()
.expect("splitn always returns at least one element"),
)
.map_err(|_| Error::bad_database("Invalid version bytes in keypair."))
.and_then(|version| {
// 2. key
parts
.next()
.ok_or_else(|| Error::bad_database("Invalid keypair format in database."))
.map(|key| (version, key))
})
.and_then(|(version, key)| {
ruma::signatures::Ed25519KeyPair::new(&key, version)
.map_err(|_| Error::bad_database("Private or public keys are invalid."))
});
let keypair = match keypair {
Ok(k) => k,
Err(e) => {
error!("Keypair invalid. Deleting...");
globals.remove("keypair")?;
return Err(e);
}
};
Ok(Self { Ok(Self {
globals, globals,
keypair, keypair: Arc::new(keypair),
reqwest_client: reqwest::Client::new(), reqwest_client: reqwest::Client::new(),
server_name: config server_name: config
.get_str("server_name") .get_str("server_name")

View File

@ -17,7 +17,6 @@ use ruma::{
directory::{IncomingFilter, IncomingRoomNetwork}, directory::{IncomingFilter, IncomingRoomNetwork},
EventId, ServerName, EventId, ServerName,
}; };
use serde_json::json;
use std::{ use std::{
collections::BTreeMap, collections::BTreeMap,
convert::TryFrom, convert::TryFrom,
@ -58,7 +57,13 @@ where
let actual_destination = "https://".to_owned() let actual_destination = "https://".to_owned()
+ &request_well_known(globals, &destination.as_str()) + &request_well_known(globals, &destination.as_str())
.await .await
.unwrap_or(destination.as_str().to_owned() + ":8448"); .unwrap_or_else(|| {
let mut destination = destination.as_str().to_owned();
if destination.find(':').is_none() {
destination += ":8448";
}
destination
});
let mut http_request = request let mut http_request = request
.try_into_http_request(&actual_destination, Some("")) .try_into_http_request(&actual_destination, Some(""))

View File

@ -29,8 +29,13 @@ pub fn increment(old: Option<&[u8]>) -> Option<Vec<u8>> {
pub fn generate_keypair(old: Option<&[u8]>) -> Option<Vec<u8>> { pub fn generate_keypair(old: Option<&[u8]>) -> Option<Vec<u8>> {
Some(old.map(|s| s.to_vec()).unwrap_or_else(|| { Some(old.map(|s| s.to_vec()).unwrap_or_else(|| {
ruma::signatures::Ed25519KeyPair::generate() let mut value = random_string(8).as_bytes().to_vec();
.expect("Ed25519KeyPair generation always works (?)") value.push(0xff);
value.extend_from_slice(
&ruma::signatures::Ed25519KeyPair::generate()
.expect("Ed25519KeyPair generation always works (?)"),
);
value
})) }))
} }