From 17d3d2492cad63b3c63355a44752c3e9d21bc150 Mon Sep 17 00:00:00 2001 From: Felix Date: Fri, 10 Apr 2020 15:50:40 +0200 Subject: Federate actor public keys --- server/src/apub/user.rs | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'server/src/apub/user.rs') diff --git a/server/src/apub/user.rs b/server/src/apub/user.rs index be02922f..404a9c10 100644 --- a/server/src/apub/user.rs +++ b/server/src/apub/user.rs @@ -1,4 +1,5 @@ -use crate::apub::{create_apub_response, make_apub_endpoint, EndpointType, PersonExt}; +use crate::apub::signatures::PublicKey; +use crate::apub::{create_apub_response, PersonExt}; use crate::db::user::{UserForm, User_}; use crate::{convert_datetime, naive_now}; use activitystreams::{ @@ -25,15 +26,13 @@ pub async fn get_apub_user( info: Path, db: web::Data>>, ) -> Result, Error> { - dbg!(&info.user_name); let user = User_::find_by_email_or_username(&&db.get()?, &info.user_name)?; - let base_url = make_apub_endpoint(EndpointType::User, &user.name); let mut person = Person::default(); let oprops: &mut ObjectProperties = person.as_mut(); oprops .set_context_xsd_any_uri(context())? - .set_id(base_url.to_string())? + .set_id(user.actor_id.to_string())? .set_name_xsd_string(user.name.to_owned())? .set_published(convert_datetime(user.published))?; @@ -48,18 +47,28 @@ pub async fn get_apub_user( let mut actor_props = ApActorProperties::default(); actor_props - .set_inbox(format!("{}/inbox", &base_url))? - .set_outbox(format!("{}/outbox", &base_url))? - .set_following(format!("{}/following", &base_url))? - .set_liked(format!("{}/liked", &base_url))?; + .set_inbox(format!("{}/inbox", &user.actor_id))? + .set_outbox(format!("{}/outbox", &user.actor_id))? + .set_following(format!("{}/following", &user.actor_id))? + .set_liked(format!("{}/liked", &user.actor_id))?; - Ok(create_apub_response(&person.extend(actor_props))) + let public_key = PublicKey { + id: format!("{}#main-key", user.actor_id), + owner: user.actor_id.to_owned(), + public_key_pem: user.public_key.unwrap(), + }; + + Ok(create_apub_response( + &person.extend(actor_props).extend(public_key.to_ext()), + )) } impl UserForm { pub fn from_person(person: &PersonExt) -> Result { - let oprops = &person.base.object_props; - let aprops = &person.extension; + let oprops = &person.base.base.object_props; + let aprops = &person.base.extension; + let public_key: &PublicKey = &person.extension.public_key; + Ok(UserForm { name: oprops.get_name_xsd_string().unwrap().to_string(), preferred_username: aprops.get_preferred_username().map(|u| u.to_string()), @@ -83,7 +92,7 @@ impl UserForm { bio: oprops.get_summary_xsd_string().map(|s| s.to_string()), local: false, private_key: None, - public_key: None, + public_key: Some(public_key.to_owned().public_key_pem), last_refreshed_at: Some(naive_now()), }) } -- cgit v1.2.3